Commit 5457abcab1bd0b0587c063524a4f8c410f69af6c

Authored by wangbo
1 parent ac76c41e82

自测bug提交

Showing 2 changed files with 42 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java View file @ 5457abc
... ... @@ -27,7 +27,7 @@
27 27 @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
28 28 @TokenRequired
29 29 @ResponseBody
30   - public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
  30 + public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
31 31 return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request));
32 32 }
33 33  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ 5457abc
... ... @@ -115,6 +115,47 @@
115 115 @Override
116 116 public BaseResponse queryOne(String id) {
117 117 TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class);
  118 +
  119 + if (bloodModel != null) {
  120 + Map<String, Object> requestMap = new HashMap<>();
  121 + List<String> rists = bloodModel.getRiskFactorId();
  122 + List<Map> listMap = new ArrayList<>();
  123 + Integer riskScore = 0;
  124 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
  125 + for (String rist : rists) {
  126 + Map<String, Object> map = new HashMap();
  127 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
  128 + riskScore += Integer.valueOf(basicConfig.getCode());
  129 + BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
  130 + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
  131 + map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
  132 + }
  133 + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
  134 + map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
  135 + }
  136 + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.GFX.getId())) {
  137 + map.put("color", HisptialRiskTypeEnum.GFX.getColor());
  138 + }
  139 + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.CRB.getId())) {
  140 + map.put("color", HisptialRiskTypeEnum.CRB.getColor());
  141 + }
  142 + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JK.getId())) {
  143 + map.put("color", HisptialRiskTypeEnum.JK.getColor());
  144 + }
  145 + map.put("name", basicConfig.getName());
  146 + map.put("id", basicConfig.getId());
  147 + listMap.add(map);
  148 + }
  149 + }
  150 + requestMap.put("riskScore", riskScore);
  151 + requestMap.put("riskFactor", listMap);
  152 + requestMap.put("userName", bloodModel.getUserName());
  153 + requestMap.put("age", bloodModel.getAge());
  154 + requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
  155 + requestMap.put("phone", bloodModel.getPhone());
  156 + requestMap.put("id", bloodModel.getId());
  157 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
  158 + }
118 159 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(bloodModel);
119 160 }
120 161