commit

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

@@ -86,18 +86,18 @@ public class ZskkConfig extends JFinalConfig {
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/5 * * * *", new DataTask());
+		me.add(cpData);
 		
 		Cron4jPlugin inData = new Cron4jPlugin();
-		inData.addTask("5 2 * * *", new UpdateTask());
+		inData.addTask("*/10 * * * *", new UpdateTask());
 		me.add(inData);
-//		
-//		Cron4jPlugin cgData = new Cron4jPlugin();
-//		cgData.addTask("50 1 * * *", new CFindTask());
-//		me.add(cgData);
-//		
+		
+		Cron4jPlugin cgData = new Cron4jPlugin();
+		cgData.addTask("*/5 * * * *", new CFindTask());
+		me.add(cgData);
+		
 		Cron4jPlugin mvData = new Cron4jPlugin();
 		mvData.addTask("*/1 * * * *", new CMoveTask());
 		me.add(mvData);

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

@@ -24,11 +24,11 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(80);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where accessionNumber=?", jsonObject.getString("accession_num"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("impression") == null && record.getStr("description") == null) {
+			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRPTION") == null) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -38,37 +38,38 @@ public class DataTask implements ITask {
 			//报告时间
 			params.put("report_datetime", record.getStr("reportdate"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//审核时间
 			params.put("review_datetime", record.getStr("reportdate"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//确认时间
 			params.put("confirm_datetime", record.getStr("reportdate"));
 			//意见建议
-			params.put("impression", record.getStr("impression"));
+			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见
-			params.put("description", record.getStr("description"));
+			params.put("description", record.getStr("DESCRPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("department"));
+			params.put("application_department", record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis"));
+			params.put("clin_diag", record.getStr("DIAGNOSE"));
 			//症状
-			params.put("clin_symp", "");
+			params.put("clin_symp", record.getStr("SYMPROM")==null?"":record.getStr("SYMPROM"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("patientname"));
+			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", record.getStr("phone"));
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("idcard")==null?"":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", record.getStr("RESULT").contains("阳")?"2":"1");
 			//门诊号住院号
-//			params.put("hopitalized_no", record.getStr("hospitalNumber")==null?"":record.getStr("hospitalNumber"));
+			params.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
+			
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);