From eb633ed0959f0a14a32d546e175ed2c777dcc5d0 Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Tue, 30 Apr 2019 17:55:08 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/pojo/TemporaryUserModel.java   |  4 ++--
 .../web/controller/TemporaryUserController.java      |  8 +++-----
 .../web/service/impl/TemporaryUserServiceImpl.java   | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
index be71ad0..e5d8c7d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java
@@ -33,11 +33,11 @@ public class TemporaryUserModel extends BaseModel {
     private Integer number;
     //高危因素
     private List<String> riskFactorId;
-    // 其他高危
+    //高危补充说明
     private String highriskDesc;
 
 
-    //高危补充说明
+    //其他高危
     private List otherRisk;
     // 前囟 单胎/双胎/多胎
     private String bregmatic;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java
index 364f991..3222f1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java
@@ -8,12 +8,10 @@ import com.lyms.platform.operate.web.service.ITemporaryUserService;
 import com.lyms.platform.pojo.TemporaryUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 
 @Controller
 @RequestMapping(value = "/temporary")
@@ -26,7 +24,7 @@ public class TemporaryUserController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
     @TokenRequired
-    public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) {
+    public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
         return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
 
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
index f9a51db..80dca8d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service.impl;
 
 import com.lyms.platform.biz.dal.ITemporaryUserDao;
 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;
@@ -25,7 +26,9 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
 import java.util.*;
 
 @Service
@@ -44,6 +47,9 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
     @Autowired
     private OrganizationGroupsFacade groupsFacade;
 
+    @Autowired
+    private CommonService commonService;
+
     @Override
     public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, Integer userId) {
         if (null != temporaryUser.getId()) {
@@ -186,6 +192,20 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor
             requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
             requestMap.put("phone", bloodModel.getPhone());
             requestMap.put("id", bloodModel.getId());
+            requestMap.put("birth", DateUtil.getyyyy_MM_dd(bloodModel.getBirth()));
+            requestMap.put("beforeWeight", bloodModel.getBeforeWeight());
+            requestMap.put("beforeHeight", bloodModel.getBeforeHeight());
+            requestMap.put("lastMenses", DateUtil.getyyyy_MM_dd(bloodModel.getLastMenses()));
+            requestMap.put("highriskDesc", bloodModel.getHighriskDesc());
+            /*String rFactor = commonService.resloveFactor(bloodModel.getRiskFactorId());
+            if (bloodModel.getHighriskDesc() != null && !"null".equals(bloodModel.getHighriskDesc())) {
+                if (StringUtils.isNotEmpty(rFactor)) {
+                    rFactor += "," + bloodModel.getHighriskDesc();
+                } else {
+                    rFactor = bloodModel.getHighriskDesc();
+                }
+            }*/
+            requestMap.put("otherRisk", bloodModel.getOtherRisk());
             return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
         }
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
-- 
1.8.3.1