commit

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

@@ -107,10 +107,10 @@ public class ZskkConfig extends JFinalConfig {
 		mvData.addTask("*/2 * * * *", new CMoveTask());
 		me.add(mvData);
 		
-		//更新患者信息定时任务
-//		Cron4jPlugin upData = new Cron4jPlugin();
-//		upData.addTask("*/2 * * * *", new ExamTask());
-//		me.add(upData);
+		//更新报告匹配
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/5 * * * *", new ExamTask());
+		me.add(upData);
 	}
 
 	@Override

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

@@ -36,7 +36,7 @@ public class DataTask implements ITask {
 //				continue;
 //			}
 			Map<String, String> params = new HashMap<>();
-            params.put("type", "1");
+            params.put("type", "2");
 			
 			params.put("institution_id", PropKit.get("institution_id"));
 
@@ -81,7 +81,7 @@ public class DataTask implements ITask {
 			//病人ID
 			params.put("his_patient_id", xmlHelper.getString("/Request/Body/PatientID"));
 			//检查方法
-//			params.put("exam_project", xmlHelper.getString("/Request/Body/CheckReportObj"));
+			params.put("exam_project", xmlHelper.getString("/Request/Body/CheckProjectName"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);

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

@@ -23,70 +23,66 @@ public class ExamTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-				DataService dService = ServiceFactory.getService(DataService.class);
-//		        JSONArray jsonArray = dService.getExamList(80);	
-//		        for (Object object : jsonArray) {
-//					JSONObject jsonObject = JSON.parseObject(object.toString());
-					List<Record> records = Db.use("local").find("select * from report_xml order by createdAt desc limit 80");
-					for (Record record : records) {
-						String contString = record.getStr("report_xml");
-						XmlHelper xmlHelper = XmlHelper.of(contString);
-//						if (record.getStr("impression") == null && record.getStr("description") == null) {
-//							continue;
-//						}
-						Map<String, String> params = new HashMap<>();
-			            params.put("type", "1");
-						
-						params.put("institution_id", PropKit.get("institution_id"));
+		DataService dService = ServiceFactory.getService(DataService.class);
+
+		List<Record> records = Db.use("local").find("select * from report_xml order by createdAt desc limit 80");
+		for (Record record : records) {
+			String contString = record.getStr("report_xml");
+			XmlHelper xmlHelper = XmlHelper.of(contString);
+
+			Map<String, String> params = new HashMap<>();
+			params.put("type", "1");
+
+			params.put("institution_id", PropKit.get("institution_id"));
+
+			params.put("code", record.getStr("number"));
+			// 报告医生姓名
+			params.put("report_doctor_name", xmlHelper.getString("/Request/Body/CheckReportDoctor"));
+			// 报告时间
+			params.put("report_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
+			// 审核医生姓名
+			params.put("review_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
+			// 审核时间
+			params.put("review_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
+			// 确认医生姓名
+			params.put("confirm_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
+			// 确认时间
+			params.put("confirm_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
+			// 意见建议
+			params.put("impression", xmlHelper.getString("/Request/Body/CheckResultSub"));
+			// 影像所见
+			params.put("description", xmlHelper.getString("/Request/Body/CheckReportObj"));
+			// exams表
+			// 申请科室
+			params.put("application_department", xmlHelper.getString("/Request/Body/CheckApplyDept"));
+			// 申请医生
+			params.put("application_doctor", "");
+			// 临床诊断
+			params.put("clin_diag", "");
+			// 症状
+			params.put("clin_symp", "");
+			// patient_infos表
+			// 患者姓名
+			params.put("name", xmlHelper.getString("/Request/Body/PatientName"));
+			// 患者手机号
+			params.put("phone", xmlHelper.getString("/Request/Body/Phone"));
+			// 患者身份证号
+			params.put("card_num", xmlHelper.getString("/Request/Body/PatientIDCard"));
+			// 检查结果1阴2阳
+			params.put("report_result", "0");
+			// 门诊号住院号
+			params.put("hopitalized_no", xmlHelper.getString("/Request/Body/InPatientNO"));
+			params.put("out_patient", xmlHelper.getString("/Request/Body/OutPatientNO"));
+			// 病人ID
+			params.put("his_patient_id", xmlHelper.getString("/Request/Body/PatientID"));
+			// 检查方法
+			params.put("exam_project", xmlHelper.getString("/Request/Body/CheckProjectName"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});
+		}
 
-						params.put("code", record.getStr("number"));
-						//报告医生姓名
-						params.put("report_doctor_name", xmlHelper.getString("/Request/Body/CheckReportDoctor"));
-						//报告时间
-						params.put("report_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
-						//审核医生姓名
-						params.put("review_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
-						//审核时间
-						params.put("review_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
-						//确认医生姓名
-						params.put("confirm_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
-						//确认时间
-						params.put("confirm_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
-						//意见建议
-						params.put("impression", xmlHelper.getString("/Request/Body/CheckResultSub"));
-						//影像所见
-						params.put("description", xmlHelper.getString("/Request/Body/CheckReportObj"));
-						//exams表
-						//申请科室
-						params.put("application_department", xmlHelper.getString("/Request/Body/CheckApplyDept"));
-						//申请医生
-						params.put("application_doctor", "");
-						//临床诊断
-						params.put("clin_diag", "");
-						//症状
-						params.put("clin_symp", "");
-						//patient_infos表
-						//患者姓名
-						params.put("name", xmlHelper.getString("/Request/Body/PatientName"));
-						//患者手机号
-						params.put("phone", xmlHelper.getString("/Request/Body/Phone"));
-						//患者身份证号
-						params.put("card_num", xmlHelper.getString("/Request/Body/PatientIDCard"));
-						//检查结果1阴2阳
-						params.put("report_result", "0");
-						//门诊号住院号
-						params.put("hopitalized_no", xmlHelper.getString("/Request/Body/InPatientNO"));
-						params.put("out_patient", xmlHelper.getString("/Request/Body/OutPatientNO"));
-						//病人ID
-						params.put("his_patient_id", xmlHelper.getString("/Request/Body/PatientID"));
-						//检查方法
-//						params.put("exam_project", xmlHelper.getString("/Request/Body/CheckReportObj"));
-						ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-						tService.execute(() -> {
-							dService.saveReport(params);
-						});	
-			        }
-						
 	}
 
 	@Override
@@ -94,9 +90,10 @@ public class ExamTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	/**
 	 * 日期字符串格式转换
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
@@ -104,19 +101,19 @@ public class ExamTask implements ITask {
 		if (dateStr == null) {
 			return "";
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyyMMddHHmmss");
-	    Date date = null;
-	    String timeString = null;
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		Date date = null;
+		String timeString = null;
 		try {
 			date = sdf.parse(dateStr);
-			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 			timeString = sdf2.format(date);
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-        return timeString;
+		return timeString;
 	}
 
 }