commit

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

@@ -19,6 +19,7 @@ import com.zskk.service.ServiceFactory;
 import com.zskk.task.CFindTask;
 import com.zskk.task.CMoveTask;
 import com.zskk.task.DataTask;
+import com.zskk.task.InfoTask;
 import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -87,9 +88,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//同步报告
-//		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/4 * * * *", new DataTask());
-//		me.add(cpData);
+		Cron4jPlugin cpData = new Cron4jPlugin();
+		cpData.addTask("*/4 * * * *", new DataTask());
+		me.add(cpData);
 		
 		//将cfind请求检查录入待检查库
 		Cron4jPlugin inData = new Cron4jPlugin();
@@ -102,9 +103,14 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(cgData);
 		
 		//comve获取检查影像
-//		Cron4jPlugin mvData = new Cron4jPlugin();
-//		mvData.addTask("*/1 * * * *", new CMoveTask());
-//		me.add(mvData);
+		Cron4jPlugin mvData = new Cron4jPlugin();
+		mvData.addTask("*/1 * * * *", new CMoveTask());
+		me.add(mvData);
+		
+		//更新患者信息检查影像
+		Cron4jPlugin ifData = new Cron4jPlugin();
+		ifData.addTask("*/1 * * * *", new InfoTask());
+		me.add(ifData);
 	}
 
 	@Override

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

@@ -21,65 +21,68 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(100);	
-        for (Object object : jsonArray) {
+		JSONArray jsonArray = dService.getExamList(100);
+		for (Object object : jsonArray) {
 			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 reportinfo where accessionNumber=?",
+					jsonObject.getString("accession_num"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRPTION") == null && record.getStr("REVIEWDOCTOR") == null) {
+			if (record.getStr("description") == null && record.getStr("impression") == 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_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
-			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//审核时间
-			params.put("review_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//确认时间
-			params.put("confirm_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
-			//意见建议
-			params.put("impression", record.getStr("IMPRESSION"));
-			//影像所见
-			params.put("description", record.getStr("DESCRPTION"));
-			//exams表
-			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
-			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
-			//临床诊断
-			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
-			//症状
-			params.put("clin_symp", record.getStr("SYMPROM")==null?"":record.getStr("SYMPROM"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record.getStr("PATIENTNAME"));
-			//患者手机号
-			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
-			//患者身份证号
-			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("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
-			//门诊号
-			params.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
-			//病人ID
-			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
-			//检查方法
-			params.put("exam_project", record.getStr("PROIECT"));
+			// 报告医生姓名
+			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			// 报告时间
+			params.put("report_datetime", parseStringToDate(record.getStr("reportdate")));
+			// 审核医生姓名
+			params.put("review_doctor_name",
+					record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+			// 审核时间
+			params.put("review_datetime", parseStringToDate(record.getStr("reviewdate")));
+			// 确认医生姓名
+			params.put("confirm_doctor_name",
+					record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+			// 确认时间
+			params.put("confirm_datetime", parseStringToDate(record.getStr("reviewdate")));
+			// 意见建议
+			params.put("impression", record.getStr("impression"));
+			// 影像所见
+			params.put("description", record.getStr("description"));
+			// exams表
+			// 申请科室
+			params.put("application_department", record.getStr("department"));
+			// 申请医生
+			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			// 临床诊断
+			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
+			// 症状
+			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("card_num", record.getStr("idcard") == null ? "" : record.getStr("idcard"));
+			// 检查结果1阴2阳
+			params.put("report_result", record.getStr("result").contains("阳") ? "2" : "1");
+			// 门诊号住院号
+			params.put("hopitalized_no", record.getStr("inPatientNum") == null ? "" : record.getStr("inPatientNum"));
+			// 门诊号
+			params.put("out_patient", record.getStr("outPatientNum") == null ? "" : record.getStr("outPatientNum"));
+			// 病人ID
+			params.put("his_patient_id", record.getStr("patientid") == null ? "" : record.getStr("patientid"));
+			// 检查方法
+			params.put("exam_project", record.getStr("project"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);
-			});	
-        }
+			});
+		}
 	}
 
 	@Override
@@ -87,17 +90,18 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	/**
 	 * 日期字符串格式转换
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
 	private String parseStringToDate(String dateStr) {
 		if (dateStr == null) {
-			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		    Date date = new Date();
-		    String timeString = null;
+			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+			String timeString = null;
 			timeString = sdf2.format(date);
 			return timeString;
 		}

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

@@ -0,0 +1,107 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.service.DataService;
+import com.zskk.service.ServiceFactory;
+import com.zskk.service.ThreadPoolService;
+
+public class InfoTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+		JSONArray jsonArray = dService.getExamList(20);
+		for (Object object : jsonArray) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from examinfo where accessionNumber=?",
+					jsonObject.getString("accession_num"));
+			if (record == null) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			params.put("exam_id", jsonObject.getString("id"));
+			// 报告医生姓名
+			params.put("report_doctor_name", "");
+			// 报告时间
+			params.put("report_datetime", "");
+			// 审核医生姓名
+			params.put("review_doctor_name", "");
+			// 审核时间
+			params.put("review_datetime", "");
+			// 确认医生姓名
+			params.put("confirm_doctor_name", "");
+			// 确认时间
+			params.put("confirm_datetime", "");
+			// 意见建议
+			params.put("impression", "");
+			// 影像所见
+			params.put("description", "");
+			// exams表
+			// 申请科室
+			params.put("application_department", record.getStr("department"));
+			// 申请医生
+			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			// 临床诊断
+			params.put("clin_diag", record.getStr("diagnosis") == null ? "" : record.getStr("diagnosis"));
+			// 症状
+			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("card_num", record.getStr("idcard") == null ? "" : record.getStr("idcard"));
+			// 检查结果1阴2阳
+			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"));
+			// 病人ID
+			params.put("his_patient_id", record.getStr("patientid") == null ? "" : record.getStr("patientid"));
+			// 检查方法
+			params.put("exam_project", record.getStr("project"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});
+		}
+
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+
+	/**
+	 * 日期字符串格式转换
+	 * 
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+			String timeString = null;
+			timeString = sdf2.format(date);
+			return timeString;
+		}
+		return dateStr;
+	}
+
+}