commit

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

@@ -253,9 +253,9 @@ public class ViewController extends Controller {
 				params.put("description", record.getStr("DESCRPTION"));
 				// exams表
 				// 申请科室
-				params.put("application_department", record.getStr("DEPARTMENT"));
+				params.put("application_department", record.getStr("DEPARTMENT")== null ? "" : record.getStr("DEPARTMENT"));
 				// 申请医生
-				params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+				params.put("application_doctor", record.getStr("CLINICALDOCTOR")== null ? "" : record.getStr("CLINICALDOCTOR"));
 				// 临床诊断
 				params.put("clin_diag", record.getStr("DIAGNOSE") == null ? "" : record.getStr("DIAGNOSE"));
 				// 症状
@@ -276,7 +276,7 @@ public class ViewController extends Controller {
 				// 病人ID
 				params.put("his_patient_id", record.getStr("PATIENTID") == null ? "" : record.getStr("PATIENTID"));
 				// 检查方法
-				params.put("exam_project", record.getStr("PROIECT"));
+				params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 				tService.execute(() -> {
 					dService.saveReport(params);

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

@@ -56,9 +56,9 @@ public class DataTask implements ITask {
 			params.put("description", record.getStr("DESCRPTION"));
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
 			//症状
@@ -79,7 +79,7 @@ public class DataTask implements ITask {
 			//病人ID
 			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
 			//检查方法
-			params.put("exam_project", record.getStr("PROIECT"));
+			params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);

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

@@ -48,9 +48,9 @@ public class InfoTask implements ITask {
 			params.put("description", "");
 			//exams表
 			//申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("DEPARTMENT")==null?"":record.getStr("DEPARTMENT"));
 			//申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")==null?"":record.getStr("CLINICALDOCTOR"));
 			//临床诊断
 			params.put("clin_diag", record.getStr("DIAGNOSE")==null?"":record.getStr("DIAGNOSE"));
 			//症状
@@ -71,7 +71,7 @@ public class InfoTask implements ITask {
 			//病人ID
 			params.put("his_patient_id", record.getStr("PATIENTID")==null?"":record.getStr("PATIENTID"));
 			//检查方法
-			params.put("exam_project", record.getStr("PROIECT"));
+			params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.updatePatientInfo(params);

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

@@ -58,9 +58,9 @@ public class ReviewTask implements ITask {
 			params.put("description", record.getStr("DESCRPTION"));
 			// exams表
 			// 申请科室
-			params.put("application_department", record.getStr("DEPARTMENT"));
+			params.put("application_department", record.getStr("DEPARTMENT")== null ? "" : record.getStr("DEPARTMENT"));
 			// 申请医生
-			params.put("application_doctor", record.getStr("CLINICALDOCTOR"));
+			params.put("application_doctor", record.getStr("CLINICALDOCTOR")== null ? "" : record.getStr("CLINICALDOCTOR"));
 			// 临床诊断
 			params.put("clin_diag", record.getStr("DIAGNOSE") == null ? "" : record.getStr("DIAGNOSE"));
 			// 症状
@@ -81,7 +81,7 @@ public class ReviewTask implements ITask {
 			// 病人ID
 			params.put("his_patient_id", record.getStr("PATIENTID") == null ? "" : record.getStr("PATIENTID"));
 			// 检查方法
-			params.put("exam_project", record.getStr("PROIECT"));
+			params.put("exam_project", record.getStr("PROIECT")==null?"":record.getStr("PROIECT"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				dService.saveReport(params);