From a92be449983936d3183ec241174907238b9e976e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 2 Nov 2018 10:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E4=BC=98=E6=83=A0=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/dao/master/CouponMapper.java    |  2 ++
 .../src/main/resources/mainOrm/master/CouponMapper.xml  | 17 +++++++++++++++++
 .../operate/web/service/impl/ReportServiceImpl.java     |  2 ++
 3 files changed, 21 insertions(+)

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 2573d24..89c6f42 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
@@ -152,4 +152,6 @@ public interface CouponMapper {
     int findCouponInfoCount2(Map<String, Object> param);
 
     Map<String,Object> findHospitalAllused(Map<String, Object> param);
+
+    Map<String,Object> findHospitalCsAllused(Map<String, Object> queryParam);
 }
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 4ae74c9..d910596 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -984,4 +984,21 @@
     </select>
 
 
+
+    <select id="findHospitalCsAllused" parameterType="map" resultType="map">
+        select count(t.id) as allUserdCsCount
+        from coupon_info c, hospital_coupon_template_group h,coupon_template t ,coupon_type p
+        where h.coupon_template_group_id=t.group_id and t.type_id=p.id and c.coupon_template_id =  t.id
+        and h.hospital_id = #{hid}
+        and p.type=11
+        <if test="startDate != null">
+            and  c.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and  c.use_date <![CDATA[ <= ]]> #{endDate}
+        </if>
+        and c.status =2 and c.used_id is not null
+    </select>
+
+
 </mapper>
\ No newline at end of file
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 3e36567..f9a1c26 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
@@ -2490,11 +2490,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                                     Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo2(queryParam);
                                     Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo2(queryParam);
                                     Map<String, Object> allusedInfo = couponMapper.findHospitalAllused(queryParam);
+                                    Map<String, Object> allusedCsInfo = couponMapper.findHospitalCsAllused(queryParam);
 
                                     Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, queryParam);
 
                                     if(MapUtils.isNotEmpty(tempMap)) {
                                         tempMap.put("allUserdCount",(allusedInfo == null || allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount"));
+                                        tempMap.put("allUserdCsCount",(allusedCsInfo == null || allusedCsInfo.get("allUserdCsCount") == null) ? 0 : allusedCsInfo.get("allUserdCsCount"));
 
                                         /** 方法/使用人数id */
                                         List<String> sendUserIds = couponMapper.findSendUserIds2(queryParam);
-- 
1.8.3.1