jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9562951a98ea0a5e476ac1a28d29cd27d02e9f42

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

update

Showing 4 changed files with 19 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 9562951
... ... @@ -563,7 +563,8 @@
563 563 @TokenRequired
564 564 @ResponseBody
565 565 @RequestMapping(value = "newBabyManager", method = RequestMethod.POST)
566   - public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest) {
  566 + //@RequestBody
  567 + public BaseListResponse newBabyManager(HttpServletRequest httpServletRequest, NewBabyManagerRequest newBabyManagerRequest) {
567 568 BaseListResponse baseListResponse;
568 569 try {
569 570 newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ 9562951
... ... @@ -509,10 +509,7 @@
509 509 normalQueryMap.put("phone", "联系方式");
510 510 normalQueryMap.put("patientId", "");
511 511 normalQueryMap.put("pid", "");
512   - normalQueryMap.put("asphyxiaM", "窒息分钟数");
513   - normalQueryMap.put("babyWeight", "儿童体重");
514 512 normalQueryMap.put("rhloseBloodL", "产后24小时内失血量");
515   -
516 513 Map<String, String> areaQueryMap = new LinkedHashMap<>();
517 514 areaQueryMap.put("apgarScorePf1", "Apgar1分钟");
518 515 areaQueryMap.put("apgarScorePf5", "Apgar5分钟");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 9562951
... ... @@ -148,6 +148,16 @@
148 148 //产次
149 149 private Integer dueCount;
150 150 private Integer gravidity;//孕次
  151 + //窒息分钟
  152 + private String asphyxiaM;
  153 +
  154 + public String getAsphyxiaM() {
  155 + return asphyxiaM;
  156 + }
  157 +
  158 + public void setAsphyxiaM(String asphyxiaM) {
  159 + this.asphyxiaM = asphyxiaM;
  160 + }
151 161  
152 162 public Integer getDueCount() {
153 163 return dueCount;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryUserServiceImpl.java View file @ 9562951
... ... @@ -58,8 +58,13 @@
58 58 if (StringUtils.isNotEmpty(temporaryUser.getCardID()) || StringUtils.isNotEmpty(temporaryUser.getPhone())) {
59 59 Criteria criteria = new Criteria();
60 60 criteria = criteria.orOperator(Criteria.where("cardID").is(temporaryUser.getCardID()), Criteria.where("phone").is(temporaryUser.getPhone()));
61   - List<TemporaryUserModel> temporaryUserModels = mongoTemplate.find(Query.query(criteria), TemporaryUserModel.class);
62   - if (CollectionUtils.isNotEmpty(temporaryUserModels)) {
  61 + TemporaryUserModel temporaryUserModels = mongoTemplate.findOne(Query.query(criteria), TemporaryUserModel.class);
  62 + if (temporaryUserModels != null) {
  63 + temporaryUserModels.setModified(new Date());
  64 + WriteResult s = mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(temporaryUser.getId())), Update.update("yn", "1"), TemporaryUserModel.class);
  65 + if (s.getN() >= 1) {
  66 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("");
  67 + }
63 68 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("该用户已建档!");
64 69 }
65 70 }