From 33fa59412ee85d96b46328396d68b008ff44faa0 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Sun, 5 May 2019 14:47:10 +0800 Subject: [PATCH] update --- .../lyms/platform/operate/web/controller/TemporaryUserController.java | 3 ++- .../platform/operate/web/service/impl/TemporaryUserServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 3222f1d..0150e1c 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 @@ -24,7 +24,8 @@ public class TemporaryUserController extends BaseController { @ResponseBody @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST) @TokenRequired - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) { + //@Valid @RequestBody + public BaseResponse addAndUpdate( 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 e90233f..b68c4cf 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 @@ -114,7 +114,7 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor } criteria.and("_id").in(ids); } - PageResult pageResult = findMongoPage(TemporaryUserModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); + PageResult pageResult = findMongoPage(TemporaryUserModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List bloodSugars = (List) pageResult.getGrid(); List list = new ArrayList(); for (TemporaryUserModel temporaryUser : bloodSugars) { @@ -196,6 +196,8 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor requestMap.put("beforeHeight", bloodModel.getBeforeHeight()); requestMap.put("lastMenses", DateUtil.getyyyy_MM_dd(bloodModel.getLastMenses())); requestMap.put("highriskDesc", bloodModel.getHighriskDesc()); + requestMap.put("bregmatic", bloodModel.getBregmatic()); + requestMap.put("cardID", bloodModel.getCardID()); /*String rFactor = commonService.resloveFactor(bloodModel.getRiskFactorId()); if (bloodModel.getHighriskDesc() != null && !"null".equals(bloodModel.getHighriskDesc())) { if (StringUtils.isNotEmpty(rFactor)) { -- 1.8.3.1