jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4406110f63b0f1b440251e606c54ce3155a6c46b

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

update

Showing 2 changed files with 49 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 4406110
... ... @@ -1695,7 +1695,7 @@
1695 1695 if (obj != null) {
1696 1696 BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
1697 1697 basicConfigQuery.setYn(YnEnums.YES.getId());
1698   - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  1698 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID); //诊断
1699 1699 basicConfigQuery.setId(String.valueOf(obj));
1700 1700 List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
1701 1701 if (CollectionUtils.isNotEmpty(datas)) {
1702 1702  
1703 1703  
... ... @@ -1703,12 +1703,25 @@
1703 1703 map.put("id", datas.get(0).getId());
1704 1704 map.put("name", datas.get(0).getName());
1705 1705 list.add(map);
  1706 + }else if(CollectionUtils.isEmpty(datas)){//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容
  1707 + BasicConfigQuery basicConfigQuery1 = new BasicConfigQuery();
  1708 + basicConfigQuery1.setYn(YnEnums.YES.getId());
  1709 + basicConfigQuery1.setId(String.valueOf(obj));
  1710 + List<BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery1);
  1711 + if (CollectionUtils.isNotEmpty(datas2)) {
  1712 + Map<String, String> map = new HashMap<>();
  1713 + map.put("id", datas2.get(0).getId());
  1714 + map.put("name", datas2.get(0).getName());
  1715 + list.add(map);
  1716 + }
1706 1717 }
  1718 +
1707 1719 }
1708 1720  
1709 1721 }
1710 1722 }
1711 1723 model.setDiagnose(list);
  1724 + List<Map<String, String>> otherDiagnoselist = new ArrayList<>();
1712 1725 String otherDiagnoseStr = checkModel.getOtherDiagnose();
1713 1726 if (!StringUtils.isEmpty(otherDiagnoseStr)) {
1714 1727 List otherDiagnoses = JsonUtil.toList(otherDiagnoseStr, List.class);
1715 1728  
1716 1729  
... ... @@ -1716,20 +1729,20 @@
1716 1729 if (obj != null) {
1717 1730 BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
1718 1731 basicConfigQuery.setYn(YnEnums.YES.getId());
1719   - basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);
  1732 + basicConfigQuery.setParentId(SystemConfig.DIAGNOSE_TYPE_ID);//秦皇岛，其它诊断使用的是诊断内容
1720 1733 basicConfigQuery.setId(String.valueOf(obj));
1721 1734 List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
1722 1735 if (CollectionUtils.isNotEmpty(datas)) {
1723 1736 Map<String, String> map = new HashMap<>();
1724 1737 map.put("id", datas.get(0).getId());
1725 1738 map.put("name", datas.get(0).getName());
1726   - list.add(map);
  1739 + otherDiagnoselist.add(map);
1727 1740 }
1728 1741 }
1729 1742  
1730 1743 }
1731 1744 }
1732   - model.setOtherDiagnose(list);
  1745 + model.setOtherDiagnose(otherDiagnoselist);
1733 1746  
1734 1747 model.setHandlSuggest(checkModel.getHandlSuggest());
1735 1748 model.setGuideSuggest(checkModel.getGuideSuggest());
... ... @@ -1775,6 +1788,9 @@
1775 1788 model.setHighRisk(checkModel.getHighRisk());
1776 1789 List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo());
1777 1790 model.setHighRiskInfo(highRiskInfos);
  1791 + if(CollectionUtils.isEmpty(highRiskInfos)){
  1792 + model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛，高危诊断是手动输入，通过basicConfig获取不到，直接将结果存储起来
  1793 + }
1778 1794  
1779 1795 List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo());
1780 1796 model.setWeakSonInfo(weakSonInfos);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 4406110
... ... @@ -5218,7 +5218,9 @@
5218 5218 model.setHighRisk(String.valueOf(babyModel.getHighRisk()));
5219 5219 List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo());
5220 5220 model.setHighRiskInfo(highRiskInfos);
5221   -
  5221 + if(CollectionUtils.isEmpty(highRiskInfos)){
  5222 + model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛，高危诊断是手动输入，通过basicConfig获取不到，直接将结果存储起来
  5223 + }
5222 5224 List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo());
5223 5225 model.setWeakSonInfo(weakSonInfos);
5224 5226 //后续更改
... ... @@ -5252,6 +5254,19 @@
5252 5254 } else {
5253 5255 buildDiagnose += datas.get(0).getName();
5254 5256 }
  5257 + }//秦皇岛诊断内容是高危内容，如果不是诊断就判断是高危内容
  5258 + else if (CollectionUtils.isEmpty(datas)) {
  5259 + BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery();
  5260 + basicConfigQuery2.setYn(YnEnums.YES.getId());
  5261 + basicConfigQuery2.setId(String.valueOf(diagnoses.get(i)));
  5262 + List<BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2);
  5263 + if (CollectionUtils.isNotEmpty(datas2)) {
  5264 + if (i != diagnoses.size() - 1) {
  5265 + buildDiagnose += datas2.get(0).getName() + ",";
  5266 + } else {
  5267 + buildDiagnose += datas2.get(0).getName();
  5268 + }
  5269 + }
5255 5270 }
5256 5271 }
5257 5272  
... ... @@ -5261,7 +5276,7 @@
5261 5276 model.setBuildDiagnose(buildDiagnose);
5262 5277  
5263 5278 String checkOtherDiagnose = "";
5264   - String checkOtherDiagnoseStr = babyModel.getDiagnose();
  5279 + String checkOtherDiagnoseStr = checkModel.getOtherDiagnose();
5265 5280 if (!com.lyms.platform.common.utils.StringUtils.isEmpty(checkOtherDiagnoseStr)) {
5266 5281 List checkOthers = JsonUtil.toList(checkOtherDiagnoseStr, List.class);
5267 5282 for (int i = 0; i < checkOthers.size(); i++) {
... ... @@ -5524,6 +5539,18 @@
5524 5539 diagnoseValue += datas.get(0).getName() + ",";
5525 5540 } else {
5526 5541 diagnoseValue += datas.get(0).getName();
  5542 + }
  5543 + } else if (CollectionUtils.isEmpty(datas)) {
  5544 + BasicConfigQuery basicConfigQuery2 = new BasicConfigQuery();
  5545 + basicConfigQuery2.setYn(YnEnums.YES.getId());
  5546 + basicConfigQuery2.setId(String.valueOf(diagnoses.get(i)));
  5547 + List<BasicConfig> datas2 = basicConfigService.queryBasicConfig(basicConfigQuery2);
  5548 + if (CollectionUtils.isNotEmpty(datas2)) {
  5549 + if (i != diagnoses.size() - 1) {
  5550 + diagnoseValue += datas2.get(0).getName() + ",";
  5551 + } else {
  5552 + diagnoseValue += datas2.get(0).getName();
  5553 + }
5527 5554 }
5528 5555 }
5529 5556 }