From 56fa35a390a744c7f8068f908d27ca10c34bf09a Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Mon, 8 Jan 2018 16:15:18 +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        |  8 ++
 .../main/resources/mainOrm/master/CouponMapper.xml | 89 +++++++++++++++++++++-
 .../web/service/impl/ReportServiceImpl.java        | 12 +--
 3 files changed, 101 insertions(+), 8 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 9a2122f..cb1e3cb 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
@@ -134,4 +134,12 @@ public interface CouponMapper {
     Map<String,Object> findHospitalUsedInfo2(Map<String, Object> param);
 
     Map<String,Object> findHospitalSendInfo2(Map<String, Object> param);
+
+    List<String> findSendUserIds2(Map<String, Object> param);
+
+    List<String> findUsedUserIds2(Map<String, Object> param);
+
+    List<Map<String,Object>> findUsedInfo2(Map<String, Object> param);
+
+    List<Map<String,Object>> findMulitPatienInfoWithSend(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 95f0754..28824c8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -270,6 +270,30 @@
         group by b.coupon_order, b.type, a.used_hospital_id
     </select>
 
+    <select id="findUsedInfo2" parameterType="map" resultType="map">
+        select count(1) as type_used_count, b.coupon_order, b.type, a.used_hospital_id
+        from coupon_info a, (
+        select a.id, a.coupon_order, b.type, d.hospital_id
+        from coupon_template a, coupon_type b, hospital_coupon_template_group d
+        where a.group_id = d.coupon_template_group_id and b.id = a.type_id and d.hospital_id in
+        <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
+            #{hid}
+        </foreach>
+        and b.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        ) b
+        where a.used_hospital_id = b.hospital_id and a.coupon_template_id = b.id and a.status = 2
+        <if test="startDate != null">
+            and a.create_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and a.create_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        group by b.coupon_order, b.type, a.used_hospital_id
+    </select>
+
     <select id="findUsedUserIds" parameterType="map" resultType="string">
         select distinct(b.user_id)
         from organization a, coupon_info b, coupon_template c, coupon_type d
@@ -288,6 +312,24 @@
         </if>
     </select>
 
+    <select id="findUsedUserIds2" parameterType="map" resultType="string">
+        select distinct(b.user_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="findHospitalUsedInfo" 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
@@ -341,6 +383,23 @@
         </if>
     </select>
 
+    <select id="findSendUserIds2" parameterType="map" resultType="string">
+        select distinct(b.user_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.create_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.create_date <![CDATA[ < ]]> #{endDate}
+        </if>
+    </select>
+
     <select id="findHospitalSendInfo" 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
@@ -368,10 +427,10 @@
             #{type}
         </foreach>
         <if test="startDate != null">
-            and b.use_date >= #{startDate}
+            and b.create_date >= #{startDate}
         </if>
         <if test="endDate != null">
-            and b.use_date <![CDATA[ < ]]> #{endDate}
+            and b.create_date <![CDATA[ < ]]> #{endDate}
         </if>
     </select>
 
@@ -743,6 +802,32 @@
         ) a group by a.user_id
     </select>
 
+    <select id="findMulitPatienInfoWithSend" parameterType="map" resultType="map">
+        select count(1) as count, a.user_id as user_id from (
+        select a.ymd, a.user_id from (
+        select DATE_FORMAT(a.create_date, '%Y-%m-%d') as ymd, a.user_id
+        from coupon_info a, coupon_template b, coupon_type c
+        where a.user_id in
+        <foreach collection="userIds" open="(" close=")" separator="," item="uid">
+            #{uid}
+        </foreach>
+        <if test="startDate != null">
+            and a.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and a.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        and a.coupon_template_id = b.id and b.type_id = c.id
+        and a.${hospitalFlag} = #{hid}
+        and c.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        order by a.create_date desc
+        ) a group by a.ymd, a.user_id
+        ) a group by a.user_id
+    </select>
+
     <select id="findUserSendInfoByUids" resultType="map" parameterType="map">
         select a.create_hospital_id, a.user_id, a.create_date, a.send_hospital, b.name as doctoer_name from (
             select distinct(a.create_hospital_id), a.user_id, DATE_FORMAT(a.create_date, '%Y-%m-%d') as create_date, d.name as send_hospital, a.create_user_id
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 b822107..030c487 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
@@ -2196,8 +2196,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
                     if(MapUtils.isNotEmpty(tempMap)) {
                         /** 方法/使用人数id */
-                        List<String> sendUserIds = couponMapper.findSendUserIds(param);
-                        List<String> usedUserIds = couponMapper.findUsedUserIds(param);
+                        List<String> sendUserIds = couponMapper.findSendUserIds2(param);
+                        List<String> usedUserIds = couponMapper.findUsedUserIds2(param);
                         tempMap.put("sendUserIds", sendUserIds);
                         tempMap.put("usedUserIds", usedUserIds);
                         couponReport.add(tempMap);
@@ -2207,7 +2207,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
 
             if(CollectionUtils.isNotEmpty(couponReport)) {
                 param.put("status", 2);
-                List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
+//                List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo(param); /** 优惠券使用详情 */
+                List<Map<String, Object>> couponUsedTypeInfo = couponMapper.findUsedInfo2(param); /** 优惠券使用详情 */
                 for (Map<String, Object> m : couponReport) {
                     for (Map<String, Object> info : couponUsedTypeInfo) {
                         if(m.get("hospitalId").toString().equals(info.get("used_hospital_id"))) {
@@ -2251,11 +2252,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             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);
                 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);
+//                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfo(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
+                List<Map<String, Object>> mulitPatienInfo = couponMapper.findMulitPatienInfoWithSend(param);   /** 查询需要添加人数的总数,  例如A发了两次优惠券 那么这里返回需要加的值为1 */
                 for (Map<String, Object> m : mulitPatienInfo) {
                     Long count = (Long) m.get("count");
                     sendUserIds2.add((String) m.get("user_id"));
-- 
1.8.3.1