diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java index 340cb09..a300b73 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java @@ -15,7 +15,7 @@ public enum HisptialRiskTypeEnum { JGFX("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", "较高风险", "risk_orange"), GFX("eb146c03-b19f-4e28-b85f-fda574b2283b", "高风险", "risk_red"), CRB("224b2329-cb82-4da3-a071-8527f8283aab", "传染病", "risk_purple"), - JK("d42eec03-aa86-45b8-a4e0-78a0ff365fb6", "健康", "risk_green"); + JK("e637b361-99cf-41eb-84f2-f0dab596e928", "健康", "risk_green"); private String id; private String name; private String color; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java index a8ca712..7631d8e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java @@ -49,8 +49,19 @@ public class TemporaryBloodModel extends BaseModel { // 前囟 单胎/双胎/多胎 private String bregmatic; + private String riskLevelId; + private Integer yn; + + public String getRiskLevelId() { + return riskLevelId; + } + + public void setRiskLevelId(String riskLevelId) { + this.riskLevelId = riskLevelId; + } + private Map> infos; public Map> getInfos() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 0508b15..06bb6e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -4,14 +4,17 @@ import com.lyms.platform.biz.dal.ITemporaryBloodDao; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.HisptialRiskTypeEnum; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.service.ITemporaryBloodService; import com.lyms.platform.operate.web.service.PatientWeightService; +import com.lyms.platform.operate.web.utils.LisHandleTask; import com.lyms.platform.operate.web.utils.ReportConfig; import com.lyms.platform.pojo.*; import org.apache.commons.collections.CollectionUtils; @@ -59,6 +62,15 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodModel.setInfos(infos); + List riskLevelIdList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodModel.getRiskFactorId())) { + List riskFactor = bloodModel.getRiskFactorId(); + for (String risk : riskFactor) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk); + riskLevelIdList.add(basicConfig.getParentId()); + } + } + bloodModel.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } else { @@ -79,6 +91,15 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodModel.setInfos(infos); + List riskLevelIdList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(bloodModel.getRiskFactorId())) { + List riskFactor = bloodModel.getRiskFactorId(); + for (String risk : riskFactor) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk); + riskLevelIdList.add(basicConfig.getParentId()); + } + } + bloodModel.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList)); TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } @@ -134,13 +155,53 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo //Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); temp.put("id", bloodPressure.getId()); if (bloodPressure != null) { - temp.put("username", bloodPressure.getUserName()); + temp.put("userName", bloodPressure.getUserName()); temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); temp.put("age", bloodPressure.getAge()); temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); + List riskList = bloodPressure.getRiskFactorId(); + Map riskLists = new HashMap(); + List list = new ArrayList<>(); + System.out.println("==========>" + riskList); + if (CollectionUtils.isNotEmpty(riskList)) { + for (String rist : riskList) { - // temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); + String ParentId = basicConfig.getParentId(); + if (StringUtils.isNotEmpty(ParentId) && basicConfig != null) { + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { + riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); + riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); + riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { + riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); + riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); + riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { + riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); + riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); + riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { + riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); + riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); + riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { + riskLists.put("id", HisptialRiskTypeEnum.JK.getId()); + riskLists.put("name", HisptialRiskTypeEnum.JK.getName()); + riskLists.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + list.add(riskLists); + } + } + } else { + temp.put("riskLevel", ""); + } + temp.put("riskLevel", list); String rFactor = commonService.resloveFactor(bloodPressure.getRiskFactorId()); if (bloodPressure.getHighriskDesc() != null && !"null".equals(bloodPressure.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { @@ -150,7 +211,6 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } } temp.put("riskFactor", rFactor); // 高危因素 - // temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); temp.put("pulse", bloodPressure.getPulse());