diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 9a3bd74..35d4bee 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.service.impl; import com.alibaba.fastjson.JSON; +import com.lyms.platform.biz.SequenceConstant; import com.lyms.platform.biz.service.GenSequenceIdService; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.RespBuilder; @@ -652,7 +653,7 @@ public class CouponServiceImpl implements CouponService { public BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type) { Integer year = DateUtil.getCurrentYear(); String peopleNum = null; - PlantformConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("key").is(hospitalId)), PlantformConfigModel.class); + PlantformConfigModel model = mongoTemplate.findOne(Query.query(Criteria.where("key").is(hospitalId).and("type").is(SequenceConstant.QUEUE_TYPE)), PlantformConfigModel.class); if(model != null) { String value = model.getValue(); if(StringUtils.isNotEmpty(value)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d724805..8c7a945 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -18,6 +18,7 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.GrowthCountTask; import com.lyms.platform.operate.web.utils.MessageCenterService; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -132,6 +133,9 @@ public class BabyBookbuildingFacade { @Autowired private MongoTemplate mongoTemplate; + @Autowired + private MongoUtil mongoUtil; + public BaseResponse getBabyBase(String babyId) { //查询儿童的基本信息 @@ -1034,6 +1038,7 @@ public class BabyBookbuildingFacade { private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { // hujiaqi添加了一个字段,判断是插入还是更新,如果是更新,就不更新birth字段 BabyModel bm = new BabyModel(); + bm.setmHighRiskReason(b.getmHighRiskReason()); bm.setYn(YnEnums.YES.getId()); bm.setMname(b.getMommyName()); @@ -1211,7 +1216,8 @@ public class BabyBookbuildingFacade { */ private BabyBuildResult getBabyBuildResult(BabyModel model) { BabyBuildResult result = new BabyBuildResult(); - result.setmHighRiskReason(model.getmHighRiskReason()); + result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); + result.setmHighRiskReason2(mongoUtil.findNameList(model.getmHighRiskReason())); result.setId(model.getId()); result.setPid(model.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index b1905dd..fc0d89e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -8,7 +8,10 @@ import java.util.Map; */ public class BabyBuildResult { // 母亲高危因素 - List mHighRiskReason; + private List mHighRiskReason; + + private List> mHighRiskReason2; + public List getmHighRiskReason() { return mHighRiskReason; @@ -560,4 +563,12 @@ public class BabyBuildResult { public void setApgarScore(Map apgarScore) { this.apgarScore = apgarScore; } + + public void setmHighRiskReason2(List> mHighRiskReason2) { + this.mHighRiskReason2 = mHighRiskReason2; + } + + public List> getmHighRiskReason2() { + return mHighRiskReason2; + } }