commit

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

@@ -173,7 +173,7 @@ public class ViewController extends Controller {
 					//患者身份证号
 					params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 					//检查结果1阴2阳
-					params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+					params.put("report_result", record.getStr("RESULT")==null?"":(record.getStr("RESULT").equals("1")?"2":"1"));
 					params.put("hopitalized_no", record.getStr("PATIENTID"));
 					
 					dService.saveReport(params);

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

@@ -66,7 +66,7 @@ public class DataTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+			params.put("report_result", record.getStr("RESULT")==null?"":(record.getStr("RESULT").equals("1")?"2":"1"));
 			params.put("hopitalized_no", record.getStr("PATIENTID"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {

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

@@ -69,7 +69,7 @@ public class ReviewTask implements ITask {
 				//患者身份证号
 				params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 				//检查结果1阴2阳
-				params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+				params.put("report_result", record.getStr("RESULT")==null?"":(record.getStr("RESULT").equals("1")?"2":"1"));
 				params.put("hopitalized_no", record.getStr("PATIENTID"));
 				ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 				tService.execute(() -> {

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

@@ -66,7 +66,7 @@ public class TempTask implements ITask {
 			//患者身份证号
 			params.put("card_num", record.getStr("IDCARD")==null?"":record.getStr("IDCARD"));
 			//检查结果1阴2阳
-			params.put("report_result", record.getStr("RESULT").equals("1")?"2":"1");
+			params.put("report_result", record.getStr("RESULT")==null?"":(record.getStr("RESULT").equals("1")?"2":"1"));
 			params.put("hopitalized_no", record.getStr("PATIENTID"));
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {