c0mmit

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

@@ -121,7 +121,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//二次CMOVE
 		Cron4jPlugin reData = new Cron4jPlugin();
-		reData.addTask("*/12 * * * *", new ReCMoveTask());
+		reData.addTask("*/10 * * * *", new ReCMoveTask());
 		me.add(reData);
 	}
 

DataFusion/src/com/zskk/control/ViewController.java

@@ -132,6 +132,82 @@ public class ViewController extends Controller {
 
 	}
 	
+	public void sdreview() {
+		DataService dService = ServiceFactory.getService(DataService.class);
+		  
+		List<Record> records = Db.use("connected").find(
+				"SELECT * FROM (select * from reportinfo where REVIEWDATE>to_date(?,'YYYY-MM-DD HH24:MI:SS') and REVIEWDATE<to_date(?,'YYYY-MM-DD HH24:MI:SS') and rownum < 50)ORDER BY REVIEWDATE DESC",this.getPara("from"),this.getPara("to"));
+		if (records == null) {
+			return;
+		}
+		for (Record record : records) {
+			try {
+			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRPTION") == null
+					&& record.getStr("REVIEWDOCTOR") == null) {
+				continue;
+			}
+			Map<String, String> params = new HashMap<>();
+			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("REVIEWDATE"));
+			// 审核医生姓名
+			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("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"));
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});
+			} catch (Exception e) {
+				// TODO: handle exception
+				continue;
+			}
+		}
+		this.renderJson(records);
+	}
+	
 	public static DruidPlugin createConnectedDruidPlugin() {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());

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

@@ -23,7 +23,7 @@ public class ReCMoveTask implements ITask {
 //			return;
 //		}
 		//2小时到2天内的检查重新获取
-		List<Record> studyidfinds = Db.use("local").find("select * from study where status =3 and createAt between ? and ? and (modalities like '%CT%' or modalities like '%MR%' or modalities like '%DX%' or modalities like '%CR%') order by createAt asc", parseStringToDateTo(), parseStringToDateFrom());
+		List<Record> studyidfinds = Db.use("local").find("select * from study where status =3 and updateAt between ? and ? and (modalities like '%CT%' or modalities like '%MR%' or modalities like '%DX%' or modalities like '%CR%') order by createAt asc limit 3", parseStringToDateTo(), parseStringToDateFrom());
 		if (studyidfinds == null) {
 			return;
 		}