Commit f0bb524a61773334e4c15bbb3cd774c0992b18df
1 parent
2ce3bb67d4
Exists in
master
and in
6 other branches
听力诊断模块
Showing 2 changed files with 28 additions and 14 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
f0bb524
| ... | ... | @@ -342,6 +342,19 @@ |
| 342 | 342 | BabyPatientExtendEarScreen firstScreen = screenList.get(0); |
| 343 | 343 | //初筛未通过 |
| 344 | 344 | StringBuffer firstResu = new StringBuffer(); |
| 345 | + if(firstScreen.getOaeLeft() == null){ | |
| 346 | + firstScreen.setOaeLeft(1); | |
| 347 | + } | |
| 348 | + if(firstScreen.getOaeRight()==null){ | |
| 349 | + firstScreen.setOaeRight(1); | |
| 350 | + } | |
| 351 | + if(firstScreen.getAabrLeft()==null){ | |
| 352 | + firstScreen.setAabrLeft(1); | |
| 353 | + } | |
| 354 | + if(firstScreen.getAabrRight()==null){ | |
| 355 | + firstScreen.setAabrRight(1); | |
| 356 | + } | |
| 357 | + | |
| 345 | 358 | if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getOaeRight() == -1) {//oae未通过 |
| 346 | 359 | firstResu.append("未通过("); |
| 347 | 360 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
View file @
f0bb524
| ... | ... | @@ -26,6 +26,7 @@ |
| 26 | 26 | import com.lyms.platform.query.BabyModelQuery; |
| 27 | 27 | import com.lyms.platform.query.PersonModelQuery; |
| 28 | 28 | import org.apache.commons.collections.CollectionUtils; |
| 29 | +import org.apache.commons.collections.map.HashedMap; | |
| 29 | 30 | import org.apache.commons.lang.StringUtils; |
| 30 | 31 | import org.apache.commons.lang.math.NumberUtils; |
| 31 | 32 | import org.slf4j.Logger; |
| ... | ... | @@ -1296,7 +1297,7 @@ |
| 1296 | 1297 | } |
| 1297 | 1298 | |
| 1298 | 1299 | public Map buildBabyEarResult(BabyPatientExtendEarScreen babyPatientExtendEarScreen) { |
| 1299 | - Map<String, Object> data = new HashMap<>(); | |
| 1300 | + Map<String, Object> data = new HashedMap(); | |
| 1300 | 1301 | data.put("id", babyPatientExtendEarScreen.getId()); |
| 1301 | 1302 | data.put("babyId", babyPatientExtendEarScreen.getBabyId()); |
| 1302 | 1303 | data.put("screenTypeStr", babyPatientExtendEarScreen.getScreenType() == 1 ? "初筛" : "复筛");//1= 2= |
| 1303 | 1304 | |
| 1304 | 1305 | |
| 1305 | 1306 | |
| 1306 | 1307 | |
| 1307 | 1308 | |
| 1308 | 1309 | |
| 1309 | 1310 | |
| 1310 | 1311 | |
| 1311 | 1312 | |
| 1312 | 1313 | |
| 1313 | 1314 | |
| 1314 | 1315 | |
| ... | ... | @@ -1327,31 +1328,31 @@ |
| 1327 | 1328 | data.put("highRiskCauseStr", hfBuff.toString()); |
| 1328 | 1329 | data.put("highRiskCause", highArr); |
| 1329 | 1330 | } |
| 1330 | - data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()); | |
| 1331 | + data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()==null?"":babyPatientExtendEarScreen.getOaeLeft()); | |
| 1331 | 1332 | data.put("oaeLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft() == null ? 0 : babyPatientExtendEarScreen.getOaeLeft())); |
| 1332 | - data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()); | |
| 1333 | + data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()==null?"":babyPatientExtendEarScreen.getOaeRight()); | |
| 1333 | 1334 | data.put("oaeRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight() == null ? 0 : babyPatientExtendEarScreen.getOaeRight())); |
| 1334 | - data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()); | |
| 1335 | + data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()==null?"":babyPatientExtendEarScreen.getAabrLeft()); | |
| 1335 | 1336 | data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft() == null ? 0 : babyPatientExtendEarScreen.getAabrLeft())); |
| 1336 | - data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()); | |
| 1337 | + data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()==null?"":babyPatientExtendEarScreen.getAabrRight()); | |
| 1337 | 1338 | data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight() == null ? 0 : babyPatientExtendEarScreen.getAabrRight())); |
| 1338 | - data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() + ""); | |
| 1339 | + data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() ==null?"":babyPatientExtendEarScreen.getGjb2Del35()); | |
| 1339 | 1340 | data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del35())); |
| 1340 | - data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() + ""); | |
| 1341 | + data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() ==null?"":babyPatientExtendEarScreen.getGjb2Del176()); | |
| 1341 | 1342 | data.put("gjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del176())); |
| 1342 | - data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() + ""); | |
| 1343 | + data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() ==null?"":babyPatientExtendEarScreen.getGjb2Del235()); | |
| 1343 | 1344 | data.put("gjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del235())); |
| 1344 | - data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299() + ""); | |
| 1345 | + data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299()==null?"":babyPatientExtendEarScreen.getGjb2Del299()); | |
| 1345 | 1346 | data.put("gjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del299())); |
| 1346 | - data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() + ""); | |
| 1347 | + data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4538()); | |
| 1347 | 1348 | data.put("gjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4538())); |
| 1348 | - data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() + ""); | |
| 1349 | + data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a42168()); | |
| 1349 | 1350 | data.put("gjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a42168())); |
| 1350 | - data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() + ""); | |
| 1351 | + data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()); | |
| 1351 | 1352 | data.put("gjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); |
| 1352 | - data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494() + ""); | |
| 1353 | + data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494()==null?"":babyPatientExtendEarScreen.getRrna1494()); | |
| 1353 | 1354 | data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494())); |
| 1354 | - data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() + ""); | |
| 1355 | + data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() ==null?"":babyPatientExtendEarScreen.getRrna1555()); | |
| 1355 | 1356 | data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555())); |
| 1356 | 1357 | data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断 |
| 1357 | 1358 | data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断 |