commit

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

@@ -75,14 +75,17 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 
+		//报告匹配
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
+		//更新报告
 		Cron4jPlugin upData = new Cron4jPlugin();
 		upData.addTask("*/12 * * * *", new UpdateTask());
 		me.add(upData);
 		
+		//患者信息
 		Cron4jPlugin infoData = new Cron4jPlugin();
 		infoData.addTask("*/2 * * * *", new InfoTask());
 		me.add(infoData);

DataFusion/src/com/zskk/control/ViewController.java

@@ -91,11 +91,11 @@ public class ViewController extends Controller {
 			try {
 				Map<String, String> params = new HashMap<>();
 				// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
-				params.put("type", "4");
+				params.put("type", "2");
 
 				params.put("institution_id", PropKit.get("institution_id"));
 
-				params.put("code", record.getStr("StudyInsUid"));
+				params.put("code", record.getStr("PatientId"));
 				//报告医生姓名
 				params.put("report_doctor_name", record.getStr("ReportDoctor"));
 				//报告时间

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

@@ -32,9 +32,9 @@ public class PayTask implements ITask {
 			JSONObject jsonObject = new JSONObject();
 			//机构ID
 			jsonObject.put("institution_id", PropKit.get("institution_id"));
-			jsonObject.put("accession_num", record.getStr("AccessionNumber"));
+			jsonObject.put("accession_num", record.getStr("PatientId"));
 			//机构类型：1：accnum2：patnum
-			jsonObject.put("ins_type", "1");
+			jsonObject.put("ins_type", "2");
 			JSONObject pJsonObject = new JSONObject();
 			pJsonObject.put("params", jsonObject.toJSONString());
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);

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", "4");
+				params.put("type", "2");
 				
 				params.put("institution_id", PropKit.get("institution_id"));
 
-				params.put("code", record.getStr("study_uid"));
+				params.put("code", record.getStr("PatientId"));
 				//报告医生姓名
 				params.put("report_doctor_name", record.getStr("ReportDoctor"));
 				//报告时间