From d6ea9f64d8443cdab16d551a30118343940c6287 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Sat, 25 Nov 2017 15:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BC=98=E6=83=A0=E5=88=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml | 2 +-
 .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 f5a8154..16e615e 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -698,7 +698,7 @@
                     and a.create_date <![CDATA[ < ]]> #{endDate}
                 </if>
                 and a.coupon_template_id = b.id and b.type_id = c.id
-                and ${hospitalFlag} = #{hid}
+                and a.${hospitalFlag} = #{hid}
                 and c.type in
                 <foreach collection="couponType" open="(" close=")" separator="," item="type">
                     #{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 7a7691f..64dc257 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
@@ -1649,6 +1649,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         for (Map<String, Object> map : couponReport) {
             List<String> sendUserIds = (List<String>) map.get("sendUserIds");
             List<String> sendUserIds2 = new ArrayList<>();
+            param.put("hid", map.get("hospitalId"));
             if(CollectionUtils.isNotEmpty(sendUserIds)) {
 //                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 param.put("userIds", sendUserIds);
-- 
1.8.3.1