From 472a7ccd8044230064c5f698e740a9c35e5236af Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Mon, 30 Oct 2017 17:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mainOrm/master/CouponMapper.xml                | 4 ++--
 .../com/lyms/platform/operate/web/controller/ReportController.java    | 2 +-
 2 files changed, 3 insertions(+), 3 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 ec9673f..0e08fb5 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -635,7 +635,7 @@
     </select>
 
     <select id="findUnUsedPeopleInfo" parameterType="map" resultType="string">
-        select user_id from coupon_info a, organization b
+        select distinct(user_id) from coupon_info a, organization b
         where a.create_hospital_id = b.id and a.status = 1 and a.create_hospital_id = #{hospitalId}
         and user_id in
         <foreach collection="userIds" open="(" close=")" separator="," item="uid">
@@ -657,7 +657,7 @@
 
     <select id="findUnUsedPeopleInfoCount" resultType="integer">
         select count(1) from (
-            select user_id from coupon_info a, organization b
+            select distinct(user_id) from coupon_info a, organization b
             where a.create_hospital_id = b.id and a.status = 1 and a.create_hospital_id = #{hospitalId}
             and user_id in
             <foreach collection="userIds" open="(" close=")" separator="," item="uid">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
index caf0aeb..9c4ae60 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
@@ -77,7 +77,7 @@ public class ReportController extends BaseController {
     @ResponseBody
     @TokenRequired
     public void unUsedExport(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, HttpServletRequest request, HttpServletResponse response) {
-        reportService.unSendExport(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request), response);
+        reportService.unUsedExport(startDate, endDate, provinceId, cityId, areaId, hospitalId, getUserId(request), response);
     }
 
     /**
-- 
1.8.3.1