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 {
@@ -74,12 +75,16 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpConnected);
 
 		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new DataTask());
+		cpData.addTask("*/7 * * * *", new DataTask());
 		me.add(cpData);
 		
-		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/11 * * * *", new UpdateTask());
-		me.add(upData);
+//		Cron4jPlugin upData = new Cron4jPlugin();
+//		upData.addTask("*/11 * * * *", new UpdateTask());
+//		me.add(upData);
+		
+		Cron4jPlugin reData = new Cron4jPlugin();
+		reData.addTask("*/5 * * * *", new ReviewTask());
+		me.add(reData);
 	}
 
 	@Override

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

@@ -21,64 +21,78 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(50);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
-			if (record == null) {
-				continue;
-			}
-			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
-				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", record.getStr("reportdate"));
-			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
-			//审核时间
-			params.put("review_datetime", record.getStr("reportdate"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
-			//确认时间
-			params.put("confirm_datetime", record.getStr("reportdate"));
-			//意见建议
-			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")==null?"":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("阴")?"1":"2");
-			//门诊号住院号
-			String hString = record.getStr("hospitalNumber")==null?"":record.getStr("hospitalNumber");
-			params.put("hopitalized_no", record.getStr("patientNumber")==null?hString:record.getStr("patientNumber"));			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.saveReport(params);
-			});	
-        	} catch (Exception e) {
+		JSONArray jsonArray = dService.getExamList(50);
+		for (Object object : jsonArray) {
+			try {
+				JSONObject jsonObject = JSON.parseObject(object.toString());
+				if (jsonObject.getString("exam_class").equals("SC")) {
+					continue;
+				}
+
+				Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?",
+						jsonObject.getString("studyuid"));
+				if (record == null) {
+					continue;
+				}
+				if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+					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", record.getStr("reportdate"));
+				// 审核医生姓名
+				params.put("review_doctor_name",
+						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+				// 审核时间
+				params.put("review_datetime", record.getStr("AppoveTime")== null ? record.getStr("reportdate") : record.getStr("AppoveTime"));
+				// 确认医生姓名
+				params.put("confirm_doctor_name",
+						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+				// 确认时间
+				params.put("confirm_datetime", record.getStr("AppoveTime")== null ? record.getStr("reportdate") : record.getStr("AppoveTime"));
+				// 意见建议
+				params.put("impression", record.getStr("impression"));
+				// 影像所见
+				params.put("description", record.getStr("description"));
+				// exams表
+				// 申请科室
+				params.put("application_department",
+						record.getStr("department") == null ? "" : record.getStr("department"));
+
+				// 申请医生
+				params.put("application_doctor",
+						record.getStr("clinicaldoctor") == null ? "" : 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("阴") ? "1" : "2");
+				// 门诊号住院号
+				params.put("hopitalized_no",
+						record.getStr("patientNumber") == null
+								? (record.getStr("hospitalNumber") == null ? "" : record.getStr("hospitalNumber"))
+								: record.getStr("patientNumber"));
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+
+				tService.execute(() -> {
+					dService.saveReport(params);
+				});
+			} catch (Exception e) {
 				// TODO: handle exception
-        		continue;
+				continue;
 			}
-        }
+		}
 	}
 
 	@Override
@@ -86,9 +100,10 @@ public class DataTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	/**
 	 * 日期字符串格式转换
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
@@ -96,19 +111,19 @@ public class DataTask implements ITask {
 		if (dateStr == null) {
 			return "";
 		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
-	    Date date = null;
-	    String timeString = null;
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		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;
 	}
 
 }

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

@@ -0,0 +1,130 @@
+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 top 30 * from reportinfo order by AppoveTime desc");
+		for (Record record : records) {
+			try {
+				if (record == null) {
+					continue;
+				}
+				if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+					continue;
+				}
+				Map<String, String> params = new HashMap<>();
+				// 1:exam_id 2:patient_num 3:accession_num 4:study_uid
+				params.put("type", "4");
+
+				params.put("institution_id", PropKit.get("institution_id"));
+
+				params.put("code", record.getStr("studyuid"));
+				// 报告医生姓名
+				params.put("report_doctor_name", record.getStr("reportdoctor"));
+				// 报告时间
+				params.put("report_datetime", record.getStr("reportdate"));
+				// 审核医生姓名
+				params.put("review_doctor_name",
+						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+				// 审核时间
+				params.put("review_datetime", record.getStr("AppoveTime") == null ? record.getStr("reportdate")
+						: record.getStr("AppoveTime"));
+				// 确认医生姓名
+				params.put("confirm_doctor_name",
+						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+				// 确认时间
+				params.put("confirm_datetime", record.getStr("AppoveTime") == null ? record.getStr("reportdate")
+						: record.getStr("AppoveTime"));
+				// 意见建议
+				params.put("impression", record.getStr("impression"));
+				// 影像所见
+				params.put("description", record.getStr("description"));
+				// exams表
+				// 申请科室
+				params.put("application_department",
+						record.getStr("department") == null ? "" : record.getStr("department"));
+
+				// 申请医生
+				params.put("application_doctor",
+						record.getStr("clinicaldoctor") == null ? "" : 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("阴") ? "1" : "2");
+				// 门诊号住院号
+				params.put("hopitalized_no",
+						record.getStr("patientNumber") == null
+								? (record.getStr("hospitalNumber") == null ? "" : record.getStr("hospitalNumber"))
+								: record.getStr("patientNumber"));
+				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 parseStringToDate(String dateStr) {
+		if (dateStr == null) {
+			return "";
+		}
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+		Date date = null;
+		String timeString = null;
+		try {
+			date = sdf.parse(dateStr);
+			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;
+	}
+
+}