Commit d6ea9f64d8443cdab16d551a30118343940c6287
1 parent
2f816f1f82
Exists in
master
and in
6 other branches
改优惠券bug
Showing 2 changed files with 2 additions and 1 deletions
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
View file @
d6ea9f6
| ... | ... | @@ -698,7 +698,7 @@ |
| 698 | 698 | and a.create_date <![CDATA[ < ]]> #{endDate} |
| 699 | 699 | </if> |
| 700 | 700 | and a.coupon_template_id = b.id and b.type_id = c.id |
| 701 | - and ${hospitalFlag} = #{hid} | |
| 701 | + and a.${hospitalFlag} = #{hid} | |
| 702 | 702 | and c.type in |
| 703 | 703 | <foreach collection="couponType" open="(" close=")" separator="," item="type"> |
| 704 | 704 | #{type} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
d6ea9f6
| ... | ... | @@ -1649,6 +1649,7 @@ |
| 1649 | 1649 | for (Map<String, Object> map : couponReport) { |
| 1650 | 1650 | List<String> sendUserIds = (List<String>) map.get("sendUserIds"); |
| 1651 | 1651 | List<String> sendUserIds2 = new ArrayList<>(); |
| 1652 | + param.put("hid", map.get("hospitalId")); | |
| 1652 | 1653 | if(CollectionUtils.isNotEmpty(sendUserIds)) { |
| 1653 | 1654 | // List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */ |
| 1654 | 1655 | param.put("userIds", sendUserIds); |