jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d692a438b104cdce0f523a0bc6eefe90cada98b2

Authored by wtt
1 parent 82ddca81a2
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 27 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ d692a43
... ... @@ -169,11 +169,23 @@
169 169 basicConfigQuery.setIds(request.getDiagnose());
170 170 List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
171 171 List<String> diagnoseNames = new ArrayList<>();
172   - if (datas != null) {
  172 + if (CollectionUtils.isNotEmpty(datas)) {
173 173 for (BasicConfig data : datas) {
174 174 diagnoseNames.add(data.getName());
175 175 }
176 176 }
  177 + //处理秦皇岛数据问题
  178 + else if(CollectionUtils.isEmpty(datas)){
  179 + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
  180 + basicConfigQuery1.setYn(YnEnums.YES.getId());
  181 + basicConfigQuery1.setIds(request.getDiagnose());
  182 + List<BasicConfig> datas1 = basicConfigService.queryBasicConfig(basicConfigQuery1);
  183 + if (CollectionUtils.isNotEmpty(datas1)) {
  184 + for (BasicConfig data : datas1) {
  185 + diagnoseNames.add(data.getName());
  186 + }
  187 + }
  188 + }
177 189 bm.setLastDiagnose(diagnoseNames);
178 190 }
179 191 babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
180 192  
... ... @@ -534,9 +546,22 @@
534 546 basicConfigQuery.setIds(request.getDiagnose());
535 547 List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
536 548 List<String> diagnoseNames = new ArrayList<>();
537   - if (datas != null) {
  549 + if (CollectionUtils.isNotEmpty(datas)) {
538 550 for (BasicConfig data : datas) {
539 551 diagnoseNames.add(data.getName());
  552 + }
  553 + }
  554 + //处理秦皇岛数据问题
  555 + else if(CollectionUtils.isEmpty(datas)){
  556 + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
  557 + basicConfigQuery1.setYn(YnEnums.YES.getId());
  558 + basicConfigQuery1.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  559 + basicConfigQuery1.setIds(request.getDiagnose());
  560 + List<BasicConfig> datas1 = basicConfigService.queryBasicConfig(basicConfigQuery1);
  561 + if (CollectionUtils.isNotEmpty(datas1)) {
  562 + for (BasicConfig data : datas1) {
  563 + diagnoseNames.add(data.getName());
  564 + }
540 565 }
541 566 }
542 567 bm.setLastDiagnose(diagnoseNames);