commit

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

@@ -168,76 +168,74 @@ public class ViewController extends Controller {
 		try {
 			DataService dService = ServiceFactory.getService(DataService.class);
 			  
-			List<Record> records = Db.use("connected").find(
-					"SELECT * FROM (select * from reportinfo where REVIEWDATE>to_date(?,'YYYY-MM-DD HH24:MI:SS') and REVIEWDATE<to_date(?,'YYYY-MM-DD HH24:MI:SS') and rownum < 500)ORDER BY REVIEWDATE DESC",this.getPara("from"),this.getPara("to"));
+			List<Record> records = Db.use("connected").find("select * from reportinfo where REVIEWDATE between ? and ?", this.getPara("from"),this.getPara("to"));
 			if (records == null) {
 				return;
 			}
 			for (Record record : records) {
 				try {
-				if (record.getStr("IMPRESSION") == null && record.getStr("DESCRPTION") == null
-						&& record.getStr("REVIEWDOCTOR") == null) {
-					continue;
-				}
-				Map<String, String> params = new HashMap<>();
-				params.put("type", "4");
-
-				params.put("institution_id", PropKit.get("institution_id"));
+					if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null && record.getStr("REVIEWDOCTOR") == null) {
+						continue;
+					}
+					Map<String, String> params = new HashMap<>();
+					//1:exam_id 2:patient_num 3:accession_num 4:study_uid
+					params.put("type", "3");
+					
+					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("REVIEWDATE"));
-				// 审核医生姓名
-				params.put("review_doctor_name",
-						record.getStr("REVIEWDOCTOR") == null ? "" : record.getStr("REVIEWDOCTOR"));
-				// 审核时间
-				params.put("review_datetime", record.getStr("REVIEWDATE"));
-				// 确认医生姓名
-				params.put("confirm_doctor_name",
-						record.getStr("REVIEWDOCTOR") == null ? "" : record.getStr("REVIEWDOCTOR"));
-				// 确认时间
-				params.put("confirm_datetime", record.getStr("REVIEWDATE"));
-				// 意见建议
-				params.put("impression", record.getStr("IMPRESSION"));
-				// 影像所见
-				params.put("description", record.getStr("DESCRPTION"));
-				// exams表
-				// 申请科室
-				params.put("application_department", record.getStr("DEPARTMENT")== null ? "" : record.getStr("DEPARTMENT"));
-				// 申请医生
-				params.put("application_doctor", record.getStr("CLINICALDOCTOR")== null ? "" : record.getStr("CLINICALDOCTOR"));
-				// 临床诊断
-				params.put("clin_diag", record.getStr("DIAGNOSE") == null ? "" : record.getStr("DIAGNOSE"));
-				// 症状
-				params.put("clin_symp", record.getStr("SYMPROM") == null ? "" : record.getStr("SYMPROM"));
-				// 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", record.getStr("RESULT").contains("阳") ? "2" : "1");
-				// 门诊号住院号
-				params.put("hopitalized_no", record.getStr("INPATIENTNUM") == null ? "" : record.getStr("INPATIENTNUM"));
-				// 门诊号
-				params.put("out_patient", record.getStr("OUTPATIENTNUM") == null ? "" : record.getStr("OUTPATIENTNUM"));
-				// 病人ID
-				params.put("his_patient_id", record.getStr("PATIENTID") == null ? "" : record.getStr("PATIENTID"));
-				// 检查方法
-				params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
-				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-				tService.execute(() -> {
-					dService.saveReport(params);
-				});
+					params.put("code", record.getStr("ACCESSIONNUMBER"));
+					//报告医生姓名
+					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("REVIEWDATE"));
+					//确认医生姓名
+					params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR")==null?"":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")==null?"":record.getStr("DEPARTMENT"));
+					//申请医生
+					params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":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", record.getStr("RESULT").contains("是")?"2":"1");
+					//门诊号住院号
+					params.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
+					//门诊号
+					params.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
+					//病人ID
+//					params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
+					//检查方法
+					params.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("PROJECT"));
+					ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+					tService.execute(() -> {
+						dService.saveReport(params);
+					});	
 				} catch (Exception e) {
 					// TODO: handle exception
 					continue;
 				}
 			}
+			
 			this.renderJson(records);
 		} catch (Exception e) {
 			// TODO: handle exception