jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7b3535cd253224f98fae107789c90c44eb6a5232

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

新版高危因数

Showing 10 changed files with 177 additions and 95 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java View file @ 7b3535c
1 1 package com.lyms.platform.biz.service;
2 2  
3   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
4 3 import com.lyms.platform.common.utils.ExceptionUtils;
5 4 import com.lyms.platform.common.utils.JsonUtil;
6 5 import com.lyms.platform.pojo.BasicConfig;
... ... @@ -66,12 +65,13 @@
66 65 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
67 66 if (null != basicConfig) {
68 67 Map map = new HashMap();
69   - String name = basicConfig.getName();
70   - if (name.indexOf("预警") > -1) {
71   - name = name.replace("预警", "");
72   - }
73   - map.put("name", name);
74   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  68 + basicConfig.replenRisk(map);
  69 + // String name = basicConfig.getName();
  70 + // if (name.indexOf("预警") > -1) {
  71 + // name = name.replace("预警", "");
  72 + // }
  73 + // map.put("name", name);
  74 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
75 75 level.add(map);
76 76 }
77 77 }
... ... @@ -98,12 +98,13 @@
98 98 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
99 99 if (null != basicConfig) {
100 100 Map map = new HashMap();
101   - String name = basicConfig.getName();
102   - if (name.indexOf("预警") > -1) {
103   - name = name.replace("预警", "");
104   - }
105   - map.put("name", name);
106   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  101 + basicConfig.replenRisk(map);
  102 + // String name = basicConfig.getName();
  103 + // if (name.indexOf("预警") > -1) {
  104 + // name = name.replace("预警", "");
  105 + // }
  106 + // map.put("name", name);
  107 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
107 108 level.add(map);
108 109 }
109 110 }
... ... @@ -180,12 +181,13 @@
180 181 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
181 182 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
182 183 if (null != basicConfig) {
183   - String name = basicConfig.getName();
184   - if (name.indexOf("预警") > -1) {
185   - name = name.replace("预警", "");
186   - }
187   - map.put("levelId", idObj1.toString());
188   - map.put("level", name);
  184 + // String name = basicConfig.getName();
  185 + // if (name.indexOf("预警") > -1) {
  186 + // name = name.replace("预警", "");
  187 + // }
  188 + // map.put("levelId", idObj1.toString());
  189 + // map.put("level", name);
  190 + basicConfig.replenRisk(map);
189 191 }
190 192 }
191 193 //风险评分
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java View file @ 7b3535c
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.beans.SerialIdEnum;
  4 +import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
  5 +import com.lyms.platform.common.result.BaseModel;
4 6 import org.springframework.data.annotation.Id;
5 7 import org.springframework.data.mongodb.core.mapping.Document;
6 8  
7   -import com.lyms.platform.common.result.BaseModel;
8   -
9 9 import java.util.ArrayList;
10 10 import java.util.List;
  11 +import java.util.Map;
