Commit ac76c41e82940c71f56178b0bd42d55f2c7be5f6
1 parent
c9a97404ec
Exists in
master
and in
1 other branch
自测bug提交
Showing 1 changed file with 1 additions and 43 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
View file @
ac76c41
| ... | ... | @@ -159,49 +159,7 @@ |
| 159 | 159 | temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); |
| 160 | 160 | temp.put("age", bloodPressure.getAge()); |
| 161 | 161 | temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); |
| 162 | - List<String> riskList = bloodPressure.getRiskFactorId(); | |
| 163 | - Map<String, Object> riskLists = new HashMap(); | |
| 164 | - List<Map> list = new ArrayList<>(); | |
| 165 | - System.out.println("==========>" + riskList); | |
| 166 | - if (CollectionUtils.isNotEmpty(riskList)) { | |
| 167 | - for (String rist : riskList) { | |
| 168 | - | |
| 169 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); | |
| 170 | - String ParentId = basicConfig.getParentId(); | |
| 171 | - if (StringUtils.isNotEmpty(ParentId) && basicConfig != null) { | |
| 172 | - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { | |
| 173 | - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); | |
| 174 | - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); | |
| 175 | - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
| 176 | - } | |
| 177 | - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { | |
| 178 | - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); | |
| 179 | - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); | |
| 180 | - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
| 181 | - } | |
| 182 | - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { | |
| 183 | - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); | |
| 184 | - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); | |
| 185 | - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
| 186 | - } | |
| 187 | - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { | |
| 188 | - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); | |
| 189 | - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); | |
| 190 | - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
| 191 | - } | |
| 192 | - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { | |
| 193 | - riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); | |
| 194 | - riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); | |
| 195 | - riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
| 196 | - } | |
| 197 | - list.add(riskLists); | |
| 198 | - } | |
| 199 | - } | |
| 200 | - } else { | |
| 201 | - temp.put("riskLevel", ""); | |
| 202 | - } | |
| 203 | - | |
| 204 | - temp.put("riskLevel", list); | |
| 162 | + temp.put("riskLevel", commonService.findRiskLevel(bloodPressure.getRiskLevelId())); //高危等级（颜色） | |
| 205 | 163 | String rFactor = commonService.resloveFactor(bloodPressure.getRiskFactorId()); |
| 206 | 164 | if (bloodPressure.getHighriskDesc() != null && !"null".equals(bloodPressure.getHighriskDesc())) { |
| 207 | 165 | if (StringUtils.isNotEmpty(rFactor)) { |