From 067f6d6af10d2ad49fb32690bb3a9e95fccd1cfa Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 28 Sep 2017 01:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E7=AD=9B=E6=9F=A5=E5=BB=BA?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/BabyEarFacade.java | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 8aa48ff..13f8fc5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -856,8 +856,8 @@ public class BabyEarFacade {
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarFamily.getBadLifeHistory());
             StringBuffer historyStr = new StringBuffer("");
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (yesOrNo == 1) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyStr.append("有,");
                     if (historyJson.containsKey("yinJiu")) {
                         boolean yinJiu = historyJson.getBoolean("yinJiu");
@@ -1058,8 +1058,8 @@ public class BabyEarFacade {
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getRadiationHistoryType());
             StringBuffer historyStr = new StringBuffer("");
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (yesOrNo == 1) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyStr.append("有,");
                     if (historyJson.containsKey("other")) {
                         int other = historyJson.getIntValue("other");
@@ -1073,8 +1073,8 @@ public class BabyEarFacade {
         if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getDrugAppName())) {
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getDrugAppName());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyJson.put("yesOrNo", "有");
                 } else {
                     historyJson.put("yesOrNo", "无");
@@ -1086,8 +1086,8 @@ public class BabyEarFacade {
         if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getAbortionHistoryType())) {
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getAbortionHistoryType());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyJson.put("yesOrNo", "有");
                 } else {
                     historyJson.put("yesOrNo", "无");
@@ -1104,8 +1104,8 @@ public class BabyEarFacade {
         if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getHarmfulSubstanceType())) {
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getHarmfulSubstanceType());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyJson.put("yesOrNo", "有");
                 } else {
                     historyJson.put("yesOrNo", "无");
@@ -1119,8 +1119,8 @@ public class BabyEarFacade {
 
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBadLifeHistoryType());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyStr.append("有,");
                 }
             }
@@ -1157,8 +1157,8 @@ public class BabyEarFacade {
 
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getMedicalHistoryType());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyStr.append("有,");
                 }
             }
@@ -1211,8 +1211,8 @@ public class BabyEarFacade {
 
             JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBnormalPregnancyHistoryType());
             if (historyJson.containsKey("yesOrNo")) {
-                int yesOrNo = historyJson.getIntValue("yesOrNo");
-                if (1 == yesOrNo) {
+                Integer yesOrNo = historyJson.getInteger("yesOrNo");
+                if (yesOrNo!=null && yesOrNo == 1) {
                     historyStr.append("有,");
                 }
             }
-- 
1.8.3.1