liquanyu / regional-platform

Download as
Browse Code »

Commit 60c5c1595558f62e9c261dd471d34731d65bc3f2

Authored by jiangjiazhi
2 parents 7080dcb83e cc412de20c
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 60c5c15
... ... @@ -147,8 +147,8 @@
147 147 temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified()));
148 148 temp.put("age", DateUtil.getAge(p.getBirth()));
149 149 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
150   - temp.put("riskLevel", mongoUtil.getRiskLevels(p)); //高危等级（颜色）
151   - temp.put("riskFactor", mongoUtil.getRiskFactor(p)); // 高危因素
  150 + temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
  151 + temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
152 152 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
153 153 temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg");
154 154 temp.put("pulse", bloodPressure.getPulse());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 60c5c15
... ... @@ -3,6 +3,7 @@
3 3 import com.alibaba.fastjson.JSONArray;
4 4 import com.alibaba.fastjson.JSONObject;
5 5 import com.lyms.platform.biz.service.BloodSugarService;
  6 +import com.lyms.platform.biz.service.CommonService;
6 7 import com.lyms.platform.common.enums.BloodSugarEnums;
7 8 import com.lyms.platform.common.enums.BloodSugarEnums2;
8 9 import com.lyms.platform.common.enums.YnEnums;
... ... @@ -49,6 +50,8 @@
49 50 private AccessPermissionFacade accessPermissionFacade;
50 51 @Autowired
51 52 private OrganizationGroupsFacade groupsFacade;
  53 + @Autowired
  54 + private CommonService commonService;
52 55  
53 56  
54 57 public BaseResponse add(Integer userId, BloodSugar bloodSugar) {
... ... @@ -98,8 +101,8 @@
98 101 temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified()));
99 102 temp.put("age", DateUtil.getAge(p.getBirth()));
100 103 temp.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
101   - temp.put("riskLevel", mongoUtil.getRiskLevels(p)); //高危等级（颜色）
102   - temp.put("riskFactor", mongoUtil.getRiskFactor(p)); // 高危因素
  104 + temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色）
  105 + temp.put("riskFactor", commonService.resloveFactor(p.getRiskFactorId())); // 高危因素
103 106 temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate()));
104 107 temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L");
105 108 temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 60c5c15
... ... @@ -4,7 +4,6 @@
4 4 import com.lyms.platform.biz.service.PatientsService;
5 5 import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
6 6 import com.lyms.platform.common.utils.DateUtil;
7   -import com.lyms.platform.common.utils.JsonUtil;
8 7 import com.lyms.platform.common.utils.StringUtils;
9 8 import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
10 9 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
... ... @@ -576,27 +575,6 @@
576 575 return patients.getId();
577 576 }
578 577  
579   - /**
580   - * 获取高危等级（颜色）
581   - */
582   - public List<Map<String, Object>> getRiskLevels(Patients p) {
583   - List<Map<String, Object>> colors = new ArrayList<>();
584   - if (p != null && StringUtils.isNotEmpty(p.getRiskLevelId())) {
585   - List<String> ids = JsonUtil.jkstr2Obj(p.getRiskLevelId(), List.class);
586   - if(CollectionUtils.isNotEmpty(ids)) {
587   - for (String id : ids) {
588   - String name = findName(id);
589   - if(StringUtils.isNotEmpty(name)) {
590   - Map<String, Object> temp = new HashMap<>();
591   - temp.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name));
592   - temp.put("name", name.replace("预警", ""));
593   - colors.add(temp);
594   - }
595   - }
596   - }
597   - }
598   - return colors;
599   - }
600 578  
601 579 /**
602 580 * 获取高危因素