commit

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

@@ -25,11 +25,11 @@ public class DataTask implements ITask {
         JSONArray jsonArray = dService.getExamList(50);	
         for (Object object : jsonArray) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
-			Record record = Db.use("connected").findFirst("select * from reportinfo where studyuid=?", jsonObject.getString("studyuid"));
+			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYUID=?", jsonObject.getString("studyuid"));
 			if (record == null) {
 				continue;
 			}
-			if (record.getStr("impression") == null && record.getStr("description") == null) {
+			if (record.getStr("IMPRESSION") == null && record.getStr("DESCRIPTION") == null) {
 				continue;
 			}
 			Map<String, String> params = new HashMap<>();
@@ -40,42 +40,50 @@ public class DataTask implements ITask {
 
 			params.put("code", jsonObject.getString("id"));
 			//报告医生姓名
-			params.put("report_doctor_name", record.getStr("reportdoctor"));
+			params.put("report_doctor_name", record.getStr("REPORTDOCTOR"));
 			//报告时间
-			params.put("report_datetime", record.getStr("reportdate"));
+			params.put("report_datetime", record.getStr("REPORTDATE")==null?"":record.getStr("REPORTDATE"));
 			//审核医生姓名
-			params.put("review_doctor_name", record.getStr("reviewdoctor"));
+			params.put("review_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//审核时间
-			params.put("review_datetime", record.getStr("reportdate"));
+			params.put("review_datetime", record.getStr("REVIEWDATE")==null?"":record.getStr("REPORTDATE"));
 			//确认医生姓名
-			params.put("confirm_doctor_name", record.getStr("reviewdoctor"));
+			params.put("confirm_doctor_name", record.getStr("REVIEWDOCTOR"));
 			//确认时间
-			params.put("confirm_datetime", record.getStr("reportdate"));
+			params.put("confirm_datetime", record.getStr("REVIEWDATE")==null?"":record.getStr("REPORTDATE"));
 			//意见建议
-			params.put("impression", record.getStr("impression"));
+			params.put("impression", record.getStr("IMPRESSION"));
 			//影像所见
-			params.put("description", record.getStr("description"));
+			params.put("description", record.getStr("DESCRIPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("department"));
+			params.put("application_department", record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("clinicaldoctor"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
 			//临床诊断
-			params.put("clin_diag", record.getStr("diagnosis"));
+			params.put("clin_diag", record.getStr("DIAGNOSIS")==null?"":record.getStr("DIAGNOSIS"));
 			//症状
-			params.put("clin_symp", record.getStr("symptom"));
+			params.put("clin_symp", record.getStr("SYMPTOM")==null?"":record.getStr("SYMPTOM"));
 			//patient_infos表
 			//患者姓名
-			params.put("name", record.getStr("patientname"));
+			params.put("name", record.getStr("PATIENTNAME"));
 			//患者手机号
-			params.put("phone", record.getStr("phone"));
+			params.put("phone", record.getStr("PHONE")==null?"":record.getStr("PHONE"));
 			//患者身份证号
-			params.put("card_num", record.getStr("idcard"));
+			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
 			params.put("report_result", "0");
 			//门诊号住院号
-			params.put("hopitalized_no", record.getStr("patientnumber"));
-			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
+            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);
 			});