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 3662879..d27e2fc 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 @@ -1219,8 +1219,8 @@ public class BabyBookbuildingFacade { */ private BabyBuildResult getBabyBuildResult(BabyModel model) { BabyBuildResult result = new BabyBuildResult(); - result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); - result.setmHighRiskReason2(mongoUtil.findNameList(model.getmHighRiskReason())); +// result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); + result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); result.setId(model.getId()); result.setPid(model.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index fc0d89e..4e39471 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -8,16 +8,14 @@ import java.util.Map; */ public class BabyBuildResult { // 母亲高危因素 - private List mHighRiskReason; + private List> mHighRiskReason; - private List> mHighRiskReason2; - - public List getmHighRiskReason() { + public List> getmHighRiskReason() { return mHighRiskReason; } - public void setmHighRiskReason(List mHighRiskReason) { + public void setmHighRiskReason(List> mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } @@ -564,11 +562,4 @@ public class BabyBuildResult { this.apgarScore = apgarScore; } - public void setmHighRiskReason2(List> mHighRiskReason2) { - this.mHighRiskReason2 = mHighRiskReason2; - } - - public List> getmHighRiskReason2() { - return mHighRiskReason2; - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index dbeace5..b944181 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; @@ -372,4 +373,26 @@ public class MongoUtil { } return list; } + + public List> findColor(List ids) { + if(CollectionUtils.isNotEmpty(ids)) { + List> rest = new ArrayList<>(); + for (String id : ids) { + BasicConfig basicConfig = findBasicConfigById(id); + if(basicConfig != null) { + BasicConfig parent = findBasicConfigById(basicConfig.getParentId()); + if(parent != null) { + Map tempMap = new HashedMap(); + tempMap.put("id", basicConfig.getId()); + tempMap.put("name", basicConfig.getName()); + tempMap.put("color", RiskDefaultTypeEnum.getColor(parent.getName())); + rest.add(tempMap); + } + + } + } + return rest; + } + return null; + } }