11 12  
12 13 /**
13 14 * 基础项配置
... ... @@ -195,6 +196,24 @@
195 196  
196 197 public void setYn(Integer yn) {
197 198 this.yn = yn;
  199 + }
  200 +
  201 + public Map<String, Object> replenRisk(Map<String, Object> map){
  202 + map.put("id", id);
  203 + if (name.indexOf("黄色") > -1) {
  204 + name = "黄色";
  205 + }else if (name.indexOf("橙色") > -1) {
  206 + name = "橙色";
  207 + }else if (name.indexOf("红色") > -1) {
  208 + name = "红色";
  209 + }else if (name.indexOf("紫色") > -1) {
  210 + name = "紫色";
  211 + }
  212 + map.put("levelId", id);
  213 + map.put("level", name);
  214 + map.put("name", name);
  215 + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  216 + return map;
198 217 }
199 218  
200 219 @Override
platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java View file @ 7b3535c
... ... @@ -228,8 +228,14 @@
228 228 for (BasicConfig basicConfig : basicConfigList) {
229 229  
230 230 String name = basicConfig.getName();
231   - if (name.indexOf("预警") > -1) {
232   - name = name.replace("预警", "");
  231 + if (name.indexOf("黄色") > -1) {
  232 + name = "黄色";
  233 + }else if (name.indexOf("橙色") > -1) {
  234 + name = "橙色";
  235 + }else if (name.indexOf("红色") > -1) {
  236 + name = "红色";
  237 + }else if (name.indexOf("紫色") > -1) {
  238 + name = "紫色";
233 239 }
234 240 highLevel.put(basicConfig.getId(), name);
235 241  
... ... @@ -650,8 +656,14 @@
650 656 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
651 657 if (null != basicConfig) {
652 658 String name = basicConfig.getName();
653   - if (name.indexOf("预警") > -1) {
654   - name = name.replace("预警", "");
  659 + if (name.indexOf("黄色") > -1) {
  660 + name = "黄色";
  661 + }else if (name.indexOf("橙色") > -1) {
  662 + name = "橙色";
  663 + }else if (name.indexOf("红色") > -1) {
  664 + name = "红色";
  665 + }else if (name.indexOf("紫色") > -1) {
  666 + name = "紫色";
655 667 }
656 668 RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
657 669 riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId());
658 670  
659 671  
... ... @@ -967,10 +979,18 @@
967 979 if (null != basicConfig) {
968 980 Map<String, Object> map2 = new HashMap<>();
969 981 map2.put("id", basicConfig.getId());
  982 +
970 983 String name = basicConfig.getName();
971   - if (name.indexOf("预警") > -1) {
972   - name = name.replace("预警", "");
  984 + if (name.indexOf("黄色") > -1) {
  985 + name = "黄色";
  986 + }else if (name.indexOf("橙色") > -1) {
  987 + name = "橙色";
  988 + }else if (name.indexOf("红色") > -1) {
  989 + name = "红色";
  990 + }else if (name.indexOf("紫色") > -1) {
  991 + name = "紫色";
973 992 }
  993 +
974 994 map2.put("name", name);
975 995 RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
976 996 riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId());
... ... @@ -1044,8 +1064,14 @@
1044 1064 BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
1045 1065 sb.append(basicConfig.getName()).append('、');
1046 1066 String name = basicConfig1.getName();
1047   - if (name.indexOf("预警") > -1) {
1048   - name = name.replace("预警", "");
  1067 + if (name.indexOf("黄色") > -1) {
  1068 + name = "黄色";
  1069 + }else if (name.indexOf("橙色") > -1) {
  1070 + name = "橙色";
  1071 + }else if (name.indexOf("红色") > -1) {
  1072 + name = "红色";
  1073 + }else if (name.indexOf("紫色") > -1) {
  1074 + name = "紫色";
1049 1075 }
1050 1076 riskColorEnum = SyncDataWork.map.get(name);
1051 1077 if (null != riskColorEnum) {
... ... @@ -1205,8 +1231,14 @@
1205 1231 Map<String, Object> map2 = new HashMap<>();
1206 1232 map2.put("id", idObj1.toString());
1207 1233 String name = basicConfig;
1208   - if (name.indexOf("预警") > -1) {
1209   - name = name.replace("预警", "");
  1234 + if (name.indexOf("黄色") > -1) {
  1235 + name = "黄色";
  1236 + }else if (name.indexOf("橙色") > -1) {
  1237 + name = "橙色";
  1238 + }else if (name.indexOf("红色") > -1) {
  1239 + name = "红色";
  1240 + }else if (name.indexOf("紫色") > -1) {
  1241 + name = "紫色";
1210 1242 }
1211 1243 map2.put("name", name);
1212 1244 RiskColorEnum riskColorEnum = SyncDataWork.map.get(name);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 7b3535c
... ... @@ -364,7 +364,7 @@
364 364 updateApplyOrder(model, antExAddRequest.getParentId());
365 365 //修改孕妇高危等级
366 366 // updatePatientRiskLevel(model, patients);
367   -
  367 + //修改孕妇高危
368 368 updateLastRisk(antExAddRequest.getParentId());
369 369  
370 370 //修改本院最后一次定义高危
... ... @@ -679,7 +679,7 @@
679 679 * 获取最后一次高危产检的高危信息
680 680 * <p/>
681 681 * 先取复诊最后一条，在取初诊
682   - *
  682 + *@param needLevel --true需要查询高危等级
683 683 * @return
684 684 */
685 685 public HighScoreResult findLastRisk(String pid, boolean needLevel) {
... ... @@ -1734,7 +1734,7 @@
1734 1734 }
1735 1735  
1736 1736 /**
1737   - * 删除的时候设置最新的高危
  1737 + * 修改的时候设置最新的高危
1738 1738 *
1739 1739 * @param parentId
1740 1740 */
... ... @@ -2274,8 +2274,14 @@
2274 2274 if (CollectionUtils.isNotEmpty(basicConfigs2)) {
2275 2275 for (BasicConfig bc : basicConfigs2) {
2276 2276 String name = bc.getName();
2277   - if (name.indexOf("预警") > -1) {
2278   - name = name.replace("预警", "");
  2277 + if (name.indexOf("黄色") > -1) {
  2278 + name = "黄色";
  2279 + }else if (name.indexOf("橙色") > -1) {
  2280 + name = "橙色";
  2281 + }else if (name.indexOf("红色") > -1) {
  2282 + name = "红色";
  2283 + }else if (name.indexOf("紫色") > -1) {
  2284 + name = "紫色";
2279 2285 }
2280 2286 map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
2281 2287 }
... ... @@ -2287,13 +2293,20 @@
2287 2293 BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
2288 2294 if (null != basicConfig1) {
2289 2295 Map<String, Object> map1 = new HashMap<>();
2290   - map1.put("id", basicConfig1.getId());
2291   - String name = basicConfig1.getName();
2292   - if (name.indexOf("预警") > -1) {
2293   - name = name.replace("预警", "");
2294   - }
2295   - map1.put("name", name);
2296   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  2296 + // map1.put("id", basicConfig1.getId());
  2297 + // String name = basicConfig1.getName();
  2298 + // if (name.indexOf("黄色") > -1) {
  2299 + // name = "黄色";
  2300 + // }else if (name.indexOf("橙色") > -1) {
  2301 + // name = "橙色";
  2302 + // }else if (name.indexOf("红色") > -1) {
  2303 + // name = "红色";
  2304 + // }else if (name.indexOf("紫色") > -1) {
  2305 + // name = "紫色";
  2306 + // }
  2307 + // map1.put("name", name);
  2308 + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  2309 + basicConfig1.replenRisk(map1);
2297 2310 dat1a.add(map1);
2298 2311 }
2299 2312 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 7b3535c
... ... @@ -1799,8 +1799,14 @@
1799 1799 if (CollectionUtils.isNotEmpty(basicConfigs2)) {
1800 1800 for (BasicConfig bc : basicConfigs2) {
1801 1801 String name = bc.getName();
1802   - if (name.indexOf("预警") > -1) {
1803   - name = name.replace("预警", "");
  1802 + if (name.indexOf("黄色") > -1) {
  1803 + name = "黄色";
  1804 + }else if (name.indexOf("橙色") > -1) {
  1805 + name = "橙色";
  1806 + }else if (name.indexOf("红色") > -1) {
  1807 + name = "红色";
  1808 + }else if (name.indexOf("紫色") > -1) {
  1809 + name = "紫色";
1804 1810 }
1805 1811 map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
1806 1812 }
... ... @@ -1812,13 +1818,14 @@
1812 1818 BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
1813 1819 if (null != basicConfig1) {
1814 1820 Map<String, Object> map1 = new HashMap<>();
1815   - map1.put("id", basicConfig1.getId());
1816   - String name = basicConfig1.getName();
1817   - if (name.indexOf("预警") > -1) {
1818   - name = name.replace("预警", "");
1819   - }
1820   - map1.put("name", name);
1821   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  1821 + basicConfig1.replenRisk(map1);
  1822 + // map1.put("id", basicConfig1.getId());
  1823 + // String name = basicConfig1.getName();
  1824 + // if (name.indexOf("预警") > -1) {
  1825 + // name = name.replace("预警", "");
  1826 + // }
  1827 + // map1.put("name", name);
  1828 + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
1822 1829 dat1a.add(map1);
1823 1830 }
1824 1831 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 7b3535c
... ... @@ -3,7 +3,6 @@
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.biz.service.PatientsService;
5 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
6   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
7 6 import com.lyms.platform.common.enums.YnEnums;
8 7 import com.lyms.platform.common.result.BaseListResponse;
9 8 import com.lyms.platform.common.result.BaseObjectResponse;
... ... @@ -12,10 +11,7 @@
12 11 import com.lyms.platform.operate.web.request.RiskPatientsCountRequest;
13 12 import com.lyms.platform.operate.web.request.RiskPatientsQueryRequest;
14 13 import com.lyms.platform.operate.web.result.RiskReportResult;
15   -import com.lyms.platform.operate.web.utils.AreaHighRiskCountExportTask;
16   -import com.lyms.platform.operate.web.utils.HiskCountTask;
17   -import com.lyms.platform.operate.web.utils.MathUtil;
18   -import com.lyms.platform.operate.web.utils.MongoUtil;
  14 +import com.lyms.platform.operate.web.utils.*;
19 15 import com.lyms.platform.permission.model.Organization;
20 16 import com.lyms.platform.permission.model.OrganizationQuery;
21 17 import com.lyms.platform.permission.service.OrganizationService;
22 18  
... ... @@ -190,13 +186,14 @@
190 186 risk.setHighRiskId(levelConfig.getId());
191 187 risk.setHighRisk(levelConfig.getName());
192 188 risk.setPid(levelConfig.getpId());
193   - String name = levelConfig.getName();
194   - if (name.indexOf("预警") > -1) {
195   - name = name.replace("预警", "");
196   - }
  189 + // String name = levelConfig.getName();
  190 + // if (name.indexOf("预警") > -1) {
  191 + // name = name.replace("预警", "");
  192 + // }
197 193 Map map = new HashMap();
198   - map.put("name", name);
199   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  194 + levelConfig.replenRisk(map);
  195 + // map.put("name", name);
  196 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
200 197 risk.setHighLevel(Arrays.asList(new Map[]{map}));
201 198 mainRiskReportResults.add(risk);
202 199 Callable c = new HiskCountTask(basicConfigService,
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java View file @ 7b3535c
... ... @@ -2,7 +2,6 @@
2 2  
3 3 import com.lyms.platform.biz.service.BasicConfigService;
4 4 import com.lyms.platform.biz.service.PatientsService;
5   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
6 5 import com.lyms.platform.common.enums.YnEnums;
7 6 import com.lyms.platform.common.utils.ExceptionUtils;
8 7 import com.lyms.platform.operate.web.result.RiskReportResult;
... ... @@ -106,12 +105,14 @@
106 105 if (null != levelConfig) {
107 106 List level = new ArrayList();
108 107 Map map = new HashMap();
109   - String name = levelConfig.getName();
110   - if (name.indexOf("预警") > -1) {
111   - name = name.replace("预警", "");
112   - }
113   - map.put("name", name);
114   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  108 +
  109 + levelConfig.replenRisk(map);
  110 + // String name = levelConfig.getName();
  111 + // if (name.indexOf("预警") > -1) {
  112 + // name = name.replace("预警", "");
  113 + // }
  114 + // map.put("name", name);
  115 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
115 116 level.add(map);
116 117 risk.setHighLevel(level);
117 118 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java View file @ 7b3535c
... ... @@ -251,8 +251,14 @@
251 251 if (CollectionUtils.isNotEmpty(basicConfigs2)) {
252 252 for (BasicConfig bc : basicConfigs2) {
253 253 String name = bc.getName();
254   - if (name.indexOf("预警") > -1) {
255   - name = name.replace("预警", "");
  254 + if (name.indexOf("黄色") > -1) {
  255 + name = "黄色";
  256 + }else if (name.indexOf("橙色") > -1) {
  257 + name = "橙色";
  258 + }else if (name.indexOf("红色") > -1) {
  259 + name = "红色";
  260 + }else if (name.indexOf("紫色") > -1) {
  261 + name = "紫色";
256 262 }
257 263 map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
258 264 }
... ... @@ -264,13 +270,14 @@
264 270 BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
265 271 if (null != basicConfig1) {
266 272 Map<String, Object> map1 = new HashMap<>();
267   - map1.put("id", basicConfig1.getId());
268   - String name = basicConfig1.getName();
269   - if (name.indexOf("预警") > -1) {
270   - name = name.replace("预警", "");
271   - }
272   - map1.put("name", name);
273   - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  273 + // map1.put("id", basicConfig1.getId());
  274 + // String name = basicConfig1.getName();
  275 + // if (name.indexOf("预警") > -1) {
  276 + // name = name.replace("预警", "");
  277 + // }
  278 + // map1.put("name", name);
  279 + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  280 + basicConfig1.replenRisk(map1);
274 281 dat1a.add(map1);
275 282 }
276 283 }
... ... @@ -284,6 +291,7 @@
284 291 highScoreResult.setLevel(dat1a);
285 292 return highScoreResult;
286 293 }
  294 +
287 295  
288 296 //其他高危
289 297 public static List<Map<String, Object>> queryOtherRisk(String otherHighRisk, List<Map<String, Object>> listMap) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ 7b3535c
... ... @@ -3,7 +3,6 @@
3 3 import com.lyms.platform.biz.service.AntenatalExaminationService;
4 4 import com.lyms.platform.biz.service.BasicConfigService;
5 5 import com.lyms.platform.biz.service.PatientsService;
6   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
7 6 import com.lyms.platform.common.enums.ServiceStatusEnums;
8 7 import com.lyms.platform.common.enums.ServiceTypeEnums;
9 8 import com.lyms.platform.common.enums.YnEnums;
... ... @@ -14,6 +13,7 @@
14 13 import com.lyms.platform.operate.web.result.HighScoreResult;
15 14 import com.lyms.platform.operate.web.result.QuanPatientsResult;
16 15 import com.lyms.platform.operate.web.utils.CommonsHelper;
  16 +import com.lyms.platform.operate.web.utils.ResolveUtils;
17 17 import com.lyms.platform.permission.model.Organization;
18 18 import com.lyms.platform.permission.model.Users;
19 19 import com.lyms.platform.permission.service.OrganizationService;
... ... @@ -29,7 +29,6 @@
29 29 import org.apache.commons.lang.math.NumberUtils;
30 30 import org.slf4j.Logger;
31 31 import org.slf4j.LoggerFactory;
32   -import org.springframework.data.domain.Sort;
33 32 import org.springframework.util.StopWatch;
34 33  
35 34 import java.util.*;
... ... @@ -200,12 +199,13 @@
200 199 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
201 200 if (null != basicConfig) {
202 201 Map map = new HashMap();
203   - String name = basicConfig.getName();
204   - if (name.indexOf("预警") > -1) {
205   - name = name.replace("预警", "");
206   - }
207   - map.put("name", name);
208   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  202 + basicConfig.replenRisk(map);
  203 + // String name = basicConfig.getName();
  204 + // if (name.indexOf("预警") > -1) {
  205 + // name = name.replace("预警", "");
  206 + // }
  207 + // map.put("name", name);
  208 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
209 209 level.add(map);
210 210 }
211 211 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java View file @ 7b3535c
... ... @@ -3,7 +3,6 @@
3 3 import com.lyms.platform.biz.service.AntenatalExaminationService;
4 4 import com.lyms.platform.biz.service.BasicConfigService;
5 5 import com.lyms.platform.biz.service.PatientsService;
6   -import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
7 6 import com.lyms.platform.common.enums.ServiceStatusEnums;
8 7 import com.lyms.platform.common.enums.ServiceTypeEnums;
9 8 import com.lyms.platform.common.enums.YnEnums;
... ... @@ -32,7 +31,10 @@
32 31 import org.springframework.data.domain.Sort;
33 32 import org.springframework.util.StopWatch;
34 33  
35   -import java.util.*;
  34 +import java.util.ArrayList;
  35 +import java.util.HashMap;
  36 +import java.util.List;
  37 +import java.util.Map;
36 38 import java.util.concurrent.Callable;
37 39  
38 40 /**
... ... @@ -213,12 +215,13 @@
213 215 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
214 216 if (null != basicConfig) {
215 217 Map map = new HashMap();
216   - String name = basicConfig.getName();
217   - if (name.indexOf("预警") > -1) {
218   - name = name.replace("预警", "");
219   - }
220   - map.put("name", name);
221   - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
  218 + basicConfig.replenRisk(map);
  219 + // String name = basicConfig.getName();
  220 + // if (name.indexOf("预警") > -1) {
  221 + // name = name.replace("预警", "");
  222 + // }
  223 + // map.put("name", name);
  224 + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
222 225 level.add(map);
223 226 }
224 227 }