commit

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

@@ -81,7 +81,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//更新审核后报告
 		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/15 * * * *", new CheckTask());
+		upData.addTask("*/10 * * * *", new CheckTask());
 		me.add(upData);
 		
 		//更新患者信息

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

@@ -4,10 +4,13 @@ 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;
@@ -21,67 +24,72 @@ public class CheckTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(5000);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportcheck where studyuid=?", jsonObject.getString("studyuid"));
-			if (record == null) {
-				continue;
-			}
-//			if (parseStringToDate(record.getStr("checktime"))==Boolean.FALSE) {
-//				continue;
-//			}
-			if (record.getStr("impression").isBlank() && record.getStr("description").isBlank()) {
-				continue;
-			}
-			Map<String, String> params = new HashMap<>();
-			params.put("exam_id", 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("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"));
-			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor"));
-			//临床诊断
-			params.put("clin_diag", "");
-			//症状
-			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", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.saveReport(params);
-			});	
-        	} catch (Exception e) {
+		List<Record> records = Db.use("connected").find("select top 50 * from reportcheck order by reportdate 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
+				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"));
+				// 申请医生
+				params.put("application_doctor", record.getStr("clinicaldoctor"));
+				// 临床诊断
+				params.put("clin_diag", record.getStr("diagnosis") == null ? "" : 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", "0");
+				// 门诊号住院号
+				params.put("hopitalized_no", "");
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+					dService.saveReport(params);
+				});
+
+			} catch (Exception e) {
 				// TODO: handle exception
-        		continue;
+				continue;
 			}
-        }
+
+		}
+
 	}
 
 	@Override
@@ -89,9 +97,10 @@ public class CheckTask implements ITask {
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	/**
 	 * 日期字符串格式转换
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
@@ -99,21 +108,21 @@ public class CheckTask implements ITask {
 		if (dateStr == null) {
 			return Boolean.FALSE;
 		}
-		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);
-			Long i=date.getTime();
+			Long i = date.getTime();
 			Date datenewDate = new Date();
-			Long j =datenewDate.getTime();
-			Long k =j-i;
-			if (k<=14400000) {
+			Long j = datenewDate.getTime();
+			Long k = j - i;
+			if (k <= 14400000) {
 				return Boolean.FALSE;
-			}else {
+			} else {
 				return Boolean.TRUE;
 			}
-			
+
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

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

@@ -8,6 +8,7 @@ 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;
@@ -36,7 +37,12 @@ public class DataTask implements ITask {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
-			params.put("exam_id", jsonObject.getString("id"));
+			//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+			params.put("type", "1");
+			
+			params.put("institution_id", PropKit.get("institution_id"));
+
+			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
 			params.put("report_doctor_name", record.getStr("reportdoctor"));
 			//报告时间