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("*/1 * * * *", new UpdateTask());
 		me.add(upData);
+		
+		Cron4jPlugin reData = new Cron4jPlugin();
+		reData.addTask("*/8 * * * *", new ReviewTask());
+		me.add(reData);
 	}
 
 	@Override

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

@@ -4,10 +4,8 @@ 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;
@@ -22,76 +20,78 @@ public class ReviewTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);	
-        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() || record.getStr("reviewdoctor").isBlank()) {
-				continue;
-			}
-			Map<String, String> params = new HashMap<>();
-			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
-			params.put("type", "1");
-			
-			params.put("institution_id", PropKit.get("institution_id"));
+		List<Record> records = Db.use("connected").find("select top 20 * from reportinfo order by reviewdate desc");
+		for (Record record : records) {
+			try {
+				if (record == null) {
+					continue;
+				}
+				if (record.getStr("impression").isBlank() || record.getStr("description").isBlank() || record.getStr("reviewdoctor").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", 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("reviewdate"));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor")==null?"":record.getStr("reviewdoctor"));
-			//确认时间
-			params.put("confirm_datetime", 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"));
-			//症状
-			params.put("clin_symp", record.getStr("symptom"));
-			//patient_infos表
-			//患者姓名
-			params.put("name", record.getStr("patientname"));
-			//患者手机号
-			params.put("phone", record.getStr("phone"));
-			//患者身份证号
-			params.put("card_num", record.getStr("idcard"));
-			//检查结果1阴2阳
-			params.put("report_result", record.getStr("result").contains("阳")?"2":"1");
-			//住院号
-			params.put("hopitalized_no", record.getStr("inPatientNum"));
-			//门诊号
-			params.put("out_patient", record.getStr("outPatientNum"));
-			//病人ID
-			params.put("his_patient_id", record.getStr("patientNum"));
-			//检查方法
-			params.put("exam_project", record.getStr("project"));
+				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("reviewdate"));
+				// 确认医生姓名
+				params.put("confirm_doctor_name",
+						record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+				// 确认时间
+				params.put("confirm_datetime", 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"));
+				// 症状
+				params.put("clin_symp", record.getStr("symptom"));
+				// patient_infos表
+				// 患者姓名
+				params.put("name", record.getStr("patientname"));
+				// 患者手机号
+				params.put("phone", record.getStr("phone"));
+				// 患者身份证号
+				params.put("card_num", record.getStr("idcard"));
+				// 检查结果1阴2阳
+				params.put("report_result", record.getStr("result").contains("阳") ? "2" : "1");
+				// 住院号
+				params.put("hopitalized_no", record.getStr("inPatientNum"));
+				// 门诊号
+				params.put("out_patient", record.getStr("outPatientNum"));
+				// 病人ID
+				params.put("his_patient_id", record.getStr("patientNum"));
+				// 检查方法
+				params.put("exam_project", record.getStr("project"));
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+					dService.saveReport(params);
+				});
 
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.saveReport(params);
-			});	
-        	} catch (Exception e) {
+			} catch (Exception e) {
 				// TODO: handle exception
-        		continue;
+				continue;
 			}
-        }
+
+		}
+
 	}
 
 	@Override
@@ -99,9 +99,10 @@ public class ReviewTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	/**
 	 * 日期字符串格式转换
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
@@ -109,19 +110,19 @@ public class ReviewTask 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;
 	}
 
 }