Commit c1bc474d617834e5c59d017f147ba25a7005e92b
1 parent
f2429e1219
Exists in
master
and in
6 other branches
产检次数详情修改
Showing 1 changed file with 13 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
c1bc474
| 1 | 1 | package com.lyms.platform.operate.web.service.impl; |
| 2 | 2 | |
| 3 | +import com.alibaba.fastjson.JSON; | |
| 4 | +import com.alibaba.fastjson.JSONPObject; | |
| 3 | 5 | import com.lyms.hospitalapi.pojo.ReportModel; |
| 4 | 6 | import com.lyms.platform.biz.service.CommonService; |
| 5 | 7 | import com.lyms.platform.common.enums.CouponEnums; |
| 6 | 8 | |
| 7 | 9 | |
| 8 | 10 | |
| ... | ... | @@ -1253,17 +1255,18 @@ |
| 1253 | 1255 | |
| 1254 | 1256 | if(patients.size() == 1) { |
| 1255 | 1257 | Patients p = patients.get(0); |
| 1258 | + tempMap.put("NAME", p.getUsername()); | |
| 1256 | 1259 | tempMap.put("YUNZHOU", DateUtil.getWeek(p.getLastMenses(), p.getLastCTime())); |
| 1257 | -// List riskLeve = commonService.findRiskLevel(commonService.findRiskLevel(antExChuModel.getHighrisk())); | |
| 1258 | - tempMap.put("HIGH_RISK_GRADE", mongoUtil.findName(p.getRiskLevelId())); /** 高危等级 */ | |
| 1259 | - List<String> riskFactorId = p.getRiskFactorId(); | |
| 1260 | - if (CollectionUtils.isNotEmpty(riskFactorId)) { | |
| 1261 | - String HIGH_RISK_FACTOR = ""; | |
| 1262 | - for (String s : riskFactorId) { | |
| 1263 | - HIGH_RISK_FACTOR = HIGH_RISK_FACTOR + mongoUtil.findName(s) + " "; | |
| 1260 | + String riskLevelId = p.getRiskLevelId(); | |
| 1261 | + if(StringUtils.isNotBlank(riskLevelId)) { | |
| 1262 | + List<String> basicIds = JSON.parseArray(riskLevelId, String.class); | |
| 1263 | + String HIGH_RISK_GRADE = ""; | |
| 1264 | + for (String basicId : basicIds) { | |
| 1265 | + HIGH_RISK_GRADE = HIGH_RISK_GRADE + mongoUtil.findName(basicId) + ","; | |
| 1264 | 1266 | } |
| 1265 | - tempMap.put("HIGH_RISK_FACTOR", HIGH_RISK_FACTOR); /** 风险因素 */ | |
| 1267 | + tempMap.put("HIGH_RISK_GRADE", HIGH_RISK_GRADE.substring(0, HIGH_RISK_GRADE.length() - 1)); /** 高危等级 */ | |
| 1266 | 1268 | } |
| 1269 | + tempMap.put("HIGH_RISK_FACTOR", p.getoRiskFactor()); /** 风险因素 */ | |
| 1267 | 1270 | tempMap.put("EDD_DATE", p.getDueDate()); |
| 1268 | 1271 | tempMap.put("LAST_EXAMINE_DATE", DateUtil.getyyyy_MM_dd(p.getLastCTime())); |
| 1269 | 1272 | String prodDoctor = p.getBookbuildingDoctor(); |
| 1270 | 1273 | |
| ... | ... | @@ -1323,9 +1326,9 @@ |
| 1323 | 1326 | |
| 1324 | 1327 | rest.add(tempMap); |
| 1325 | 1328 | // } |
| 1326 | - setColor(rest); | |
| 1327 | - pageResult.setGrid(rest); | |
| 1328 | 1329 | } |
| 1330 | + pageResult.setGrid(rest); | |
| 1331 | + setColor(rest); | |
| 1329 | 1332 | return RespBuilder.buildSuccess(pageResult); |
| 1330 | 1333 | } |
| 1331 | 1334 |