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;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -75,6 +76,10 @@ public class ZskkConfig extends JFinalConfig {
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
+		
+		Cron4jPlugin reData = new Cron4jPlugin();
+		reData.addTask("*/10 * * * *", new ReviewTask());
+		me.add(reData);
 	}
 
 	@Override

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

@@ -20,74 +20,70 @@ public class ReviewTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		List<Record> records = Db.use("connected").find("select top 50 * from reportcheck order by checktime desc");
+		List<Record> records = Db.use("connected").find("select top 50 * from yyk_report order by last_updatetime 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
+				//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("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") == 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", "0");
-				// 门诊号住院号
-				params.put("hopitalized_no", "");
-				params.put("exam_project",
-						record.getStr("JianchaMingcheng") == null ? "" : record.getStr("JianchaMingcheng"));
-				params.put("exam_method", record.getStr("JianchaFangfa") == null ? "" : record.getStr("JianchaFangfa"));
+				params.put("code", record.getStr("yyk_study_uid"));
+				//报告医生姓名
+				params.put("report_doctor_name", record.getStr("yyk_report_doctor"));
+				//报告时间
+				params.put("report_datetime", parseStringToDate(record.getStr("yyk_reportdate")));
+				//审核医生姓名
+				params.put("review_doctor_name", record.getStr("yyk_review_doctor")==null?"":record.getStr("yyk_review_doctor"));
+				//审核时间
+				params.put("review_datetime", parseStringToDate(record.getStr("yyk_reportdate")));
+				//确认医生姓名
+				params.put("confirm_doctor_name", record.getStr("yyk_review_doctor")==null?"":record.getStr("yyk_review_doctor"));
+				//确认时间
+				params.put("confirm_datetime", parseStringToDate(record.getStr("yyk_reportdate")));
+				//意见建议
+				params.put("impression", record.getStr("yyk_impression"));
+				//影像所见
+				params.put("description", record.getStr("yyk_description"));
+				//exams表
+				//申请科室
+				params.put("application_department", record.getStr("yyk_department")==null?"":record.getStr("yyk_department"));
+				//申请医生
+				params.put("application_doctor", record.getStr("yyk_clinical_doctor"));
+				//临床诊断
+				params.put("clin_diag", "");
+				//症状
+				params.put("clin_symp", "");
+				//patient_infos表
+				//患者姓名
+				params.put("name", record.getStr("yyk_patient_name"));
+				//患者手机号
+				params.put("phone", record.getStr("yyk_phone")==null?"":record.getStr("yyk_phone"));
+				//患者身份证号
+				params.put("card_num", record.getStr("yyk_idcard"));
+				//检查结果1阴2阳
+				params.put("report_result", record.getStr("yyk_result").contains("阳")?"2":"1");
+				//住院号
+				params.put("hopitalized_no", record.getStr("yyk_hospital_num")==null?"":record.getStr("yyk_hospital_num"));
+				//门诊号
+//				params.put("out_patient", record.getStr("patientNumber"));
+				//病人ID
+				params.put("his_patient_id", record.getStr("yyk_patient_id"));
+				//检查方法
+				params.put("exam_project", record.getStr("yyk_medic")==null?"":record.getStr("yyk_medic"));
+
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 				tService.execute(() -> {
 					dService.saveReport(params);
-				});
-
-			} catch (Exception e) {
-				// TODO: handle exception
-				continue;
-			}
+				});	
+	        	} catch (Exception e) {
+					// TODO: handle exception
+	        		continue;
+				}
 
 		}