jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 067f6d6af10d2ad49fb32690bb3a9e95fccd1cfa

Authored by liquanyu
1 parent de3ae7109e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力筛查建档

Showing 1 changed file with 16 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 067f6d6
... ... @@ -856,8 +856,8 @@
856 856 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarFamily.getBadLifeHistory());
857 857 StringBuffer historyStr = new StringBuffer("");
858 858 if (historyJson.containsKey("yesOrNo")) {
859   - int yesOrNo = historyJson.getIntValue("yesOrNo");
860   - if (yesOrNo == 1) {
  859 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  860 + if (yesOrNo!=null && yesOrNo == 1) {
861 861 historyStr.append("有,");
862 862 if (historyJson.containsKey("yinJiu")) {
863 863 boolean yinJiu = historyJson.getBoolean("yinJiu");
... ... @@ -1058,8 +1058,8 @@
1058 1058 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getRadiationHistoryType());
1059 1059 StringBuffer historyStr = new StringBuffer("");
1060 1060 if (historyJson.containsKey("yesOrNo")) {
1061   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1062   - if (yesOrNo == 1) {
  1061 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1062 + if (yesOrNo!=null && yesOrNo == 1) {
1063 1063 historyStr.append("有,");
1064 1064 if (historyJson.containsKey("other")) {
1065 1065 int other = historyJson.getIntValue("other");
... ... @@ -1073,8 +1073,8 @@
1073 1073 if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getDrugAppName())) {
1074 1074 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getDrugAppName());
1075 1075 if (historyJson.containsKey("yesOrNo")) {
1076   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1077   - if (1 == yesOrNo) {
  1076 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1077 + if (yesOrNo!=null && yesOrNo == 1) {
1078 1078 historyJson.put("yesOrNo", "有");
1079 1079 } else {
1080 1080 historyJson.put("yesOrNo", "无");
... ... @@ -1086,8 +1086,8 @@
1086 1086 if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getAbortionHistoryType())) {
1087 1087 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getAbortionHistoryType());
1088 1088 if (historyJson.containsKey("yesOrNo")) {
1089   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1090   - if (1 == yesOrNo) {
  1089 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1090 + if (yesOrNo!=null && yesOrNo == 1) {
1091 1091 historyJson.put("yesOrNo", "有");
1092 1092 } else {
1093 1093 historyJson.put("yesOrNo", "无");
... ... @@ -1104,8 +1104,8 @@
1104 1104 if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getHarmfulSubstanceType())) {
1105 1105 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getHarmfulSubstanceType());
1106 1106 if (historyJson.containsKey("yesOrNo")) {
1107   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1108   - if (1 == yesOrNo) {
  1107 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1108 + if (yesOrNo!=null && yesOrNo == 1) {
1109 1109 historyJson.put("yesOrNo", "有");
1110 1110 } else {
1111 1111 historyJson.put("yesOrNo", "无");
... ... @@ -1119,8 +1119,8 @@
1119 1119  
1120 1120 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBadLifeHistoryType());
1121 1121 if (historyJson.containsKey("yesOrNo")) {
1122   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1123   - if (1 == yesOrNo) {
  1122 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1123 + if (yesOrNo!=null && yesOrNo == 1) {
1124 1124 historyStr.append("有,");
1125 1125 }
1126 1126 }
... ... @@ -1157,8 +1157,8 @@
1157 1157  
1158 1158 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getMedicalHistoryType());
1159 1159 if (historyJson.containsKey("yesOrNo")) {
1160   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1161   - if (1 == yesOrNo) {
  1160 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1161 + if (yesOrNo!=null && yesOrNo == 1) {
1162 1162 historyStr.append("有,");
1163 1163 }
1164 1164 }
... ... @@ -1211,8 +1211,8 @@
1211 1211  
1212 1212 JSONObject historyJson = JSONObject.parseObject(babyPatientExtendEarMother.getBnormalPregnancyHistoryType());
1213 1213 if (historyJson.containsKey("yesOrNo")) {
1214   - int yesOrNo = historyJson.getIntValue("yesOrNo");
1215   - if (1 == yesOrNo) {
  1214 + Integer yesOrNo = historyJson.getInteger("yesOrNo");
  1215 + if (yesOrNo!=null && yesOrNo == 1) {
1216 1216 historyStr.append("有,");
1217 1217 }
1218 1218 }