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 {
@@ -79,6 +80,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/DataTask.java

@@ -22,7 +22,7 @@ public class DataTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(80);	
+        JSONArray jsonArray = dService.getExamList(60);	
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
@@ -30,7 +30,7 @@ public class DataTask implements ITask {
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
+			if (record.getStr("impression").isBlank() || record.getStr("description").isBlank() || record.getStr("reviewdate").isBlank()) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();

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

@@ -0,0 +1,126 @@
+package com.zskk.task;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+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 80 * from reportinfo order by reviewdate desc");
+		if (records == null) {
+			return;
+		}
+		for (Record record : records) {	
+			if (record.getStr("impression").isBlank() || record.getStr("description").isBlank() || record.getStr("reviewdate").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", parseStringToDate(record.getStr("reportdate")));
+			// 审核医生姓名
+			params.put("review_doctor_name",
+					record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+			// 审核时间
+			params.put("review_datetime", parseStringToDate(record.getStr("reviewdate")));
+			// 确认医生姓名
+			params.put("confirm_doctor_name",
+					record.getStr("reviewdoctor") == null ? "" : record.getStr("reviewdoctor"));
+			// 确认时间
+			params.put("confirm_datetime", parseStringToDate(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("patientNumber"));
+			// 检查方法
+			params.put("exam_project", record.getStr("project"));
+
+			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+			tService.execute(() -> {
+				dService.saveReport(params);
+			});
+		}
+
+	}
+
+	@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;
+	}
+
+}

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

@@ -20,7 +20,7 @@ public class UpdateTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(30);	
+        JSONArray jsonArray = dService.getExamList(10);	
         for (Object object : jsonArray) {
         	try {
 			JSONObject jsonObject = JSON.parseObject(object.toString());