jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ab21716155f227149fe32f7666f1319e68d7c7e1

Authored by litao@lymsh.com
1 parent 4ce232310b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改bug

Showing 3 changed files with 21 additions and 3 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java View file @ ab21716
1 1 package com.lyms.platform.permission.service.impl;
2 2  
3 3 import com.alibaba.fastjson.JSON;
  4 +import com.lyms.platform.biz.SequenceConstant;
4 5 import com.lyms.platform.biz.service.GenSequenceIdService;
5 6 import com.lyms.platform.common.result.BaseObjectResponse;
6 7 import com.lyms.platform.common.result.RespBuilder;
... ... @@ -652,7 +653,7 @@
652 653 public BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type) {
653 654 Integer year = DateUtil.getCurrentYear();
654 655 String peopleNum = null;
655   - PlantformConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("key").is(hospitalId)), PlantformConfigModel.class);
  656 + PlantformConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("key").is(hospitalId).and("type").is(SequenceConstant.QUEUE_TYPE)), PlantformConfigModel.class);
656 657 if(model != null) {
657 658 String value = model.getValue();
658 659 if(StringUtils.isNotEmpty(value)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ab21716
... ... @@ -18,6 +18,7 @@
18 18 import com.lyms.platform.operate.web.utils.BabyListTask;
19 19 import com.lyms.platform.operate.web.utils.GrowthCountTask;
20 20 import com.lyms.platform.operate.web.utils.MessageCenterService;
  21 +import com.lyms.platform.operate.web.utils.MongoUtil;
21 22 import com.lyms.platform.permission.model.Organization;
22 23 import com.lyms.platform.permission.model.OrganizationQuery;
23 24 import com.lyms.platform.permission.model.Users;
24 25  
... ... @@ -132,7 +133,10 @@
132 133 @Autowired
133 134 private MongoTemplate mongoTemplate;
134 135  
  136 + @Autowired
  137 + private MongoUtil mongoUtil;
135 138  
  139 +
136 140 public BaseResponse getBabyBase(String babyId) {
137 141 //查询儿童的基本信息
138 142 BabyBasicResult base = new BabyBasicResult();
... ... @@ -1034,6 +1038,7 @@
1034 1038 private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) {
1035 1039 // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1036 1040 BabyModel bm = new BabyModel();
  1041 + bm.setmHighRiskReason(b.getmHighRiskReason());
1037 1042 bm.setYn(YnEnums.YES.getId());
1038 1043  
1039 1044 bm.setMname(b.getMommyName());
... ... @@ -1211,7 +1216,8 @@
1211 1216 */
1212 1217 private BabyBuildResult getBabyBuildResult(BabyModel model) {
1213 1218 BabyBuildResult result = new BabyBuildResult();
1214   - result.setmHighRiskReason(model.getmHighRiskReason());
  1219 + result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason()));
  1220 + result.setmHighRiskReason2(mongoUtil.findNameList(model.getmHighRiskReason()));
1215 1221  
1216 1222 result.setId(model.getId());
1217 1223 result.setPid(model.getPid());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ ab21716
... ... @@ -8,8 +8,11 @@
8 8 */
9 9 public class BabyBuildResult {
10 10 // 母亲高危因素
11   - List<String> mHighRiskReason;
  11 + private List<String> mHighRiskReason;
12 12  
  13 + private List<Map<String, Object>> mHighRiskReason2;
  14 +
  15 +
13 16 public List<String> getmHighRiskReason() {
14 17 return mHighRiskReason;
15 18 }
... ... @@ -559,6 +562,14 @@
559 562  
560 563 public void setApgarScore(Map<String, Object> apgarScore) {
561 564 this.apgarScore = apgarScore;
  565 + }
  566 +
  567 + public void setmHighRiskReason2(List<Map<String,Object>> mHighRiskReason2) {
  568 + this.mHighRiskReason2 = mHighRiskReason2;
  569 + }
  570 +
  571 + public List<Map<String, Object>> getmHighRiskReason2() {
  572 + return mHighRiskReason2;
562 573 }
563 574 }