diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 762b43f..298c3e0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -96,4 +96,6 @@ public interface CouponMapper { int updateCouponStatus(Map param); CouponInfo findUserCoupon(Map param); + + String findByType(Map map); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 774054d..e813a8d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -48,4 +48,12 @@ public interface CouponService{ int updateCouponStatus(Map param); boolean validateUser(String userId, String code); + + /** + * 根据 使用id + type查询优惠券号码 + * @param id + * @param i + * @return + */ + String findByType(String id, int i); } 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 a928769..d9beb84 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 @@ -554,6 +554,14 @@ public class CouponServiceImpl implements CouponService { } @Override + public String findByType(String usedId, int type) { + Map map = new HashMap<>(); + map.put("usedId", usedId); + map.put("type", type); + return couponMapper.findByType(map); + } + + @Override public List> queryCouponItemsByType(Map params) { return couponMapper.queryCouponItemsByType(params); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index e86d5f6..1bd7bba 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -137,6 +137,11 @@ select sequence_id from coupon_info where used_id = #{id} limit 0,1 + + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 97e2f47..fc1ce96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -911,7 +911,7 @@ public class BabyCheckFacade { result = getBabyCheckResult(checkModel); result.setCouponCode(couponService.findByUsedId(id)); /** 优惠券编号 */ - String hemoglobinCoupon = couponService.findByUsedId(id); + String hemoglobinCoupon = couponService.findByType(id, 10); if(StringUtils.isNotEmpty(hemoglobinCoupon)) { result.setHemoglobinCoupon(hemoglobinCoupon); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index d25c6e2..ca7766a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2870,6 +2870,11 @@ public class ViewFacade { /** 优惠券编号 */ result.setCouponCode(couponService.findByUsedId(id)); + /** 优惠券编号血红蛋白 */ + String hemoglobinCoupon = couponService.findByType(id, 10); + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(hemoglobinCoupon)) { + result.setHemoglobinCoupon(hemoglobinCoupon); + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 0f3c8f7..96cd3ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -6,6 +6,8 @@ package com.lyms.platform.operate.web.result; */ public class BabyCheckPageResult { + private String hemoglobinCoupon; + private String id; //建档ID @@ -261,6 +263,14 @@ public class BabyCheckPageResult { private String couponCode; + public String getHemoglobinCoupon() { + return hemoglobinCoupon; + } + + public void setHemoglobinCoupon(String hemoglobinCoupon) { + this.hemoglobinCoupon = hemoglobinCoupon; + } + public String getNavel() { return navel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index c92d49e..bbe2b37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -142,7 +142,7 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true); if (CollectionUtils.isNotEmpty(hospitalIds)) { BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds) - .and("pid").is(pid)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); + .and("pid").is(pid).and("enable").ne("2")).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); if(babyModel == null) { return false; // 需 要建档 }