diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java index 5bee09e..3270d8a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java @@ -24,6 +24,8 @@ public class PregnancyReport extends BaseModel { private Integer weightType; //高危风险id private List riskFactorId; + //风险等级颜色 + private List riskLevelId; //高危风险名称 private List riskFactorName; //综合营养指南 @@ -44,6 +46,14 @@ public class PregnancyReport extends BaseModel { private Date created; private Date modified; + public List getRiskLevelId() { + return riskLevelId; + } + + public void setRiskLevelId(List riskLevelId) { + this.riskLevelId = riskLevelId; + } + public String getName() { return name; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java index 31feed7..b6789cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PregnancyReportFacade.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PregnancyReportMattersService; import com.lyms.platform.biz.service.PregnancyReportService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.RiskDefaultTypeEnum; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; @@ -14,10 +15,14 @@ import com.lyms.platform.pojo.PregnancyReportMatters; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PregnancyReportMattersQuery; import com.lyms.platform.query.PregnancyReportQuery; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Component public class PregnancyReportFacade { @@ -158,8 +163,29 @@ public class PregnancyReportFacade { baseResponse.setErrormsg("模版异常"); } StringBuffer sb=new StringBuffer(); + List riskLevelId=new ArrayList<>(); + basicConfigQuery.setIds(null); for(BasicConfig basicConfig1:basicConfig){ sb.append(basicConfig1.getName()).append(","); + basicConfigQuery.setId(basicConfig1.getParentId()); + List basicConfigs2 = basicConfigService.queryBasicConfig(basicConfigQuery); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(basicConfigs2)) { + for (BasicConfig bc : basicConfigs2) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(bc.getName())) { + String name = bc.getName(); + if (name.indexOf("黄色") > -1) { + name = "黄色"; + } else if (name.indexOf("橙色") > -1) { + name = "橙色"; + } else if (name.indexOf("红色") > -1) { + name = "红色"; + } else if (name.indexOf("紫色") > -1) { + name = "紫色"; + } + riskLevelId.add("risk_" + RiskDefaultTypeEnum.getColor(name)); + } + } + } } Integer week= pregnancyReportQuery.getWeek(); pregnancyReportQuery.setName(getReportName(sb.toString(),getWeek(week),pregnancyReportQuery.getWeightType())); @@ -167,6 +193,7 @@ public class PregnancyReportFacade { List list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery); if (CollectionUtils.isNotEmpty(list)){ PregnancyReport pregnancyReport= list.get(0); + pregnancyReport.setRiskLevelId(riskLevelId); PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); postpartumReportQuery.setYn(1); postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId());