diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3f59adf..5115b28 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONPObject; import com.lyms.hospitalapi.pojo.ReportModel; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.enums.CouponEnums; @@ -1253,17 +1255,18 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(patients.size() == 1) { Patients p = patients.get(0); + tempMap.put("NAME", p.getUsername()); tempMap.put("YUNZHOU", DateUtil.getWeek(p.getLastMenses(), p.getLastCTime())); -// List riskLeve = commonService.findRiskLevel(commonService.findRiskLevel(antExChuModel.getHighrisk())); - tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(p.getRiskLevelId())); /** 高危等级 */ - List riskFactorId = p.getRiskFactorId(); - if (CollectionUtils.isNotEmpty(riskFactorId)) { - String HIGH_RISK_FACTOR = ""; - for (String s : riskFactorId) { - HIGH_RISK_FACTOR = HIGH_RISK_FACTOR + mongoUtil.findName(s) + " "; + String riskLevelId = p.getRiskLevelId(); + if(StringUtils.isNotBlank(riskLevelId)) { + List basicIds = JSON.parseArray(riskLevelId, String.class); + String HIGH_RISK_GRADE = ""; + for (String basicId : basicIds) { + HIGH_RISK_GRADE = HIGH_RISK_GRADE + mongoUtil.findName(basicId) + ","; } - tempMap.put("HIGH_RISK_FACTOR", HIGH_RISK_FACTOR); /** 风险因素 */ + tempMap.put("HIGH_RISK_GRADE", HIGH_RISK_GRADE.substring(0, HIGH_RISK_GRADE.length() - 1)); /** 高危等级 */ } + tempMap.put("HIGH_RISK_FACTOR", p.getoRiskFactor()); /** 风险因素 */ tempMap.put("EDD_DATE", p.getDueDate()); tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(p.getLastCTime())); String prodDoctor = p.getBookbuildingDoctor(); @@ -1323,9 +1326,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService rest.add(tempMap); // } - setColor(rest); - pageResult.setGrid(rest); } + pageResult.setGrid(rest); + setColor(rest); return RespBuilder.buildSuccess(pageResult); }