commit

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

@@ -77,9 +77,9 @@ public class ZskkConfig extends JFinalConfig {
 		cpData.addTask("*/5 * * * *", new DataTask());
 		me.add(cpData);
 		
-//		Cron4jPlugin upData = new Cron4jPlugin();
-//		upData.addTask("*/2 * * * *", new UpdateTask());
-//		me.add(upData);
+		Cron4jPlugin upData = new Cron4jPlugin();
+		upData.addTask("*/2 * * * *", new UpdateTask());
+		me.add(upData);
 	}
 
 	@Override

DataFusion/src/com/zskk/service/DataService.java

@@ -47,6 +47,8 @@ public class DataService {
 	
 	private static String SAVE_ANNEX_URL = "https://risserver3.pacsonline.cn/butt/saveAnnex";
 	
+	private static String UPDATE_PATIENT_URL = "https://risserver3.pacsonline.cn/butt/saveExam";
+	
     private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
     
     /**
@@ -78,6 +80,16 @@ public class DataService {
 		
 	}
     
+    /**
+     * 更新患者信息
+     * 
+     * @param instutionId
+     * @param number
+     */
+     public void updatePatientInfo(Map<String, String> map) {
+     postWithParameters(UPDATE_PATIENT_URL, map);
+     }
+    
     /**
 	 * 创建登记信息  
 	 * 

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

@@ -4,6 +4,9 @@ import java.util.HashMap;
 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;
@@ -18,72 +21,48 @@ public class UpdateTask implements ITask {
 	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
+        JSONArray jsonArray = dService.getExamList(30);
+        for (Object object : jsonArray) {
+        	try {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			Record record = Db.use("connected").findFirst("select * from examinfo where studyuid=?", jsonObject.getString("studyuid"));
+			if (record == null) {
 				continue;
 			}
-		}
+			Map<String, String> params = new HashMap<>();
+			params.put("exam_id", jsonObject.getString("id"));
+			//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"));
+			//住院号
+			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.updatePatientInfo(params);
+			});	
+        	} catch (Exception e) {
+				// TODO: handle exception
+        		continue;
+			}
+        }
+		
 	}
 
 	@Override