From e6fb239b4df817df68032771a78c2d761dcb69ec Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 20 Aug 2020 08:50:25 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyHighRiskBabyFacade.java | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 071191e..3f876f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -410,36 +410,41 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { } return number; } + private void getHighRiskMap(List > list, List highRiskDiagnose) { - for (Object obj : highRiskDiagnose) { - if (obj != null) { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setYn(YnEnums.YES.getId()); - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断 - basicConfigQuery.setId(String.valueOf(obj)); - List datas = basicConfigService.queryBasicConfig(basicConfigQuery); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { - Map map = new HashMap <>(); - map.put("id", datas.get(0).getId()); - map.put("name", datas.get(0).getName()); - list.add(map); - } //秦皇岛诊断内容是高危内容,如果不是诊断就判断是高危内容 - else if (org.apache.commons.collections.CollectionUtils.isEmpty(datas)) { - BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); - basicConfigQuery1.setYn(YnEnums.YES.getId()); - basicConfigQuery1.setId(String.valueOf(obj)); - List datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1); - if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas2)) { + if (highRiskDiagnose != null) { + + for (Object obj : highRiskDiagnose) { + if (obj != null) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断 + basicConfigQuery.setId(String.valueOf(obj)); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { Map map = new HashMap <>(); - map.put("id", datas2.get(0).getId()); - map.put("name", datas2.get(0).getName()); + map.put("id", datas.get(0).getId()); + map.put("name", datas.get(0).getName()); list.add(map); + } //秦皇岛诊断内容是高危内容,如果不是诊断就判断是高危内容 + else if (org.apache.commons.collections.CollectionUtils.isEmpty(datas)) { + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); + basicConfigQuery1.setYn(YnEnums.YES.getId()); + basicConfigQuery1.setId(String.valueOf(obj)); + List datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas2)) { + Map map = new HashMap <>(); + map.put("id", datas2.get(0).getId()); + map.put("name", datas2.get(0).getName()); + list.add(map); + } } - } + } } } } + private String getHighRiskDiagnoseStr(BabyHighRiskBabyModel babyHighRiskBabyModel) { String diagnoseValue = ""; if (CollectionUtils.isNotEmpty(babyHighRiskBabyModel.getHighRiskDiagnose())) { -- 1.8.3.1