From ce94556c9f164024c5496fd73d8d00e6b9fafe58 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 2 Nov 2020 16:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/CouponMapper.xml | 215 ++++++++++++++++++++-
 .../web/facade/DischargeAbstractFacade.java        |   4 +-
 2 files changed, 207 insertions(+), 12 deletions(-)

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 42a3031..8539e2a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -335,7 +335,22 @@
     </select>
 
     <select id="findUsedUserIds" parameterType="map" resultType="string">
-        select distinct(b.user_id)
+        select distinct( user_id) from (select c.id from coupon_template  c INNER JOIN (select id from coupon_type d  where d.type in
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        ) t on c.type_id = t.id) m INNER JOIN
+        ( select coupon_template_id,status,use_date,user_id,used_hospital_id from coupon_info where used_hospital_id = #{hid}  and status = 2
+        <if test="startDate != null">
+            and b.use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and b.use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        )  a on m.id = a.coupon_template_id
+
+
+        <!--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}
@@ -349,11 +364,54 @@
         </if>
         <if test="endDate != null">
             and b.use_date <![CDATA[ < ]]> #{endDate}
-        </if>
+        </if>-->
     </select>
 
     <select id="findUsedUserIds2" parameterType="map" resultType="string">
-        select distinct(b.user_id)
+
+        SELECT
+        distinct( user_id)
+        FROM
+        (
+        SELECT
+        c.id
+        FROM
+        coupon_template c
+        INNER JOIN (
+        SELECT
+        id
+        FROM
+        coupon_type d
+        WHERE
+        d.type IN
+        (
+        '1'
+        ,
+        '2'
+        )
+        ) t ON c.type_id = t.id
+        ) m
+        INNER JOIN (
+        SELECT
+        coupon_template_id,
+        user_id,
+        used_hospital_id,
+        create_date
+        FROM
+        coupon_info
+        WHERE
+        used_hospital_id = #{hid}
+        and status = 2
+        <if test="startDate != null">
+            and  use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and  use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        ) a ON m.id = a.coupon_template_id
+
+
+        <!-- select distinct(b.user_id)
         from organization a, (select * from coupon_info where used_hospital_id = #{hid}) 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
@@ -368,7 +426,7 @@
         </if>
         <if test="endDate != null">
             and b.use_date <![CDATA[ < ]]> #{endDate}
-        </if>
+        </if>-->
     </select>
 
     <select id="findHospitalUsedInfo" parameterType="map" resultType="map">
@@ -391,7 +449,55 @@
     </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,
+        SELECT
+        o.id,
+        count(DISTINCT(user_id)) AS user_used_count,
+        count(1) AS coupon_used_count,
+        o.area_id,
+        o.city_id,
+        o.province_id
+        FROM
+        (
+        SELECT
+        c.id
+        FROM
+        coupon_template c
+        INNER JOIN (
+        SELECT
+        id
+        FROM
+        coupon_type d
+        WHERE
+        d.type IN
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        ) t ON c.type_id = t.id
+        ) m
+        INNER JOIN (
+        SELECT
+        coupon_template_id,
+        STATUS,
+        use_date,
+        user_id,
+        used_hospital_id
+        FROM
+        coupon_info
+        WHERE
+        used_hospital_id = #{hid}
+        AND STATUS = 2
+        <if test="startDate != null">
+            and use_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and use_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        ) a ON m.id = a.coupon_template_id
+        INNER JOIN organization o ON a.used_hospital_id = o.id
+
+
+
+        <!--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, (select * from coupon_info where used_hospital_id = #{hid}) b, coupon_template c,
         coupon_type d
@@ -407,7 +513,7 @@
         </if>
         <if test="endDate != null">
             and b.use_date <![CDATA[ < ]]> #{endDate}
-        </if>
+        </if> -->
     </select>
 
     <select id="findSendUserIds" parameterType="map" resultType="string">
@@ -428,7 +534,47 @@
     </select>
 
     <select id="findSendUserIds2" parameterType="map" resultType="string">
-        select distinct(b.user_id)
+        SELECT
+        distinct( user_id)
+        FROM
+        (
+        SELECT
+        c.id
+        FROM
+        coupon_template c
+        INNER JOIN (
+        SELECT
+        id
+        FROM
+        coupon_type d
+        WHERE
+        d.type IN
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        ) t ON c.type_id = t.id
+        ) m
+        INNER JOIN (
+        SELECT
+        coupon_template_id,
+        user_id,
+        used_hospital_id,
+        create_date
+        FROM
+        coupon_info
+        WHERE
+        create_hospital_id = #{hid}
+        <if test="startDate != null">
+            and  create_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and  create_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        ) a ON m.id = a.coupon_template_id
+
+
+
+        <!-- select distinct(b.user_id)
         from organization a, (select * from coupon_info where create_hospital_id = #{hid}) 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
@@ -442,7 +588,7 @@
         </if>
         <if test="endDate != null">
             and b.create_date <![CDATA[ < ]]> #{endDate}
-        </if>
+        </if>-->
     </select>
 
     <select id="findHospitalSendInfo" parameterType="map" resultType="map">
@@ -465,7 +611,56 @@
     </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,
+
+        SELECT
+        o.id,
+        count(distinct(user_id)) as people_send_count,
+        count(1) as coupon_send_count,
+        o.area_id,
+        o.city_id,
+        o.province_id
+        FROM
+        (
+        SELECT
+        c.id
+        FROM
+        coupon_template c
+        INNER JOIN (
+        SELECT
+        id
+        FROM
+        coupon_type d
+        WHERE
+        d.type IN
+        <foreach collection="couponType" open="(" close=")" separator="," item="type">
+            #{type}
+        </foreach>
+        ) t ON c.type_id = t.id
+        ) m
+        INNER JOIN (
+        SELECT
+        coupon_template_id,
+        STATUS,
+        use_date,
+        user_id,
+        used_hospital_id,
+        create_hospital_id
+        FROM
+        coupon_info
+        WHERE
+        create_hospital_id = #{hid}
+        <if test="startDate != null">
+            and  create_date >= #{startDate}
+        </if>
+        <if test="endDate != null">
+            and  create_date <![CDATA[ < ]]> #{endDate}
+        </if>
+        ) a ON m.id = a.coupon_template_id
+        INNER JOIN organization o ON a.create_hospital_id = o.id
+
+
+
+        <!--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, (select * from coupon_info where create_hospital_id = #{hid}) b, coupon_template c,
         coupon_type d
@@ -480,7 +675,7 @@
         </if>
         <if test="endDate != null">
             and b.create_date <![CDATA[ < ]]> #{endDate}
-        </if>
+        </if>-->
     </select>
 
     <select id="findHospitalNameById" parameterType="string" resultType="string">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 739f8b0..87f7e2d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -404,8 +404,8 @@ public class DischargeAbstractFacade extends BaseServiceImpl {
 //        Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
 //        Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").is(hospitalId);
-        Criteria pCriteria = Criteria.where("yn").is("1");
+        Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").is(hospitalId);
+        Criteria pCriteria = Criteria.where("yn").is(1);
         boolean flag = false;
         if (StringUtils.isNotEmpty(queryNo)) {
             pCriteria.orOperator(Criteria.where("cardNo").regex(queryNo),
-- 
1.8.3.1