commit

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

@@ -252,7 +252,11 @@ 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").contains("阳") ? "2" : "1");
+					String resultString = "";
+					if (record.getStr("result")!=null) {
+						resultString = record.getStr("result").contains("阳") ? "2" : "1";
+					}
+					params.put("report_result", resultString);
 					// 门诊号住院号
 					params.put("hopitalized_no", record.getStr("inPatientNum") == null ? "" : record.getStr("inPatientNum"));
 					// 门诊号

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

@@ -75,7 +75,11 @@ 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").contains("阳") ? "2" : "1");
+				String resultString = "";
+				if (record.getStr("result")!=null) {
+					resultString = record.getStr("result").contains("阳") ? "2" : "1";
+				}
+				params.put("report_result", resultString);
 				// 门诊号住院号
 				params.put("hopitalized_no", record.getStr("inPatientNum") == null ? "" : record.getStr("inPatientNum"));
 				// 门诊号

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

@@ -71,7 +71,11 @@ 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").contains("阳") ? "2" : "1");
+				String resultString = "";
+				if (record.getStr("result")!=null) {
+					resultString = record.getStr("result").contains("阳") ? "2" : "1";
+				}
+				params.put("report_result", resultString);
 				// 门诊号住院号
 				params.put("hopitalized_no", record.getStr("inPatientNum") == null ? "" : record.getStr("inPatientNum"));
 				// 门诊号