From 8c00ca50403c5085a1881338a33a0246a7a18e59 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 7 Nov 2017 15:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/service/impl/ReportServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 01b183d..f771153 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
@@ -813,8 +813,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             }
         }
         Criteria c = new Criteria();
-        c.and("hospitalId").in(hospitalIds).and("isSendCoupon").is(isSendCoupon)
+        c.and("hospitalId").in(hospitalIds)
                 .and("yn").ne(0).and("enable").ne("2").and("buildType").ne(1);
+
+        if(isSendCoupon == null) {
+            c.orOperator(Criteria.where("isSendCoupon").is(null), Criteria.where("isSendCoupon").is(false));
+        } else {
+            c.and("isSendCoupon").is(isSendCoupon);
+        }
+
         if(startDate != null && endDate != null) {
             c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
-- 
1.8.3.1