Commit 00460e9106dd543932d1495ef927471db4738b1c
1 parent
6f37204d2d
Exists in
master
and in
6 other branches
听力诊断模块
Showing 1 changed file with 14 additions and 34 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
00460e9
| ... | ... | @@ -867,8 +867,6 @@ |
| 867 | 867 | historyStr.append("吸毒,"); |
| 868 | 868 | } |
| 869 | 869 | } |
| 870 | - } else { | |
| 871 | - historyStr.append("无"); | |
| 872 | 870 | } |
| 873 | 871 | String hfString = null; |
| 874 | 872 | if (historyStr.toString().endsWith(",")) { |
| 875 | 873 | |
| ... | ... | @@ -877,12 +875,10 @@ |
| 877 | 875 | hfString = historyStr.toString(); |
| 878 | 876 | } |
| 879 | 877 | babyEarFamilyView.setBadLifeHistory(hfString); |
| 880 | - } else { | |
| 881 | - babyEarFamilyView.setBadLifeHistory("无"); | |
| 882 | 878 | } |
| 883 | 879 | } |
| 884 | 880 | |
| 885 | - String deafType = "无"; | |
| 881 | + String deafType = ""; | |
| 886 | 882 | if (babyPatientExtendEarFamily.getDeafType() != null) { |
| 887 | 883 | if (babyPatientExtendEarFamily.getDeafType() == 1) { |
| 888 | 884 | deafType = "有"; |
| ... | ... | @@ -892,7 +888,7 @@ |
| 892 | 888 | babyEarFamilyView.setDeafType(deafType); |
| 893 | 889 | babyEarFamilyView.setDeatRelationship(babyPatientExtendEarFamily.getDeatRelationship()); |
| 894 | 890 | |
| 895 | - String proximityType = "无"; | |
| 891 | + String proximityType = ""; | |
| 896 | 892 | if (babyPatientExtendEarFamily.getProximityType() != null) { |
| 897 | 893 | if (babyPatientExtendEarFamily.getProximityType() == 1) { |
| 898 | 894 | proximityType = "有"; |
| ... | ... | @@ -976,8 +972,6 @@ |
| 976 | 972 | |
| 977 | 973 | if (StringUtils.isNotEmpty(hfString)) { |
| 978 | 974 | babyEarMotherView.setViralInfectionHistoryType(hfString); |
| 979 | - } else { | |
| 980 | - babyEarMotherView.setViralInfectionHistoryType("无"); | |
| 981 | 975 | } |
| 982 | 976 | } |
| 983 | 977 | |
| ... | ... | @@ -1046,8 +1040,6 @@ |
| 1046 | 1040 | |
| 1047 | 1041 | if (StringUtils.isNotEmpty(hfString)) { |
| 1048 | 1042 | babyEarMotherView.setGenitalInfectionHistoryType(hfString); |
| 1049 | - } else { | |
| 1050 | - babyEarMotherView.setGenitalInfectionHistoryType("无"); | |
| 1051 | 1043 | } |
| 1052 | 1044 | } |
| 1053 | 1045 | |
| 1054 | 1046 | |
| ... | ... | @@ -1063,11 +1055,7 @@ |
| 1063 | 1055 | int other = historyJson.getIntValue("other"); |
| 1064 | 1056 | historyStr.append("(孕" + other + "周)"); |
| 1065 | 1057 | } |
| 1066 | - } else { | |
| 1067 | - historyStr.append("无"); | |
| 1068 | 1058 | } |
| 1069 | - } else { | |
| 1070 | - historyStr.append("无"); | |
| 1071 | 1059 | } |
| 1072 | 1060 | babyEarMotherView.setRadiationHistoryType(historyStr.toString()); |
| 1073 | 1061 | } |
| ... | ... | @@ -1124,8 +1112,6 @@ |
| 1124 | 1112 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 1125 | 1113 | if (1 == yesOrNo) { |
| 1126 | 1114 | historyStr.append("有,"); |
| 1127 | - } else { | |
| 1128 | - historyStr.append("无"); | |
| 1129 | 1115 | } |
| 1130 | 1116 | } |
| 1131 | 1117 | if (historyJson.containsKey("yinJiu")) { |
| ... | ... | @@ -1154,8 +1140,6 @@ |
| 1154 | 1140 | hfString = historyStr.toString(); |
| 1155 | 1141 | } |
| 1156 | 1142 | babyEarMotherView.setBadLifeHistoryType(hfString); |
| 1157 | - } else { | |
| 1158 | - babyEarMotherView.setBadLifeHistoryType("无"); | |
| 1159 | 1143 | } |
| 1160 | 1144 | |
| 1161 | 1145 | if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getMedicalHistoryType())) { |
| ... | ... | @@ -1166,8 +1150,6 @@ |
| 1166 | 1150 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 1167 | 1151 | if (1 == yesOrNo) { |
| 1168 | 1152 | historyStr.append("有,"); |
| 1169 | - } else { | |
| 1170 | - historyStr.append("无"); | |
| 1171 | 1153 | } |
| 1172 | 1154 | } |
| 1173 | 1155 | |
| ... | ... | @@ -1222,8 +1204,6 @@ |
| 1222 | 1204 | int yesOrNo = historyJson.getIntValue("yesOrNo"); |
| 1223 | 1205 | if (1 == yesOrNo) { |
| 1224 | 1206 | historyStr.append("有,"); |
| 1225 | - } else { | |
| 1226 | - historyStr.append("无"); | |
| 1227 | 1207 | } |
| 1228 | 1208 | } |
| 1229 | 1209 | |
| ... | ... | @@ -1294,7 +1274,7 @@ |
| 1294 | 1274 | if (StringUtils.isNotEmpty(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber()))) { |
| 1295 | 1275 | babyEarBirthView.setTireNumber(TaiShuEnums.getTitle(babyPatientExtendEarBirth.getTireNumber())); |
| 1296 | 1276 | } |
| 1297 | - String birthDefectType = "无"; | |
| 1277 | + String birthDefectType = ""; | |
| 1298 | 1278 | if (babyPatientExtendEarBirth.getBirthDefectType() != null) { |
| 1299 | 1279 | if (babyPatientExtendEarBirth.getBirthDefectType() == 1) {//有 |
| 1300 | 1280 | birthDefectType = "有"; |
| ... | ... | @@ -1305,7 +1285,7 @@ |
| 1305 | 1285 | } |
| 1306 | 1286 | babyEarBirthView.setBirthDefectDesc(birthDefectType); |
| 1307 | 1287 | |
| 1308 | - String birthInjuryType = "无"; | |
| 1288 | + String birthInjuryType = ""; | |
| 1309 | 1289 | if (babyPatientExtendEarBirth.getBirthInjuryType() != null) { |
| 1310 | 1290 | if (babyPatientExtendEarBirth.getBirthInjuryType() == 1) {//有 |
| 1311 | 1291 | birthInjuryType = "有"; |
| ... | ... | @@ -1316,7 +1296,7 @@ |
| 1316 | 1296 | } |
| 1317 | 1297 | babyEarBirthView.setBirthInjuryPosition(birthInjuryType); |
| 1318 | 1298 | |
| 1319 | - String parturitType = "无"; | |
| 1299 | + String parturitType = ""; | |
| 1320 | 1300 | if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) { |
| 1321 | 1301 | if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有 |
| 1322 | 1302 | parturitType = "有,"; |
| ... | ... | @@ -1344,7 +1324,7 @@ |
| 1344 | 1324 | } |
| 1345 | 1325 | } |
| 1346 | 1326 | babyEarBirthView.setAbnormalParturition(parturitType); |
| 1347 | - String fetuStr = "无"; | |
| 1327 | + String fetuStr = ""; | |
| 1348 | 1328 | if (babyPatientExtendEarBirth.getFetuEmbarrasType() != null) { |
| 1349 | 1329 | if (babyPatientExtendEarBirth.getFetuEmbarrasType() == 1) {//有 |
| 1350 | 1330 | fetuStr = "有"; |
| ... | ... | @@ -1360,7 +1340,7 @@ |
| 1360 | 1340 | babyEarBirthView.setApgarScore(apgarScore); |
| 1361 | 1341 | |
| 1362 | 1342 | |
| 1363 | - String deformity = "无"; | |
| 1343 | + String deformity = ""; | |
| 1364 | 1344 | if (babyPatientExtendEarBirth.getDeformityType() != null && babyPatientExtendEarBirth.getDeformityType() == 1) { |
| 1365 | 1345 | deformity = "有"; |
| 1366 | 1346 | if (babyPatientExtendEarBirth.getDeformityPosition() != null) { |
| ... | ... | @@ -1369,7 +1349,7 @@ |
| 1369 | 1349 | } |
| 1370 | 1350 | |
| 1371 | 1351 | babyEarBirthView.setDeformity(deformity); |
| 1372 | - String headTraumaHistory = "无"; | |
| 1352 | + String headTraumaHistory = ""; | |
| 1373 | 1353 | if (babyPatientExtendEarBirth.getHeadTraumaHistory() != null && babyPatientExtendEarBirth.getHeadTraumaHistory() == 1) { |
| 1374 | 1354 | headTraumaHistory = "有"; |
| 1375 | 1355 | if (babyPatientExtendEarBirth.getHeadTraumaDesc() != null) { |
| 1376 | 1356 | |
| ... | ... | @@ -1377,14 +1357,14 @@ |
| 1377 | 1357 | } |
| 1378 | 1358 | } |
| 1379 | 1359 | babyEarBirthView.setHeadTraumaDesc(headTraumaHistory); |
| 1380 | - String birthInfection = "无"; | |
| 1360 | + String birthInfection = ""; | |
| 1381 | 1361 | if (babyPatientExtendEarBirth.getBirthInfectionType() != null && babyPatientExtendEarBirth.getBirthInfectionType() == 1) { |
| 1382 | 1362 | birthInfection = "有"; |
| 1383 | 1363 | } |
| 1384 | 1364 | babyEarBirthView.setBirthInfectionType(birthInfection); |
| 1385 | 1365 | babyEarBirthView.setBirthInfectionCause(babyPatientExtendEarBirth.getBirthInfectionCause()); |
| 1386 | 1366 | babyEarBirthView.setBirthCourseDisease(babyPatientExtendEarBirth.getBirthCourseDisease()); |
| 1387 | - String birthIllType = "无"; | |
| 1367 | + String birthIllType = ""; | |
| 1388 | 1368 | if (babyPatientExtendEarBirth.getBirthIllType() != null && babyPatientExtendEarBirth.getBirthIllType() == 1) { |
| 1389 | 1369 | birthIllType = "有"; |
| 1390 | 1370 | } |
| ... | ... | @@ -1392,7 +1372,7 @@ |
| 1392 | 1372 | |
| 1393 | 1373 | babyEarBirthView.setBirthIllCause(babyPatientExtendEarBirth.getBirthIllCause()); |
| 1394 | 1374 | babyEarBirthView.setBirthIllDisease(babyPatientExtendEarBirth.getBirthIllDisease()); |
| 1395 | - String earPoisonType = "无"; | |
| 1375 | + String earPoisonType = ""; | |
| 1396 | 1376 | if (babyPatientExtendEarBirth.getEarPoisonType() != null && babyPatientExtendEarBirth.getEarPoisonType() == 1) { |
| 1397 | 1377 | earPoisonType = "有"; |
| 1398 | 1378 | } |
| ... | ... | @@ -1400,7 +1380,7 @@ |
| 1400 | 1380 | |
| 1401 | 1381 | babyEarBirthView.setEarPoison(babyPatientExtendEarBirth.getEarPoisonMap()); |
| 1402 | 1382 | |
| 1403 | - String tympanitisType = "无"; | |
| 1383 | + String tympanitisType = ""; | |
| 1404 | 1384 | if (babyPatientExtendEarBirth.getTympanitisType() != null && babyPatientExtendEarBirth.getTympanitisType() == 1) { |
| 1405 | 1385 | tympanitisType = "有"; |
| 1406 | 1386 | if (babyPatientExtendEarBirth.getTympanitisDesc() != null) { |
| 1407 | 1387 | |
| ... | ... | @@ -1410,14 +1390,14 @@ |
| 1410 | 1390 | |
| 1411 | 1391 | babyEarBirthView.setTympanitisDesc(tympanitisType); |
| 1412 | 1392 | |
| 1413 | - String nicuType = "无"; | |
| 1393 | + String nicuType = ""; | |
| 1414 | 1394 | if (babyPatientExtendEarBirth.getNicuType() != null && babyPatientExtendEarBirth.getNicuType() == 1) { |
| 1415 | 1395 | nicuType = "有"; |
| 1416 | 1396 | } |
| 1417 | 1397 | babyEarBirthView.setNicuType(nicuType); |
| 1418 | 1398 | babyEarBirthView.setNicuCause(babyPatientExtendEarBirth.getNicuCause()); |
| 1419 | 1399 | babyEarBirthView.setNicuContinuedDate(babyPatientExtendEarBirth.getNicuContinuedDate()); |
| 1420 | - String respiratorType = "无"; | |
| 1400 | + String respiratorType = ""; | |
| 1421 | 1401 | if (babyPatientExtendEarBirth.getRespiratorType() != null && babyPatientExtendEarBirth.getRespiratorType() == 1) { |
| 1422 | 1402 | respiratorType = "有"; |
| 1423 | 1403 | } |