From 4ed28a56ddea8a69cbbc1958c3926aec2bf251f8 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Mon, 8 Jan 2018 10:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/dao/master/CouponMapper.java        |  4 +++
 .../main/resources/mainOrm/master/CouponMapper.xml | 35 ++++++++++++++++++++++
 .../web/service/impl/ReportServiceImpl.java        |  4 +--
 3 files changed, 41 insertions(+), 2 deletions(-)

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 891b93b..9a2122f 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
@@ -130,4 +130,8 @@ public interface CouponMapper {
     List<String> findUsededId(List<String> usedIds);
 
     List<Map<String, Object>> findAllHospitals();
+
+    Map<String,Object> findHospitalUsedInfo2(Map<String, Object> param);
+
+    Map<String,Object> findHospitalSendInfo2(Map<String, Object> param);
 }
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 b730834..95f0754 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -306,6 +306,24 @@
         </if>
     </select>
 
+    <select id="findHospitalUsedInfo2" parameterType="map" resultType="map">
+        select a.id, count(distinct(b.user_id)) as user_used_count, count(1) as coupon_used_count, a.area_id, a.city_id, a.province_id
+        from organization a, coupon_info b, coupon_template c, coupon_type d
+        where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
+        and a.id = #{hid}
+        and b.status = 2
+        and d.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="startDate != null">
+            and b.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="findSendUserIds" parameterType="map" resultType="string">
         select distinct(b.user_id)
         from organization a, coupon_info b, coupon_template c, coupon_type d
@@ -340,6 +358,23 @@
         </if>
     </select>
 
+    <select id="findHospitalSendInfo2" parameterType="map" resultType="map">
+        select a.id, count(distinct(b.user_id)) as people_send_count, count(1) as coupon_send_count, a.area_id, a.city_id, a.province_id
+        from organization a, coupon_info b, coupon_template c, coupon_type d
+        where a.id = b.create_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id
+        and a.id = #{hid}
+        and d.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="startDate != null">
+            and b.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="findHospitalNameById" parameterType="string" resultType="string">
         select name from organization where id = #{id}
     </select>
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 fc49bcc..b822107 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
@@ -2189,8 +2189,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 hNameMap = CollectionUtils.coverListToMap(hospitalNames, "id", "name");
                 for (String hid : hospitalId) {
                     param.put("hid", hid);
-                    Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo(param);
-                    Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo(param);
+                    Map<String, Object> usedInfo = couponMapper.findHospitalUsedInfo2(param);
+                    Map<String, Object> sendInfo = couponMapper.findHospitalSendInfo2(param);
 
                     Map<String, Object> tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param);
 
-- 
1.8.3.1