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 13f8fc5..8aa48ff 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")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (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")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (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")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { 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")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { 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")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { historyJson.put("yesOrNo", "有"); } else { historyJson.put("yesOrNo", "无"); @@ -1119,8 +1119,8 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBadLifeHistoryType()); if (historyJson.containsKey("yesOrNo")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { historyStr.append("有,"); } } @@ -1157,8 +1157,8 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getMedicalHistoryType()); if (historyJson.containsKey("yesOrNo")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { historyStr.append("有,"); } } @@ -1211,8 +1211,8 @@ public class BabyEarFacade { JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBnormalPregnancyHistoryType()); if (historyJson.containsKey("yesOrNo")) { - Integer yesOrNo = historyJson.getInteger("yesOrNo"); - if (yesOrNo!=null && yesOrNo == 1) { + int yesOrNo = historyJson.getIntValue("yesOrNo"); + if (1 == yesOrNo) { historyStr.append("有,"); } }