commit

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -81,9 +81,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(cpData);
 		
 		//更新报告
-		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/5 * * * *", new UpdateTask());
-		me.add(upData);
+//		Cron4jPlugin upData = new Cron4jPlugin();
+//		upData.addTask("*/5 * * * *", new UpdateTask());
+//		me.add(upData);
 		
 		//患者信息
 		Cron4jPlugin infoData = new Cron4jPlugin();

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

@@ -38,11 +38,11 @@ public class UpdateTask implements ITask {
 				}
 				Map<String, String> params = new HashMap<>();
 				//1:exam_id 2:patient_num 3:accession_num 4:study_uid
-				params.put("type", "2");
+				params.put("type", "4");
 				
 				params.put("institution_id", PropKit.get("institution_id"));
 
-				params.put("code", record.getStr("PatientId"));
+				params.put("code", record.getStr("StudyInsUid"));
 				//报告医生姓名
 				params.put("report_doctor_name", record.getStr("ReportDoctor"));
 				//报告时间
@@ -94,17 +94,15 @@ public class UpdateTask implements ITask {
 				
 				//匹配支付状态
 				if (record.getStr("ExamItem").contains("无片")) {
-					JSONObject jsonObject = new JSONObject();
+					JSONObject jsonObjectPay = new JSONObject();
 					//机构ID
-					jsonObject.put("institution_id", PropKit.get("institution_id"));
-					jsonObject.put("patient_num", record.getStr("PatientId"));
+					jsonObjectPay.put("institution_id", PropKit.get("institution_id"));
+					jsonObjectPay.put("patient_num", record.getStr("PatientId"));
 					//机构类型：1：accession_num：patient_num
-					jsonObject.put("ins_type", "2");
+					jsonObjectPay.put("ins_type", "2");
 					JSONObject pJsonObject = new JSONObject();
-					pJsonObject.put("params", jsonObject.toJSONString());
-					tService.execute(() -> {
-						dService.fee(pJsonObject);
-					});
+					pJsonObject.put("params", jsonObjectPay.toJSONString());
+					dService.fee(pJsonObject);
 				}
 				
 			}