From 4406110f63b0f1b440251e606c54ce3155a6c46b Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 9 Jul 2020 21:32:31 +0800 Subject: [PATCH] update --- .../operate/web/facade/BabyCheckFacade.java | 24 ++++++++++++++--- .../platform/operate/web/facade/ViewFacade.java | 31 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 6 deletions(-) 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 cdfef56..387c8db 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 @@ -1695,7 +1695,7 @@ public class BabyCheckFacade extends BaseServiceImpl { if (obj != null) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断 basicConfigQuery.setId(String.valueOf(obj)); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(datas)) { @@ -1703,12 +1703,25 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("id", datas.get(0).getId()); map.put("name", datas.get(0).getName()); list.add(map); + }else if(CollectionUtils.isEmpty(datas)){//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容 + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery(); + basicConfigQuery1.setYn(YnEnums.YES.getId()); + basicConfigQuery1.setId(String.valueOf(obj)); + List datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1); + if (CollectionUtils.isNotEmpty(datas2)) { + Map map = new HashMap<>(); + map.put("id", datas2.get(0).getId()); + map.put("name", datas2.get(0).getName()); + list.add(map); + } } + } } } model.setDiagnose(list); + List> otherDiagnoselist = new ArrayList<>(); String otherDiagnoseStr = checkModel.getOtherDiagnose(); if (!StringUtils.isEmpty(otherDiagnoseStr)) { List otherDiagnoses = JsonUtil.toList(otherDiagnoseStr, List.class); @@ -1716,20 +1729,20 @@ public class BabyCheckFacade extends BaseServiceImpl { if (obj != null) { BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);//秦皇岛，其它诊断使用的是诊断内容 basicConfigQuery.setId(String.valueOf(obj)); List datas = basicConfigService.queryBasicConfig(basicConfigQuery); if (CollectionUtils.isNotEmpty(datas)) { Map map = new HashMap<>(); map.put("id", datas.get(0).getId()); map.put("name", datas.get(0).getName()); - list.add(map); + otherDiagnoselist.add(map); } } } } - model.setOtherDiagnose(list); + model.setOtherDiagnose(otherDiagnoselist); model.setHandlSuggest(checkModel.getHandlSuggest()); model.setGuideSuggest(checkModel.getGuideSuggest()); @@ -1775,6 +1788,9 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setHighRisk(checkModel.getHighRisk()); List highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo()); model.setHighRiskInfo(highRiskInfos); + if(CollectionUtils.isEmpty(highRiskInfos)){ + model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛，高危诊断是手动输入，通过basicConfig获取不到，直接将结果存储起来 + } List weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo()); model.setWeakSonInfo(weakSonInfos); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 5181641..c02a706 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5218,7 +5218,9 @@ public class ViewFacade { model.setHighRisk(String.valueOf(babyModel.getHighRisk())); List highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo()); model.setHighRiskInfo(highRiskInfos); - + if(CollectionUtils.isEmpty(highRiskInfos)){ + model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛，高危诊断是手动输入，通过basicConfig获取不到，直接将结果存储起来 + } List weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo()); model.setWeakSonInfo(weakSonInfos); //后续更改 @@ -5252,6 +5254,19 @@ public class ViewFacade { } else { buildDiagnose += datas.get(0).getName(); } + }//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容 + else if (CollectionUtils.isEmpty(datas)) { + BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery(); + basicConfigQuery2.setYn(YnEnums.YES.getId()); + basicConfigQuery2.setId(String.valueOf(diagnoses.get(i))); + List datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2); + if (CollectionUtils.isNotEmpty(datas2)) { + if (i != diagnoses.size() - 1) { + buildDiagnose += datas2.get(0).getName() + ","; + } else { + buildDiagnose += datas2.get(0).getName(); + } + } } } @@ -5261,7 +5276,7 @@ public class ViewFacade { model.setBuildDiagnose(buildDiagnose); String checkOtherDiagnose = ""; - String checkOtherDiagnoseStr = babyModel.getDiagnose(); + String checkOtherDiagnoseStr = checkModel.getOtherDiagnose(); if (!com.lyms.platform.common.utils.StringUtils.isEmpty(checkOtherDiagnoseStr)) { List checkOthers = JsonUtil.toList(checkOtherDiagnoseStr, List.class); for (int i = 0; i < checkOthers.size(); i++) { @@ -5525,6 +5540,18 @@ public class ViewFacade { } else { diagnoseValue += datas.get(0).getName(); } + } else if (CollectionUtils.isEmpty(datas)) { + BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery(); + basicConfigQuery2.setYn(YnEnums.YES.getId()); + basicConfigQuery2.setId(String.valueOf(diagnoses.get(i))); + List datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2); + if (CollectionUtils.isNotEmpty(datas2)) { + if (i != diagnoses.size() - 1) { + diagnoseValue += datas2.get(0).getName() + ","; + } else { + diagnoseValue += datas2.get(0).getName(); + } + } } } -- 1.8.3.1