jiangjiazhi / regional-platform

Download as
Browse Code »

Commit eb633ed0959f0a14a32d546e175ed2c777dcc5d0

Authored by wangbo
1 parent 5528aa2d07
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 25 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java View file @ eb633ed
... ... @@ -33,11 +33,11 @@
33 33 private Integer number;
34 34 //高危因素
35 35 private List<String> riskFactorId;
36   - // 其他高危
  36 + //高危补充说明
37 37 private String highriskDesc;
38 38  
39 39  
40   - //高危补充说明
  40 + //其他高危
41 41 private List otherRisk;
42 42 // 前囟 单胎/双胎/多胎
43 43 private String bregmatic;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java View file @ eb633ed
... ... @@ -8,12 +8,10 @@
8 8 import com.lyms.platform.pojo.TemporaryUserModel;
9 9 import org.springframework.beans.factory.annotation.Autowired;
10 10 import org.springframework.stereotype.Controller;
11   -import org.springframework.web.bind.annotation.RequestMapping;
12   -import org.springframework.web.bind.annotation.RequestMethod;
13   -import org.springframework.web.bind.annotation.RequestParam;
14   -import org.springframework.web.bind.annotation.ResponseBody;
  11 +import org.springframework.web.bind.annotation.*;
15 12  
16 13 import javax.servlet.http.HttpServletRequest;
  14 +import javax.validation.Valid;
17 15  
18 16 @Controller
19 17 @RequestMapping(value = "/temporary")
... ... @@ -26,7 +24,7 @@
26 24 @ResponseBody
27 25 @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
28 26 @TokenRequired
29   - public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) {
  27 + public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
30 28 return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
31 29  
32 30 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ eb633ed
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.dal.ITemporaryUserDao;
4 4 import com.lyms.platform.biz.service.BasicConfigService;
  5 +import com.lyms.platform.biz.service.CommonService;
5 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
6 7 import com.lyms.platform.common.enums.HisptialRiskTypeEnum;
7 8 import com.lyms.platform.common.result.BaseObjectResponse;
8 9  
... ... @@ -25,7 +26,9 @@
25 26 import org.springframework.data.mongodb.core.query.Query;
26 27 import org.springframework.data.mongodb.core.query.Update;
27 28 import org.springframework.stereotype.Service;
  29 +import org.springframework.web.bind.annotation.RequestBody;
28 30  
  31 +import javax.validation.Valid;
29 32 import java.util.*;
30 33  
31 34 @Service
... ... @@ -44,6 +47,9 @@
44 47 @Autowired
45 48 private OrganizationGroupsFacade groupsFacade;
46 49  
  50 + @Autowired
  51 + private CommonService commonService;
  52 +
47 53 @Override
48 54 public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, Integer userId) {
49 55 if (null != temporaryUser.getId()) {
... ... @@ -186,6 +192,20 @@
186 192 requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
187 193 requestMap.put("phone", bloodModel.getPhone());
188 194 requestMap.put("id", bloodModel.getId());
  195 + requestMap.put("birth", DateUtil.getyyyy_MM_dd(bloodModel.getBirth()));
  196 + requestMap.put("beforeWeight", bloodModel.getBeforeWeight());
  197 + requestMap.put("beforeHeight", bloodModel.getBeforeHeight());
  198 + requestMap.put("lastMenses", DateUtil.getyyyy_MM_dd(bloodModel.getLastMenses()));
  199 + requestMap.put("highriskDesc", bloodModel.getHighriskDesc());
  200 + /*String rFactor = commonService.resloveFactor(bloodModel.getRiskFactorId());
  201 + if (bloodModel.getHighriskDesc() != null && !"null".equals(bloodModel.getHighriskDesc())) {
  202 + if (StringUtils.isNotEmpty(rFactor)) {
  203 + rFactor += "," + bloodModel.getHighriskDesc();
  204 + } else {
  205 + rFactor = bloodModel.getHighriskDesc();
  206 + }
  207 + }*/
  208 + requestMap.put("otherRisk", bloodModel.getOtherRisk());
189 209 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
190 210 }
191 211 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");