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

@@ -35,13 +35,13 @@ public class DataTask implements ITask {
 			}
 			Map<String, String> params = new HashMap<>();
 			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
-			params.put("type", "1");
-			
-			params.put("institution_id", PropKit.get("institution_id"));
+//			params.put("type", "1");
+//			
+//			params.put("institution_id", PropKit.get("institution_id"));
 
-			params.put("code", jsonObject.getString("id"));
+			params.put("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			params.put("report_doctor_name", record.getStr("REPORTDOCTOR")==null?"":record.getStr("REPORTDOCTOR"));
 			//报告时间
 			params.put("report_datetime", record.getStr("REPORTDATE"));
 			//审核医生姓名
@@ -58,22 +58,22 @@ public class DataTask implements ITask {
 			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("clin_diag")==null?"":record.getStr("clin_diag"));
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
-			params.put("clin_symp", record.getStr("clin_symp")==null?"":record.getStr("clin_symp"));
+			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
 			//patient_infos表
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", record.getStr("phone")==null?"":record.getStr("phone"));
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("IDCARD"));
+			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			params.put("report_result", "0");
 			//住院号
 //			params.put("hopitalized_no", record.getStr("patientNumber"));
 			//门诊号
@@ -81,7 +81,7 @@ public class DataTask implements ITask {
 			//病人ID
 //			params.put("his_patient_id", record.getStr("patientNumber"));
 			//检查方法
-			params.put("exam_project", record.getStr("patientNumber"));
+//			params.put("exam_project", record.getStr("patientNumber"));
 
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {