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

@@ -25,7 +25,7 @@ public class DataTask implements ITask {
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from zskk_reportinfo_1 where STUDYUID=?", jsonObject.getString("patient_num"));
 			if (record == null) {
 				continue;
 			}
@@ -52,26 +52,26 @@ 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("DEPATMENT"));
 			//申请医生
 			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", "");
 			//症状
-			params.put("clin_symp", "");
+			params.put("clin_symp", record.getStr("SYMPOM")==null?"":record.getStr("SYMPOM"));
 			//patient_infos表
 			//患者姓名
 			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("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", "0");
 			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("patientNumber"));
+//			params.put("hopitalized_no", 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(() -> {