diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 1edcbde..85e5b76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1472,6 +1472,14 @@ public class PatientServiceFacade { List basicConfigLists = basicConfigService.queryBasicConfig(basicConfigQuery); List basicConfigs = dispNewHighRisk(basicConfigList,basicConfigLists); bs.setBasicConfigs(basicConfigs); + //重新命名 + switch(bs.getId()){ + case "e637b361-99cf-41eb-84f2-f0dab596e928":bs.setName("绿色");break; + case "315107bd-91fe-42a1-9237-752f3c046a40":bs.setName("黄色(低危组)");break; + case "49a36aea-c5b6-4162-87d2-9eb3c6ec00c2":bs.setName("橙色(中危组)");break; + case "eb146c03-b19f-4e28-b85f-fda574b2283b":bs.setName("红色(高危组)");break; + case "224b2329-cb82-4da3-a071-8527f8283aab":bs.setName("紫色(传染性疾病新生儿)");break; + } //添加到五色 basicConfigList1.add(bs); } @@ -1504,7 +1512,10 @@ public class PatientServiceFacade { for (BasicConfig bs : mainBasicConfigList) { BasicConfigFacade.configData(bs, slaveBasicConfigMap); BasicConfigFacade.sortBasicConfig(bs); - if(!"e637b361-99cf-41eb-84f2-f0dab596e928".equals(bs.getParentId())){ + if("e637b361-99cf-41eb-84f2-f0dab596e928".equals(bs.getParentId()) + || "224b2329-cb82-4da3-a071-8527f8283aab".equals(bs.getParentId())){ + bs.setColor(HosptialHighRiskFacade.colorMap.get(bs.getParentId())); + }else{ bs.setType(0); if("315107bd-91fe-42a1-9237-752f3c046a40".equals(bs.getParentId())){ List basicConfigs = bs.getBasicConfigs();