From 2f816f1f8286dcb9ac323952b281d93c9852fb7e Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Sat, 25 Nov 2017 14:19:19 +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 | 1 +
 .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java   | 2 ++
 2 files changed, 3 insertions(+)

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 <![CDATA[ < ]]> #{endDate}
                 </if>
                 and a.coupon_template_id = b.id and b.type_id = c.id
+                and ${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 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<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 param.put("userIds", sendUserIds);
+                param.put("hospitalFlag", "create_hospital_id"); /** 医院是用create_hospital_id 还是用 used_hospital_id限制*/
                 List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 System.out.println(sendUserIds);
                 for (Map<String, Object> m : mulitPatienInfo) {
@@ -1672,6 +1673,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             if(CollectionUtils.isNotEmpty(usedUserIds)) {
 //                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", usedUserIds, "startDate", param.get("startDate")));   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 param.put("userIds", usedUserIds);
+                param.put("hospitalFlag", "used_hospital_id");
                 List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 for (Map<String, Object> m : mulitPatienInfo) {
                     Long count = (Long) m.get("count");
-- 
1.8.3.1