Commit 8c00ca50403c5085a1881338a33a0246a7a18e59
1 parent
95c023647c
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 8 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
8c00ca5
| ... | ... | @@ -813,8 +813,15 @@ |
| 813 | 813 | } |
| 814 | 814 | } |
| 815 | 815 | Criteria c = new Criteria(); |
| 816 | - c.and("hospitalId").in(hospitalIds).and("isSendCoupon").is(isSendCoupon) | |
| 816 | + c.and("hospitalId").in(hospitalIds) | |
| 817 | 817 | .and("yn").ne(0).and("enable").ne("2").and("buildType").ne(1); |
| 818 | + | |
| 819 | + if(isSendCoupon == null) { | |
| 820 | + c.orOperator(Criteria.where("isSendCoupon").is(null), Criteria.where("isSendCoupon").is(false)); | |
| 821 | + } else { | |
| 822 | + c.and("isSendCoupon").is(isSendCoupon); | |
| 823 | + } | |
| 824 | + | |
| 818 | 825 | if(startDate != null && endDate != null) { |
| 819 | 826 | c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); |
| 820 | 827 | } |