commit

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

@@ -88,9 +88,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//报告匹配定时任务
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/5 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/1 * * * *", new DataTask());
+		me.add(cpData);
 		
 		//读取CFIND文件录入数据库定时任务
 		Cron4jPlugin inData = new Cron4jPlugin();

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

@@ -14,6 +14,7 @@ import com.jfinal.plugin.cron4j.ITask;
 import com.zskk.service.DataService;
 import com.zskk.service.ServiceFactory;
 import com.zskk.service.ThreadPoolService;
+import com.zskk.tools.XmlHelper;
 
 public class DataTask implements ITask {
 
@@ -24,56 +25,58 @@ 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("local").findFirst("select * from report_xml where number=?", jsonObject.getString("patient_num"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("impression") == null && record.getStr("description") == null) {
-				continue;
-			}
+			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("exam_id", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			params.put("report_doctor_name", xmlHelper.getString("/Request/Body/CheckReportDoctor"));
 			//报告时间
-			params.put("report_datetime", record.getStr("reportdate"));
+			params.put("report_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
+			params.put("review_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
 			//审核时间
-			params.put("review_datetime", record.getStr("reviewdate"));
+			params.put("review_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?record.getStr("reportdoctor"):"");
+			params.put("confirm_doctor_name", xmlHelper.getString("/Request/Body/ReviewDoctorSign"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("reviewdate"));
+			params.put("confirm_datetime", parseStringToDate(xmlHelper.getString("/Request/Body/CheckReportDate")));
 			//意见建议
-			params.put("impression", record.getStr("impression"));
+			params.put("impression", xmlHelper.getString("/Request/Body/CheckResultSub"));
 			//影像所见
-			params.put("description", record.getStr("description"));
+			params.put("description", xmlHelper.getString("/Request/Body/CheckReportObj"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("department"));
+			params.put("application_department", xmlHelper.getString("/Request/Body/CheckApplyDept"));
 			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			params.put("application_doctor", "");
 			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis"));
+			params.put("clin_diag", "");
 			//症状
-			params.put("clin_symp", record.getStr("symptom"));
+			params.put("clin_symp", "");
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("patientname"));
+			params.put("name", xmlHelper.getString("/Request/Body/PatientName"));
 			//患者手机号
-			params.put("phone", record.getStr("phone"));
+			params.put("phone", xmlHelper.getString("/Request/Body/Phone"));
 			//患者身份证号
-			params.put("card_num", record.getStr("idcard")==null?"":record.getStr("idcard"));
+			params.put("card_num", xmlHelper.getString("/Request/Body/PatientIDCard"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
+			params.put("report_result", "0");
 			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("inPatientNum")==null?"":record.getStr("inPatientNum"));
-			params.put("out_patient", record.getStr("outPatientNum")==null?"":record.getStr("outPatientNum"));
+//			params.put("hopitalized_no", xmlHelper.getString("/Request/Body/CheckReportObj"));
+//			params.put("out_patient", xmlHelper.getString("/Request/Body/CheckReportObj"));
 			//病人ID
-			params.put("his_patient_id", record.getStr("patientNum"));
+//			params.put("his_patient_id", xmlHelper.getString("/Request/Body/CheckReportObj"));
 			//检查方法
-			params.put("exam_project", record.getStr("project"));
+//			params.put("exam_project", xmlHelper.getString("/Request/Body/CheckReportObj"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);
@@ -96,7 +99,7 @@ public class DataTask implements ITask {
 		if (dateStr == null) {
 			return "";
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyyMMddHHmmss");
 	    Date date = null;
 	    String timeString = null;
 		try {