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 5d17d27..37c954b 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 @@ -236,7 +236,7 @@ public class AntenatalExaminationFacade { break; } //复诊 - if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) { + if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"[]".equals(model.getRiskFactor())) { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); highScoreResult = queryRisk(list1, needLevel); next=false; @@ -247,8 +247,14 @@ public class AntenatalExaminationFacade { //风险因素 Map map1 = new HashMap(); map1.put("id", ""); - map1.put("name", map.get("fxysu")); - highScoreResult.getHighRisk().add(map1); + Object obj = map.get("fxysu"); + if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){ + map1.put("name", map.get("fxysu")); + highScoreResult.getHighRisk().add(map1); + }else { + continue; + } + //风险评分 Object idObj = map.get("fxpf"); if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) { @@ -285,7 +291,7 @@ public class AntenatalExaminationFacade { if(!next){ break; } - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) { + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); highScoreResult = queryRisk(list2,true); next=false; @@ -295,8 +301,13 @@ public class AntenatalExaminationFacade { //风险因素 Map map1 = new HashMap(); map1.put("id", ""); - map1.put("name", map.get("fxysu")); - highScoreResult.getHighRisk().add(map1); + Object obj = map.get("fxysu"); + if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){ + map1.put("name", map.get("fxysu")); + highScoreResult.getHighRisk().add(map1); + }else { + continue; + } //风险评分 Object idObj = map.get("fxpf"); if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) {