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 b7c967d..89c40ed 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -585,7 +585,7 @@ select count(1) from ( select a.user_id, b.coupon_order, c.type from coupon_info a, coupon_template b, coupon_type c - where a.coupon_template_id = b.id and b.type_id = c.id and a.status = 1 + where a.coupon_template_id = b.id and b.type_id = c.id and a.status = 1 and a.create_hospital_id = #{hospitalId} and a.user_id in #{uid} 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 aed1988..36b2a4f 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 @@ -512,7 +512,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Map hospitalPatientCount = new HashMap<>(); if(CollectionUtils.isNotEmpty(hospitalIds)) { - List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, false); + List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, null); for (Patients patient : patients) { if(hospitalPatientCount.containsKey(patient.getHospitalId())) { hospitalPatientCount.put(patient.getHospitalId(), hospitalPatientCount.get(patient.getHospitalId()) + 1); @@ -578,7 +578,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService for (Patients patient : patients) { userIds.add(patient.getPid()); } - List> list = couponMapper.findUnUsedInfo(CollectionUtils.createMap("userIds", userIds, "page", (page - 1) * limit, "limit", limit)); + List> list = couponMapper.findUnUsedInfo(CollectionUtils.createMap("hospitalId", hospitalId, "userIds", userIds, "page", (page - 1) * limit, "limit", limit)); List> restList = new ArrayList<>(); for (Map map : list) { map.put("couponName", (couponReportMap.get(map.get("type") + "_" + map.get("coupon_order"))).toString() @@ -764,7 +764,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService List hospitalIds = getHospitalIds(userId, hospitalId); List> datas = couponMapper.findHospitalInfoByIds(hospitalIds); if(CollectionUtils.isNotEmpty(hospitalIds)) { - List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, false); + List patients = getPatients(hospitalIds, datas, startDate, endDate, provinceId, cityId, areaId, null); List> restList = new ArrayList<>(); List pageRows = CollectionUtils.getPageIds(patients, page, limit); for (Patients patient : pageRows) { @@ -789,7 +789,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } return RespBuilder.buildSuccess("hospitalIds为null"); } - private List getPatients(List hospitalIds, List> datas, Date startDate, Date endDate, String provinceId, String cityId, String areaId, boolean isSendCoupon) { + private List getPatients(List hospitalIds, List> datas, Date startDate, Date endDate, String provinceId, String cityId, String areaId, Object isSendCoupon) { Iterator iterator = hospitalIds.iterator(); while (iterator.hasNext()) { String id = iterator.next(); @@ -813,7 +813,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } } Criteria c = new Criteria(); - c.and("hospitalId").in(hospitalIds).and("isSendCoupon").ne(!isSendCoupon).and("yn").ne(0).and("enable").ne("2"); + c.and("hospitalId").in(hospitalIds).and("isSendCoupon").is(isSendCoupon).and("yn").ne(0).and("enable").ne("2"); if(startDate != null && endDate != null) { c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1)); }