diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index c5c4c4a..6254dc0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -563,7 +563,8 @@ public class MatDeliverController extends BaseController { @TokenRequired @ResponseBody @RequestMapping(value = "newBabyManager", method = RequestMethod.POST) - public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest) { + //@RequestBody + public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, NewBabyManagerRequest newBabyManagerRequest) { BaseListResponse baseListResponse; try { newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index e4bbddb..5b9f3a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -509,10 +509,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { normalQueryMap.put("phone", "联系方式"); normalQueryMap.put("patientId", ""); normalQueryMap.put("pid", ""); - normalQueryMap.put("asphyxiaM", "窒息分钟数"); - normalQueryMap.put("babyWeight", "儿童体重"); normalQueryMap.put("rhloseBloodL", "产后24小时内失血量"); - Map areaQueryMap = new LinkedHashMap<>(); areaQueryMap.put("apgarScorePf1", "Apgar1分钟"); areaQueryMap.put("apgarScorePf5", "Apgar5分钟"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java index 09cf178..98465a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java @@ -148,6 +148,16 @@ public class NewBabyManagerQueryModel { //产次 private Integer dueCount; private Integer gravidity;//孕次 + //窒息分钟 + private String asphyxiaM; + + public String getAsphyxiaM() { + return asphyxiaM; + } + + public void setAsphyxiaM(String asphyxiaM) { + this.asphyxiaM = asphyxiaM; + } public Integer getDueCount() { return dueCount; 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 88fce98..0b6a975 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 @@ -58,8 +58,13 @@ public class TemporaryUserServiceImpl extends BaseServiceImpl implements ITempor if (StringUtils.isNotEmpty(temporaryUser.getCardID()) || StringUtils.isNotEmpty(temporaryUser.getPhone())) { Criteria criteria = new Criteria(); criteria = criteria.orOperator(Criteria.where("cardID").is(temporaryUser.getCardID()), Criteria.where("phone").is(temporaryUser.getPhone())); - List temporaryUserModels = mongoTemplate.find(Query.query(criteria), TemporaryUserModel.class); - if (CollectionUtils.isNotEmpty(temporaryUserModels)) { + TemporaryUserModel temporaryUserModels = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class); + if (temporaryUserModels != null) { + temporaryUserModels.setModified(new Date()); + WriteResult s = mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(temporaryUser.getId())), Update.update("yn", "1"), TemporaryUserModel.class); + if (s.getN() >= 1) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(""); + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该用户已建档!"); } }