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

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

@@ -34,8 +34,14 @@ public class ViewController extends Controller {
 	 * 在被连接数据库执行sql语句
 	 */
 	public void executeSql() {
-		List<Record> d = Db.use("connected").find(this.getPara("sqlstr"));
-		this.renderJson(d);
+		try {
+			List<Record> d = Db.use("connected").find(this.getPara("sqlstr"));
+			this.renderJson(d);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+		
 	}
 
 	public void testConn() {

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

@@ -4,6 +4,7 @@ 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;
@@ -94,6 +95,7 @@ public class DataTask implements ITask {
 //			annex_params.put("annex_class_code", "3");
 //      		dService.saveAnnex(annex_params, record.getStr("report_url"));
         }
+		
 	}
 
 	@Override

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

@@ -0,0 +1,94 @@
+package com.zskk.task;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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 reportinfo_NEW order by reviewdate desc)where rownum <10");
+		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"));
+				//审核时间
+				params.put("review_datetime", record.getStr("reviewdate"));
+				//确认医生姓名
+				params.put("confirm_doctor_name", 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"));
+				//检查方法
+				params.put("exam_project", record.getStr("project"));
+	
+				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
+
+	}
+}

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

@@ -1,13 +1,89 @@
 package com.zskk.task;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+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 UpdateTask 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 reportinfo_NEW order by reviewdate desc)where rownum <10");
+		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"));
+				//审核时间
+				params.put("review_datetime", record.getStr("reviewdate"));
+				//确认医生姓名
+				params.put("confirm_doctor_name", 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"));
+				//检查方法
+				params.put("exam_project", record.getStr("project"));
+	
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+					dService.saveReport(params);
+				});	
+			} catch (Exception e) {
+				// TODO: handle exception
+				continue;
+			}
+		}
 	}
 
 	@Override