diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java index b855e71..9cd38e9 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java @@ -1,6 +1,5 @@ package com.lyms.platform.biz.service; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BasicConfig; @@ -66,12 +65,13 @@ public class CommonService { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); if (null != basicConfig) { Map map = new HashMap(); - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig.replenRisk(map); + // String name = basicConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } } @@ -98,12 +98,13 @@ public class CommonService { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); if (null != basicConfig) { Map map = new HashMap(); - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig.replenRisk(map); + // String name = basicConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } } @@ -180,12 +181,13 @@ public class CommonService { if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); if (null != basicConfig) { - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("levelId", idObj1.toString()); - map.put("level", name); + // String name = basicConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("levelId", idObj1.toString()); + // map.put("level", name); + basicConfig.replenRisk(map); } } //风险评分 diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java index 1200f53..a805ee5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java @@ -1,13 +1,14 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.enums.RiskDefaultTypeEnum; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; -import com.lyms.platform.common.result.BaseModel; - import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 基础项配置 @@ -197,6 +198,24 @@ public class BasicConfig extends BaseModel { this.yn = yn; } + public Map replenRisk(Map map){ + map.put("id", id); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + map.put("levelId", id); + map.put("level", name); + map.put("name", name); + map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + return map; + } + @Override public String toString() { return "BasicConfig{" + diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java index f8545ff..926db90 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java @@ -228,8 +228,14 @@ public class SyncDataWork { for (BasicConfig basicConfig : basicConfigList) { String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } highLevel.put(basicConfig.getId(), name); @@ -650,8 +656,14 @@ public class SyncDataWork { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); if (null != basicConfig) { String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); @@ -967,10 +979,18 @@ public class SyncDataWork { if (null != basicConfig) { Map map2 = new HashMap<>(); map2.put("id", basicConfig.getId()); + String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } + map2.put("name", name); RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); riskDetails.setCrisis(riskColorEnum == null ? null : riskColorEnum.getId()); @@ -1044,8 +1064,14 @@ public class SyncDataWork { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); sb.append(basicConfig.getName()).append('、'); String name = basicConfig1.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } riskColorEnum = SyncDataWork.map.get(name); if (null != riskColorEnum) { @@ -1205,8 +1231,14 @@ public class SyncDataWork { Map map2 = new HashMap<>(); map2.put("id", idObj1.toString()); String name = basicConfig; - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } map2.put("name", name); RiskColorEnum riskColorEnum = SyncDataWork.map.get(name); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 32f4cb2..3f69681 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -364,7 +364,7 @@ public class AntenatalExaminationFacade { updateApplyOrder(model, antExAddRequest.getParentId()); //修改孕妇高危等级 // updatePatientRiskLevel(model, patients); - + //修改孕妇高危 updateLastRisk(antExAddRequest.getParentId()); //修改本院最后一次定义高危 @@ -679,7 +679,7 @@ public class AntenatalExaminationFacade { * 获取最后一次高危产检的高危信息 *

* 先取复诊最后一条，在取初诊 - * + *@param needLevel --true需要查询高危等级 * @return */ public HighScoreResult findLastRisk(String pid, boolean needLevel) { @@ -1734,7 +1734,7 @@ public class AntenatalExaminationFacade { } /** - * 删除的时候设置最新的高危 + * 修改的时候设置最新的高危 * * @param parentId */ @@ -2274,8 +2274,14 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(basicConfigs2)) { for (BasicConfig bc : basicConfigs2) { String name = bc.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } @@ -2287,13 +2293,20 @@ public class AntenatalExaminationFacade { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig1) { Map map1 = new HashMap<>(); - map1.put("id", basicConfig1.getId()); - String name = basicConfig1.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map1.put("name", name); - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + // map1.put("id", basicConfig1.getId()); + // String name = basicConfig1.getName(); + // if (name.indexOf("黄色") > -1) { + // name = "黄色"; + // }else if (name.indexOf("橙色") > -1) { + // name = "橙色"; + // }else if (name.indexOf("红色") > -1) { + // name = "红色"; + // }else if (name.indexOf("紫色") > -1) { + // name = "紫色"; + // } + // map1.put("name", name); + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig1.replenRisk(map1); dat1a.add(map1); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index f0315f2..662cfe4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1799,8 +1799,14 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(basicConfigs2)) { for (BasicConfig bc : basicConfigs2) { String name = bc.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } @@ -1812,13 +1818,14 @@ public class BabyBookbuildingFacade { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig1) { Map map1 = new HashMap<>(); - map1.put("id", basicConfig1.getId()); - String name = basicConfig1.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map1.put("name", name); - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig1.replenRisk(map1); + // map1.put("id", basicConfig1.getId()); + // String name = basicConfig1.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map1.put("name", name); + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); dat1a.add(map1); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 598d1d5..67c2970 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -12,10 +11,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.RiskPatientsCountRequest; import com.lyms.platform.operate.web.request.RiskPatientsQueryRequest; import com.lyms.platform.operate.web.result.RiskReportResult; -import com.lyms.platform.operate.web.utils.AreaHighRiskCountExportTask; -import com.lyms.platform.operate.web.utils.HiskCountTask; -import com.lyms.platform.operate.web.utils.MathUtil; -import com.lyms.platform.operate.web.utils.MongoUtil; +import com.lyms.platform.operate.web.utils.*; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.service.OrganizationService; @@ -190,13 +186,14 @@ public class RiskReportFacade { risk.setHighRiskId(levelConfig.getId()); risk.setHighRisk(levelConfig.getName()); risk.setPid(levelConfig.getpId()); - String name = levelConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } + // String name = levelConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } Map map = new HashMap(); - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + levelConfig.replenRisk(map); + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); risk.setHighLevel(Arrays.asList(new Map[]{map})); mainRiskReportResults.add(risk); Callable c = new HiskCountTask(basicConfigService, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java index 18979ba..c97c976 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java @@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.result.RiskReportResult; @@ -106,12 +105,14 @@ public class HiskCountTask implements Callable { if (null != levelConfig) { List level = new ArrayList(); Map map = new HashMap(); - String name = levelConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + + levelConfig.replenRisk(map); + // String name = levelConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); risk.setHighLevel(level); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java index 74205c4..fd3d21e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -251,8 +251,14 @@ public class ResolveUtils { if (CollectionUtils.isNotEmpty(basicConfigs2)) { for (BasicConfig bc : basicConfigs2) { String name = bc.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + }else if (name.indexOf("橙色") > -1) { + name = "橙色"; + }else if (name.indexOf("红色") > -1) { + name = "红色"; + }else if (name.indexOf("紫色") > -1) { + name = "紫色"; } map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } @@ -264,13 +270,14 @@ public class ResolveUtils { BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); if (null != basicConfig1) { Map map1 = new HashMap<>(); - map1.put("id", basicConfig1.getId()); - String name = basicConfig1.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map1.put("name", name); - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + // map1.put("id", basicConfig1.getId()); + // String name = basicConfig1.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map1.put("name", name); + // map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig1.replenRisk(map1); dat1a.add(map1); } } @@ -285,6 +292,7 @@ public class ResolveUtils { return highScoreResult; } + //其他高危 public static List> queryOtherRisk(String otherHighRisk, List> listMap) { if (StringUtils.isEmpty(otherHighRisk)||"{}".equals(otherHighRisk)||"[]".equals(otherHighRisk)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 48318d1..8f90c57 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; @@ -14,6 +13,7 @@ import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.QuanPatientsResult; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.ResolveUtils; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; @@ -29,7 +29,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.domain.Sort; import org.springframework.util.StopWatch; import java.util.*; @@ -200,12 +199,13 @@ public class QuanPatientWorker implements Callable> { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); if (null != basicConfig) { Map map = new HashMap(); - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig.replenRisk(map); + // String name = basicConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 01673f9..a03dede 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.YnEnums; @@ -32,7 +31,10 @@ import org.slf4j.LoggerFactory; import org.springframework.data.domain.Sort; import org.springframework.util.StopWatch; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; /** @@ -213,12 +215,13 @@ public class WorkHR implements Callable> { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); if (null != basicConfig) { Map map = new HashMap(); - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map.put("name", name); - map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + basicConfig.replenRisk(map); + // String name = basicConfig.getName(); + // if (name.indexOf("预警") > -1) { + // name = name.replace("预警", ""); + // } + // map.put("name", name); + // map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } }