commit

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

@@ -47,11 +47,11 @@ public class DataTask implements ITask {
 			//审核医生姓名
 			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime", parseStringToDate(record.getStr("REPORTDATE")));
+			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("REPORTDATE")));
+			params.put("confirm_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
 			//意见建议
 			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见

DataFusion/src/com/zskk/task/UpdateTask.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;
@@ -23,69 +24,72 @@ public class UpdateTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-        JSONArray jsonArray = dService.getExamList(180);	
-        for (Object object : jsonArray) {
-        	try {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where ACCESSIONNUMBER=?", jsonObject.getString("patient_num"));
-			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", "1");
-			
-			params.put("institution_id", PropKit.get("institution_id"));
+//        JSONArray jsonArray = dService.getExamList(180);	
+//        for (Object object : jsonArray) {
+//        	try {
+//			JSONObject jsonObject = JSON.parseObject(object.toString());
+			List<Record> records = Db.use("connected").find("select * from (select * from reportinfo order by REVIEWDATE desc) where rownum<100");
+			for (Record record : records) {
+				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", "2");
+				
+				params.put("institution_id", PropKit.get("institution_id"));
 
-			params.put("code", jsonObject.getString("id"));
-			//报告医生姓名
-			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("REPORTDATE")));
-			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":record.getStr("REVIEWDOCTOR"));
-			//确认时间
-			params.put("confirm_datetime", parseStringToDate(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")==null?"":record.getStr("SYMPTOM"));
-			//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", "0");
-			//门诊号住院号
-			params.put("hopitalized_no", "");
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-			tService.execute(() -> {
-				dService.saveReport(params);
-			});	
-        	} catch (Exception e) {
-				// TODO: handle exception
-        		continue;
+				params.put("code", record.getStr("ACCESSIONNUMBER"));
+				//报告医生姓名
+				params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+				//报告时间
+				params.put("report_datetime", parseStringToDate(record.getStr("REVIEWDATE")));
+				//审核医生姓名
+				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("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")==null?"":record.getStr("SYMPTOM"));
+				//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", "0");
+				//门诊号住院号
+				params.put("hopitalized_no", "");
+				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+				tService.execute(() -> {
+					dService.saveReport(params);
+				});	
 			}
-        }
+			
+//        	} catch (Exception e) {
+//				// TODO: handle exception
+//        		continue;
+//			}
+//        }
 	}
 
 	@Override