From 768d8e27a804bba85a1dd8a262124dd9b60e655e Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Wed, 7 Jun 2017 10:29:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20null=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/CouponMapper.xml | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 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 88261ae..afcfdf4 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -235,16 +235,13 @@
 
     <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, hospital_coupon_template_group e, coupon_template_group f
-        where a.id = b.used_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id and e.coupon_template_group_id = f.id and e.hospital_id = 1000000095
+        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 d.type in
         <foreach collection="couponType" open="(" close=")" separator="," item="type">
             #{type}
         </foreach>
-        <if test="tempId != null and tempId != ''">
-            and f.id = #{tempId}
-        </if>
         <if test="startDate != null">
             and b.use_date >= #{startDate}
         </if>
@@ -255,16 +252,13 @@
 
     <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, hospital_coupon_template_group e, coupon_template_group f
-        where a.id = b.create_hospital_id and b.coupon_template_id = c.id and c.type_id = d.id and e.coupon_template_group_id = f.id and e.hospital_id = 1000000095
+        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="tempId != null and tempId != ''">
-            and f.id = #{tempId}
-        </if>
         <if test="startDate != null">
             and b.create_date >= #{startDate}
         </if>
@@ -345,18 +339,22 @@
     </select>
 
     <select id="doHospitalFilter" parameterType="map" resultType="string">
-        select id from organization where id in
+        select a.id from organization a, hospital_coupon_template_group b
+        where a.id in
         <foreach collection="hospitalId" open="(" close=")" separator="," item="hid">
             #{hid}
         </foreach>
         <if test="provinceId != null and provinceId != ''">
-            and province_id = #{provinceId}
+            and a.province_id = #{provinceId}
         </if>
         <if test="cityId != null and cityId != '' ">
-            and city_id = #{cityId}
+            and a.city_id = #{cityId}
         </if>
         <if test="areaId != null and areaId != ''">
-            and area_id = #{areaId}
+            and a.area_id = #{areaId}
+        </if>
+        <if test="tempId != null and tempId != ''">
+            and ab.coupon_template_group_id = #{tempId}
         </if>
     </select>
 
-- 
1.8.3.1