diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 37d2c91..2785aa0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -251,17 +251,21 @@ public class AntenatalExaminationFacade { highScoreResult.getHighRisk().add(map1); //风险评分 Object idObj = map.get("fxpf"); - if (null != idObj) { + if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); } if(needLevel){ Object idObj1 = map.get("fyyse"); - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); - Map map2 = new HashMap<>(); - map2.put("id", basicConfig.getId()); - map2.put("name", basicConfig.getName()); - highScoreResult.getLevel().add(map2); + if (null!=idObj1&&!"null".equals(idObj1.toString())&&!"".equals(idObj1.toString())) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + if(null!=basicConfig){ + Map map2 = new HashMap<>(); + map2.put("id", basicConfig.getId()); + map2.put("name", basicConfig.getName()); + highScoreResult.getLevel().add(map2); + } + } } next=false; } @@ -295,17 +299,21 @@ public class AntenatalExaminationFacade { highScoreResult.getHighRisk().add(map1); //风险评分 Object idObj = map.get("fxpf"); - if (null != idObj) { + if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); } if(needLevel){ Object idObj1 = map.get("fyyse"); - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); - Map map2 = new HashMap<>(); - map2.put("id", basicConfig.getId()); - map2.put("name", basicConfig.getName()); - highScoreResult.getLevel().add(map2); + if (null!=idObj1&&!"null".equals(idObj1.toString())&&!"".equals(idObj1.toString())) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + if(null!=basicConfig){ + Map map2 = new HashMap<>(); + map2.put("id", basicConfig.getId()); + map2.put("name", basicConfig.getName()); + highScoreResult.getLevel().add(map2); + } + } } next=false; }