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)); }