From 31d0897e96f2ba23ea0097d63eaaadb39eb055ef Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Mon, 8 Jan 2018 17:14:29 +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 | 54 ++++++++++++++++++++++
 .../web/service/impl/ReportServiceImpl.java        |  6 ++-
 3 files changed, 62 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 cb1e3cb..7de9438 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
@@ -142,4 +142,8 @@ public interface CouponMapper {
     List<Map<String,Object>> findUsedInfo2(Map<String, Object> param);
 
     List<Map<String,Object>> findMulitPatienInfoWithSend(Map<String, Object> param);
+
+    List<Map<String,Object>> couponInfo2(Map<String, Object> param);
+
+    int findCouponInfoCount2(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 28824c8..6bc1197 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -488,6 +488,34 @@
         </if>
     </select>
 
+    <select id="couponInfo2" parameterType="map" resultType="map">
+        select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id
+        from coupon_info a, coupon_template b, coupon_type c, organization d
+        where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id
+        and a.status = 2
+        and a.used_hospital_id in
+        <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+            #{hid}
+        </foreach>
+        and c.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="coupon_order != null">
+            and b.coupon_order = #{coupon_order}
+        </if>
+        <if test="startDate != null">
+            and a.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and a.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        order by a.user_id, a.use_date desc
+        <if test="needPage == true">
+            limit #{currentPage},#{pageSize}
+        </if>
+    </select>
+
     <select id="findCouponInfoCount" parameterType="map" resultType="integer">
         select count(1) from (
             select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id
@@ -514,6 +542,32 @@
         ) a
     </select>
 
+    <select id="findCouponInfoCount2" parameterType="map" resultType="integer">
+        select count(1) from (
+        select a.used_hospital_id, c.type, b.coupon_order, a.sequence_id, d.name as send_hospital, a.use_date, a.used_id, a.operator_use_id
+        from coupon_info a, coupon_template b, coupon_type c, organization d
+        where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id
+        and a.status = 2
+        and a.used_hospital_id in
+        <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+            #{hid}
+        </foreach>
+        and c.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        <if test="coupon_order != null">
+            and b.coupon_order = #{coupon_order}
+        </if>
+        <if test="startDate != null">
+            and a.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and a.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        ) a
+    </select>
+
     <select id="doHospitalFilter" parameterType="map" resultType="string">
         select a.id from organization a, hospital_coupon_template_group b
         where a.id = b.hospital_id and a.id in
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 030c487..ce00244 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
@@ -2605,7 +2605,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
         Assert.notNull(type, "type must not be null!");
 
         if(type == 4) { /** 使用详情统计 */
-            List<Map<String, Object>> couponInfos = couponMapper.couponInfo(param);
+//            List<Map<String, Object>> couponInfos = couponMapper.couponInfo(param);
+            List<Map<String, Object>> couponInfos = couponMapper.couponInfo2(param);
             String subTitle = null;
             Set<String> subTitleTempSet = new HashSet<>();
 
@@ -2635,7 +2636,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                     );
                 }
             }
-            int count = couponMapper.findCouponInfoCount(param);
+//            int count = couponMapper.findCouponInfoCount(param);
+            int count = couponMapper.findCouponInfoCount2(param);
             PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("couponInfos", couponInfos, "subTitle", subTitle));
             return RespBuilder.buildSuccess(pageResult);
         } if(type == 1) { /** 发放人数统计 */
-- 
1.8.3.1