From 39c659f18325999523152592f8dd6806cc5ecd87 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 9 Nov 2017 09:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=91=E6=94=BE=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E5=8C=BB=E7=94=9F=E4=B8=BA=E7=A9=BA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 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 bc77db2..abaf830 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -665,7 +665,21 @@
 
 
     <select id="findUserSendInfoByUids" resultType="map" parameterType="map">
-        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, e.name as doctoer_name
+        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
+        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.create_hospital_id in
+        <foreach collection="hid" open="(" close=")" separator="," item="hid">
+            #{hid}
+        </foreach>
+        and a.user_id in
+        <foreach collection="uids" open="(" close=")" separator="," item="uid">
+            #{uid}
+        </foreach>
+        ) a left join users b on a.create_user_id = b.id
+
+       <!-- 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, e.name as doctoer_name
         from coupon_info a, coupon_template b, coupon_type c, organization d, users e
         where a.coupon_template_id = b.id and b.type_id = c.id and a.create_hospital_id = d.id and a.create_user_id = e.id
         and a.create_hospital_id in
@@ -675,6 +689,6 @@
         and a.user_id in
         <foreach collection="uids" open="(" close=")" separator="," item="uid">
             #{uid}
-        </foreach>
+        </foreach>-->
     </select>
 </mapper>
\ No newline at end of file
-- 
1.8.3.1