From ac76c41e82940c71f56178b0bd42d55f2c7be5f6 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 3 Apr 2019 19:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TemporaryBloodServiceImpl.java | 44 +--------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 06bb6e3..3306783 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -159,49 +159,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); temp.put("age", bloodPressure.getAge()); temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); - List riskList = bloodPressure.getRiskFactorId(); - Map riskLists = new HashMap(); - List list = new ArrayList<>(); - System.out.println("==========>" + riskList); - if (CollectionUtils.isNotEmpty(riskList)) { - for (String rist : riskList) { - - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); - String ParentId = basicConfig.getParentId(); - if (StringUtils.isNotEmpty(ParentId) && basicConfig != null) { - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - list.add(riskLists); - } - } - } else { - temp.put("riskLevel", ""); - } - - temp.put("riskLevel", list); + temp.put("riskLevel", commonService.findRiskLevel(bloodPressure.getRiskLevelId())); //高危等级（颜色） String rFactor = commonService.resloveFactor(bloodPressure.getRiskFactorId()); if (bloodPressure.getHighriskDesc() != null && !"null".equals(bloodPressure.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { -- 1.8.3.1