commit

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

@@ -18,6 +18,7 @@ import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
 import com.zskk.task.DataTask;
+import com.zskk.task.ReviewTask;
 import com.zskk.task.UpdateTask;
 
 public class ZskkConfig extends JFinalConfig {
@@ -80,6 +81,10 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin upData = new Cron4jPlugin();
 		upData.addTask("*/2 * * * *", new UpdateTask());
 		me.add(upData);
+		
+		Cron4jPlugin rwData = new Cron4jPlugin();
+		rwData.addTask("*/13 * * * *", new ReviewTask());
+		me.add(rwData);
 	}
 
 	@Override

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
@@ -33,7 +34,12 @@ public class DataTask implements ITask {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
-			params.put("exam_id", jsonObject.getString("id"));
+			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+			params.put("type", "1");
+			
+			params.put("institution_id", PropKit.get("institution_id"));
+
+			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
 			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
 			//报告时间

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

@@ -0,0 +1,128 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.jfinal.kit.PropKit;
+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 ReviewTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		DataService dService = ServiceFactory.getService(DataService.class);
+		List<Record> records = Db.use("connected").find("SELECT * FROM (select * from medreport.v_reportinfo where APPROVEDATE>to_date(?,'YYYY-MM-DD HH24:MI:SS')and rownum < 80)ORDER BY APPROVEDATE DESC", getNowDate());
+		for (Record record : records) {
+        	try {
+			if (record.getStr("REPORTDIAGNOSIS").isBlank() && record.getStr("REPORTFINDING").isBlank()) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+            params.put("type", "2");
+			
+			params.put("institution_id", PropKit.get("institution_id"));
+
+			params.put("code", record.getStr("ACCNUM"));			
+			//报告医生姓名
+			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+			//报告时间
+			params.put("report_datetime", record.getStr("REPRTDATE"));
+			//审核医生姓名
+			params.put("review_doctor_name", record.getStr("APPROVEDOCTOR")==null?"":record.getStr("APPROVEDOCTOR"));
+			//审核时间
+			params.put("review_datetime", record.getStr("APPROVEDATE"));
+			//确认医生姓名
+			params.put("confirm_doctor_name", record.getStr("APPROVEDOCTOR")==null?"":record.getStr("APPROVEDOCTOR"));
+			//确认时间
+			params.put("confirm_datetime", record.getStr("APPROVEDATE"));
+			//意见建议
+			params.put("impression", record.getStr("REPORTDIAGNOSIS"));
+			//影像所见
+			params.put("description", record.getStr("REPORTFINDING"));
+			//exams表
+			//申请科室
+			params.put("application_department", record.getStr("ORDERDEPARTMENT")==null?"":record.getStr("ORDERDEPARTMENT"));
+			//申请医生
+			params.put("application_doctor", record.getStr("ORDERDOCTOR")==null?"":record.getStr("ORDERDOCTOR"));
+			//临床诊断
+			params.put("clin_diag", "");
+			//症状
+			params.put("clin_symp", "");
+			//patient_infos表
+			//患者姓名
+			params.put("name", record.getStr("PNAME"));
+			//患者手机号
+			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("INHOSPITALNUM")==null?"":record.getStr("INHOSPITALNUM"));
+			//门诊号
+			params.put("out_patient", record.getStr("OUTHOSPITALNUM")==null?"":record.getStr("OUTHOSPITALNUM"));
+			//病人ID
+			params.put("his_patient_id", record.getStr("JZKH")==null?"":record.getStr("JZKH"));
+			//检查方法
+			params.put("exam_project", record.getStr("STUDYITEM")==null?"":record.getStr("STUDYITEM"));
+
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 获取当前时间
+	 * @param dateStr
+	 * @return
+	 */
+	private String getNowDate() {
+			SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		    Date date = new Date();
+		    //4小时
+		    Date lastDate = new Date(date.getTime()-3600000);
+		    String timeString = null;
+			timeString = sdf.format(lastDate);
+			return timeString;
+	}
+	
+	/**
+	 * 日期字符串格式转换年月日时分秒
+	 * 
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDateTime() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date = new Date();
+		String daString = sdf.format(date);
+		return daString;
+
+	}
+
+}