From 5457abcab1bd0b0587c063524a4f8c410f69af6c Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Thu, 4 Apr 2019 09:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8Bbug=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/TemporaryWeightController.java  |  2 +-
 .../service/impl/TemporaryBloodServiceImpl.java    | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
index c133bf2..6023f89 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
@@ -27,7 +27,7 @@ public class TemporaryWeightController extends BaseController {
     @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
     @TokenRequired
     @ResponseBody
-    public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
+    public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) {
         return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request));
     }
 
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 3306783..a760941 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
@@ -115,6 +115,47 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo
     @Override
     public BaseResponse queryOne(String id) {
         TemporaryBloodModel bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodModel.class);
+
+        if (bloodModel != null) {
+            Map<String, Object> requestMap = new HashMap<>();
+            List<String> rists = bloodModel.getRiskFactorId();
+            List<Map> listMap = new ArrayList<>();
+            Integer riskScore = 0;
+            if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
+                for (String rist : rists) {
+                    Map<String, Object> map = new HashMap();
+                    BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
+                    riskScore += Integer.valueOf(basicConfig.getCode());
+                    BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId());
+                    if (basicConfig1.getId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
+                        map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
+                    }
+                    if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
+                        map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
+                    }
+                    if (basicConfig1.getId().equals(HisptialRiskTypeEnum.GFX.getId())) {
+                        map.put("color", HisptialRiskTypeEnum.GFX.getColor());
+                    }
+                    if (basicConfig1.getId().equals(HisptialRiskTypeEnum.CRB.getId())) {
+                        map.put("color", HisptialRiskTypeEnum.CRB.getColor());
+                    }
+                    if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JK.getId())) {
+                        map.put("color", HisptialRiskTypeEnum.JK.getColor());
+                    }
+                    map.put("name", basicConfig.getName());
+                    map.put("id", basicConfig.getId());
+                    listMap.add(map);
+                }
+            }
+            requestMap.put("riskScore", riskScore);
+            requestMap.put("riskFactor", listMap);
+            requestMap.put("userName", bloodModel.getUserName());
+            requestMap.put("age", bloodModel.getAge());
+            requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
+            requestMap.put("phone", bloodModel.getPhone());
+            requestMap.put("id", bloodModel.getId());
+            return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
+        }
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(bloodModel);
     }
 
-- 
1.8.3.1