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 9a932d9..f5a8154 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -698,6 +698,7 @@ and a.create_date #{endDate} and a.coupon_template_id = b.id and b.type_id = c.id + and ${hospitalFlag} = #{hid} and c.type in #{type} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 82347b6..7a7691f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1652,6 +1652,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(sendUserIds)) { // List> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ param.put("userIds", sendUserIds); + param.put("hospitalFlag", "create_hospital_id"); /** 医院是用create_hospital_id 还是用 used_hospital_id限制*/ List> mulitPatienInfo = couponMapper.findMulitPatienInfo(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ System.out.println(sendUserIds); for (Map m : mulitPatienInfo) { @@ -1672,6 +1673,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(usedUserIds)) { // List> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", usedUserIds, "startDate", param.get("startDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ param.put("userIds", usedUserIds); + param.put("hospitalFlag", "used_hospital_id"); List> mulitPatienInfo = couponMapper.findMulitPatienInfo(param); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ for (Map m : mulitPatienInfo) { Long count = (Long) m.get("count");