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 11b5e0c..ec842cd 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 @@ -43,4 +43,5 @@ public interface CouponMapper { String findByUsedId(String usedId); String findCityId(String hospitalId); + } 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 3536aef..ab289da 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 @@ -158,6 +158,7 @@ public class CouponServiceImpl implements CouponService { Map param = new HashMap<>(); param.put("userId", userId); param.put("hospitalId", hospitalId); + param.put("status", 1); List list = couponMapper.findList(param); return CollectionUtils.isNotEmpty(list); } 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 e10c123..17ed825 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -33,6 +33,9 @@ and create_hospital_id = #{hospitalId} + + and status = #{status} + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index e99ef39..d1d3a49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -105,9 +105,9 @@ public class BabyCheckController extends BaseController{ @RequestMapping(value = "/queryChooseBabys", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo){ + public BaseObjectResponse queryChooseBabys(HttpServletRequest request,@RequestParam(required = false)String vcCardNo,@RequestParam(required = false)String cardNo, String coupon){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId()); + return babyCheckFacade.queryChooseBabys(vcCardNo, cardNo, loginState.getId(), coupon); } 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 e0412c3..5f2ac90 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.BabyCheckRequest; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; @@ -68,6 +69,9 @@ public class BabyCheckFacade { @Autowired private QhdfyHisService qhdfyHisService; + @Autowired + private CouponMapper couponMapper; + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); /** @@ -740,9 +744,10 @@ public class BabyCheckFacade { * * @param vcCardNo * @param cardNo + * @param coupon * @return */ - public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId) { + public BaseObjectResponse queryChooseBabys(String vcCardNo, String cardNo, Integer userId, String coupon) { Map map = new HashMap(); @@ -761,12 +766,21 @@ public class BabyCheckFacade { boolean isBuild = false; List results = new ArrayList<>(); - if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo)) { + if (!StringUtils.isEmpty(vcCardNo) || !StringUtils.isEmpty(cardNo) || StringUtils.isNotEmpty(coupon)) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码 babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); babyQuery.setYn(YnEnums.YES.getId()); + /** 处理优惠券查询 */ + if(StringUtils.isNotEmpty(coupon)) { + Map m = couponMapper.findUrl(coupon); + Object personId = m.get("user_id"); + if(personId != null) { + babyQuery.setPid(personId.toString()); + } + } + //表示区域的 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { List list = new ArrayList(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 0f46453..61d6346 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -246,6 +246,8 @@ public class BookbuildingFacade { patient.setOperator(userId); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); + /** 孕妇建档后把所有以前未使用的优惠券作废 */ + couponService.invalid(p.getPid(), "1,2,3,4,5,6,7,8"); if (resperson != null) {