增加收费

DataFusion/src/com/zskk/service/DataService.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.PropKit;
 import okhttp3.FormBody;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
@@ -24,6 +25,9 @@ public class DataService {
 	private static String FEE_URL = "https://risserver3.pacsonline.cn/film/callback";
 
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
+	
+	private static final MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8");
+
 
 	/**
 	 * 获取未出报告的检查列表

DataFusion/src/com/zskk/task/PayTask.java

@@ -1,14 +1,10 @@
 package com.zskk.task;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
+import java.util.List;
 import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
@@ -22,61 +18,19 @@ public class PayTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(100);	
-        for (Object object : jsonArray) {
-        	try {			
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			String pstr = jsonObject.getString("accession_num")==null?jsonObject.getString("patient_num"):jsonObject.getString("accession_num");
-			Record record = Db.use("connected").findFirst("SELECT * FROM zlhis.examtinfo where REGPAPERNUM=?", pstr);
-			if (record == null) {
-				continue;
-			}
-			Map<String, String> params = new HashMap<>();
-			params.put("exam_id", jsonObject.getString("id"));
-			//报告医生姓名
-			params.put("report_doctor_name", "");
-			//报告时间
-			params.put("report_datetime", parseStringToDate());
-			//审核医生姓名
-			params.put("review_doctor_name", "");
-			//审核时间
-			params.put("review_datetime", parseStringToDate());
-			//确认医生姓名
-			params.put("confirm_doctor_name", "");
-			//确认时间
-			params.put("confirm_datetime", parseStringToDate());
-			//意见建议
-			params.put("impression", "");
-			//影像所见
-			params.put("description", "");
-			//exams表
-			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
-			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
-			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
-			//症状
-			params.put("clin_symp", "");
-			//patient_infos表
-			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
-			//患者手机号
-			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
-			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
-			params.put("report_result", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("PATIENTID"));
+		List<Record> records = Db.use("connected").find("select top 30 * from zlhis.paylist where ISFEE=1 order by PAYTIME desc");
+		for (Record record : records) {
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("institution_id", PropKit.get("institution_id"));
+			jsonObject.put("patient_num", record.getStr("STUDYUID"));
+			jsonObject.put("ins_type", "1");
+			JSONObject pJsonObject = new JSONObject();
+			pJsonObject.put("params", jsonObject.toJSONString());
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
-				dService.updatePatientInfo(params);
-			});	
-        	} catch (Exception e) {
-				// TODO: handle exception
-        		continue;
-			}
-        }
+				dService.fee(pJsonObject);
+			});
+		}
 	}
 
 	@Override