From 3a6ba2d0cf17c8784eb2dcdba574e9babf0f9c29 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 22 Jan 2018 17:45:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E7=B3=96=E3=80=81=E8=A1=80=E5=8E=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E9=AB=98=E5=8D=B1=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/BloodPressureServiceImpl.java | 4 ++-- .../web/service/impl/BloodSugarServiceImpl.java | 7 +++++-- .../lyms/platform/operate/web/utils/MongoUtil.java | 22 ---------------------- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 61ae9a4..58d2105 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -147,8 +147,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); temp.put("age", DateUtil.getAge(p.getBirth())); temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); - temp.put("riskLevel", mongoUtil.getRiskLevels(p)); //高危等级（颜色） - temp.put("riskFactor", mongoUtil.getRiskFactor(p)); // 高危因素 + temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); temp.put("pulse", bloodPressure.getPulse()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 80e3515..39401dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.service.BloodSugarService; +import com.lyms.platform.biz.service.CommonService; import com.lyms.platform.common.enums.BloodSugarEnums; import com.lyms.platform.common.enums.BloodSugarEnums2; import com.lyms.platform.common.enums.YnEnums; @@ -49,6 +50,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga private AccessPermissionFacade accessPermissionFacade; @Autowired private OrganizationGroupsFacade groupsFacade; + @Autowired + private CommonService commonService; public BaseResponse add(Integer userId, BloodSugar bloodSugar) { @@ -98,8 +101,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified())); temp.put("age", DateUtil.getAge(p.getBirth())); temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); - temp.put("riskLevel", mongoUtil.getRiskLevels(p)); //高危等级（颜色） - temp.put("riskFactor", mongoUtil.getRiskFactor(p)); // 高危因素 + temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L"); temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); 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 abff98d..47e348b 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 @@ -4,7 +4,6 @@ import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.RiskDefaultTypeEnum; 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.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; @@ -576,27 +575,6 @@ public class MongoUtil { return patients.getId(); } - /** - * 获取高危等级（颜色） - */ - public List> getRiskLevels(Patients p) { - List> colors = new ArrayList<>(); - if (p != null && StringUtils.isNotEmpty(p.getRiskLevelId())) { - List ids = JsonUtil.jkstr2Obj(p.getRiskLevelId(), List.class); - if(CollectionUtils.isNotEmpty(ids)) { - for (String id : ids) { - String name = findName(id); - if(StringUtils.isNotEmpty(name)) { - Map temp = new HashMap<>(); - temp.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); - temp.put("name", name.replace("预警", "")); - colors.add(temp); - } - } - } - } - return colors; - } /** * 获取高危因素 -- 1.8.3.1