jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 33fa59412ee85d96b46328396d68b008ff44faa0

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

update

Showing 2 changed files with 5 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java View file @ 33fa594
... ... @@ -24,7 +24,8 @@
24 24 @ResponseBody
25 25 @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
26 26 @TokenRequired
27   - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
  27 + //@Valid @RequestBody
  28 + public BaseResponse addAndUpdate( TemporaryUserModel temporaryUser, HttpServletRequest request) {
28 29 return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
29 30  
30 31 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ 33fa594
... ... @@ -114,7 +114,7 @@
114 114 }
115 115 criteria.and("_id").in(ids);
116 116 }
117   - PageResult pageResult = findMongoPage(TemporaryUserModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
  117 + PageResult pageResult = findMongoPage(TemporaryUserModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
118 118 List<TemporaryUserModel> bloodSugars = (List<TemporaryUserModel>) pageResult.getGrid();
119 119 List<Map> list = new ArrayList();
120 120 for (TemporaryUserModel temporaryUser : bloodSugars) {
... ... @@ -196,6 +196,8 @@
196 196 requestMap.put("beforeHeight", bloodModel.getBeforeHeight());
197 197 requestMap.put("lastMenses", DateUtil.getyyyy_MM_dd(bloodModel.getLastMenses()));
198 198 requestMap.put("highriskDesc", bloodModel.getHighriskDesc());
  199 + requestMap.put("bregmatic", bloodModel.getBregmatic());
  200 + requestMap.put("cardID", bloodModel.getCardID());
199 201 /*String rFactor = commonService.resloveFactor(bloodModel.getRiskFactorId());
200 202 if (bloodModel.getHighriskDesc() != null && !"null".equals(bloodModel.getHighriskDesc())) {
201 203 if (StringUtils.isNotEmpty(rFactor)) {