COMMIT

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

@@ -72,9 +72,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new OracleDialect());
 		me.add(arpConnected);
 
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 	}
 
 	@Override

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

@@ -24,7 +24,7 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(30);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from PACSONLINE_Interface where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from zskk_reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
@@ -34,7 +34,7 @@ public class DataTask implements ITask {
 			Map<String, String> params = new HashMap<>();
 			params.put("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			params.put("report_doctor_name", record.getStr("REPORTDOCTER"));
 			//报告时间
 			params.put("report_datetime", record.getStr("REPORTDATE"));
 			//审核医生姓名
@@ -53,9 +53,9 @@ public class DataTask implements ITask {
 			//申请科室
 			params.put("application_department", record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", "");
 			//临床诊断
-			params.put("clin_diag", "");
+			params.put("clin_diag", record.getStr("DIAGNOSIS"));
 			//症状
 			params.put("clin_symp", "");
 			//patient_infos表
@@ -64,9 +64,9 @@ public class DataTask implements ITask {
 			//患者手机号
 			params.put("phone", "");
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", "");
 			//检查结果1阴2阳
-			params.put("report_result", "0");
+			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);