diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index cd698cd..ff87faf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -169,11 +169,23 @@ public class BabyCheckFacade extends BaseServiceImpl { basicConfigQuery.setIds(request.getDiagnose()); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); List diagnoseNames = new ArrayList<>(); - if (datas != null) { + if (CollectionUtils.isNotEmpty(datas)) { for (BasicConfig data : datas) { diagnoseNames.add(data.getName()); } } + //处理秦皇岛数据问题 + else if(CollectionUtils.isEmpty(datas)){ + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); + basicConfigQuery1.setYn(YnEnums.YES.getId()); + basicConfigQuery1.setIds(request.getDiagnose()); + List datas1 = basicConfigService.queryBasicConfig(basicConfigQuery1); + if (CollectionUtils.isNotEmpty(datas1)) { + for (BasicConfig data : datas1) { + diagnoseNames.add(data.getName()); + } + } + } bm.setLastDiagnose(diagnoseNames); } babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); @@ -534,11 +546,24 @@ public class BabyCheckFacade extends BaseServiceImpl { basicConfigQuery.setIds(request.getDiagnose()); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); List diagnoseNames = new ArrayList<>(); - if (datas != null) { + if (CollectionUtils.isNotEmpty(datas)) { for (BasicConfig data : datas) { diagnoseNames.add(data.getName()); } } + //处理秦皇岛数据问题 + else if(CollectionUtils.isEmpty(datas)){ + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); + basicConfigQuery1.setYn(YnEnums.YES.getId()); + basicConfigQuery1.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery1.setIds(request.getDiagnose()); + List datas1 = basicConfigService.queryBasicConfig(basicConfigQuery1); + if (CollectionUtils.isNotEmpty(datas1)) { + for (BasicConfig data : datas1) { + diagnoseNames.add(data.getName()); + } + } + } bm.setLastDiagnose(diagnoseNames); }