diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 2573d24..89c6f42 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -152,4 +152,6 @@ public interface CouponMapper { int findCouponInfoCount2(Map param); Map findHospitalAllused(Map param); + + Map findHospitalCsAllused(Map queryParam); } 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 4ae74c9..d910596 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -984,4 +984,21 @@ + + + + \ No newline at end of file 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 3e36567..f9a1c26 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 @@ -2490,11 +2490,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Map usedInfo = couponMapper.findHospitalUsedInfo2(queryParam); Map sendInfo = couponMapper.findHospitalSendInfo2(queryParam); Map allusedInfo = couponMapper.findHospitalAllused(queryParam); + Map allusedCsInfo = couponMapper.findHospitalCsAllused(queryParam); Map tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, queryParam); if(MapUtils.isNotEmpty(tempMap)) { tempMap.put("allUserdCount",(allusedInfo == null || allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount")); + tempMap.put("allUserdCsCount",(allusedCsInfo == null || allusedCsInfo.get("allUserdCsCount") == null) ? 0 : allusedCsInfo.get("allUserdCsCount")); /** 方法/使用人数id */ List sendUserIds = couponMapper.findSendUserIds2(queryParam);