commit

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

@@ -207,93 +207,94 @@ public class ViewController extends Controller {
     			
     			params.put("accession_num", record.getStr("EXAMNO"));
     			renderJson(records);
-				String examid = dService.createRegisterInfo(params);
-				
-				if (examid == null) {
-					continue;
-				}
-				//匹配报告
-				Map<String, String> paramsreport = new HashMap<>();
-				paramsreport.put("type", "1");
-    			
-				paramsreport.put("institution_id", PropKit.get("institution_id"));
-
-				paramsreport.put("code", examid);
-    			//报告医生姓名
-				paramsreport.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
-    			//报告时间
-				paramsreport.put("report_datetime", record.getStr("REPORTDATE"));
-    			//审核医生姓名
-				paramsreport.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
-    			//审核时间
-				paramsreport.put("review_datetime", record.getStr("REVIEWDATE"));
-    			//确认医生姓名
-				paramsreport.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
-    			//确认时间
-				paramsreport.put("confirm_datetime", record.getStr("REVIEWDATE"));
-    			//意见建议
-				paramsreport.put("impression", record.getStr("IMPRESSION"));
-    			//影像所见
-				paramsreport.put("description", record.getStr("DESCRIPTION"));
-    			//exams表
-    			//申请科室
-				paramsreport.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
-    			//申请医生
-				paramsreport.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
-    			//临床诊断
-				paramsreport.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
-    			//症状
-				paramsreport.put("clin_symp", record.getStr("ILLNESS")==null?"":record.getStr("ILLNESS"));
-    			//patient_infos表
-    			//患者姓名
-				paramsreport.put("name", record.getStr("PATIENTNAME"));
-    			//患者手机号
-				paramsreport.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
-    			//患者身份证号
-				paramsreport.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
-    			//检查结果1阴2阳
-				paramsreport.put("report_result", "0");
-    			//门诊号住院号
-				paramsreport.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
-				paramsreport.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
-    			//病人ID
-				paramsreport.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
-    			//检查方法
-				paramsreport.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("PROJECT"));
-    			//1急诊 （out_patient）2住院（hopitalized_no）3门诊（out_patient）4体检（out_patient）
-    			switch (record.getStr("SOURCE")) {
-				case "门诊":
-					paramsreport.put("patient_source", "3");
-					break;
-				case "体检":
-					paramsreport.put("patient_source", "4");
-					break;
-				case "住院":
-					paramsreport.put("patient_source", "2");
-					break;
-				default:
-					break;
-				}
-
-    			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
-    			tService.execute(() -> {
-    				dService.saveReport(paramsreport);
-    			});	
-				
-				//上传报告附件
-    			Map<String, String> annex_params = new HashMap<>();
-				annex_params.put("institution_id", PropKit.get("institution_id"));
-				annex_params.put("type", "1");
-				annex_params.put("code", examid);
-				//附件类型1.mp4 2.pdf 3.jpeg
-				annex_params.put("annex_class_code", "3");
-	      		dService.saveAnnex(annex_params, record.getStr("RPTURL"));
-	      		Record usinfo = new Record().set("code", record.getStr("DIAGRPTID"))
-						.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
-				Db.use("local").save("usexam", usinfo);
+//				String examid = dService.createRegisterInfo(params);
+//				
+//				if (examid == null) {
+//					continue;
+//				}
+//				//匹配报告
+//				Map<String, String> paramsreport = new HashMap<>();
+//				paramsreport.put("type", "1");
+//    			
+//				paramsreport.put("institution_id", PropKit.get("institution_id"));
+//
+//				paramsreport.put("code", examid);
+//    			//报告医生姓名
+//				paramsreport.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
+//    			//报告时间
+//				paramsreport.put("report_datetime", record.getStr("REPORTDATE"));
+//    			//审核医生姓名
+//				paramsreport.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
+//    			//审核时间
+//				paramsreport.put("review_datetime", record.getStr("REVIEWDATE"));
+//    			//确认医生姓名
+//				paramsreport.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
+//    			//确认时间
+//				paramsreport.put("confirm_datetime", record.getStr("REVIEWDATE"));
+//    			//意见建议
+//				paramsreport.put("impression", record.getStr("IMPRESSION"));
+//    			//影像所见
+//				paramsreport.put("description", record.getStr("DESCRIPTION"));
+//    			//exams表
+//    			//申请科室
+//				paramsreport.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
+//    			//申请医生
+//				paramsreport.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
+//    			//临床诊断
+//				paramsreport.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
+//    			//症状
+//				paramsreport.put("clin_symp", record.getStr("ILLNESS")==null?"":record.getStr("ILLNESS"));
+//    			//patient_infos表
+//    			//患者姓名
+//				paramsreport.put("name", record.getStr("PATIENTNAME"));
+//    			//患者手机号
+//				paramsreport.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
+//    			//患者身份证号
+//				paramsreport.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
+//    			//检查结果1阴2阳
+//				paramsreport.put("report_result", "0");
+//    			//门诊号住院号
+//				paramsreport.put("hopitalized_no", record.getStr("INPATIENTNUM")==null?"":record.getStr("INPATIENTNUM"));
+//				paramsreport.put("out_patient", record.getStr("OUTPATIENTNUM")==null?"":record.getStr("OUTPATIENTNUM"));
+//    			//病人ID
+//				paramsreport.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
+//    			//检查方法
+//				paramsreport.put("exam_project", record.getStr("PROJECT")==null?"":record.getStr("PROJECT"));
+//    			//1急诊 （out_patient）2住院（hopitalized_no）3门诊（out_patient）4体检（out_patient）
+//    			switch (record.getStr("SOURCE")) {
+//				case "门诊":
+//					paramsreport.put("patient_source", "3");
+//					break;
+//				case "体检":
+//					paramsreport.put("patient_source", "4");
+//					break;
+//				case "住院":
+//					paramsreport.put("patient_source", "2");
+//					break;
+//				default:
+//					break;
+//				}
+//
+//    			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+//    			tService.execute(() -> {
+//    				dService.saveReport(paramsreport);
+//    			});	
+//				
+//				//上传报告附件
+//    			Map<String, String> annex_params = new HashMap<>();
+//				annex_params.put("institution_id", PropKit.get("institution_id"));
+//				annex_params.put("type", "1");
+//				annex_params.put("code", examid);
+//				//附件类型1.mp4 2.pdf 3.jpeg
+//				annex_params.put("annex_class_code", "3");
+//	      		dService.saveAnnex(annex_params, record.getStr("RPTURL"));
+//	      		Record usinfo = new Record().set("code", record.getStr("DIAGRPTID"))
+//						.set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
+//				Db.use("local").save("usexam", usinfo);
 			} catch (Exception e) {
 				// TODO: handle exception
-				continue;
+//				continue;
+				renderText(e.toString());
 			}
 	}
 	}