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 b47ff09..2573d24 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 @@ -150,4 +150,6 @@ public interface CouponMapper { List> couponInfo2(Map param); int findCouponInfoCount2(Map param); + + Map findHospitalAllused(Map param); } 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 e523a5b..4b82700 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -967,4 +967,22 @@ from organization where yn = 1 + + + + + \ 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 4933480..fa09105 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 @@ -2459,10 +2459,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService param.put("hid", hid); Map usedInfo = couponMapper.findHospitalUsedInfo2(param); Map sendInfo = couponMapper.findHospitalSendInfo2(param); + Map allusedInfo = couponMapper.findHospitalAllused(param); Map tempMap = packCouponMap(sendInfo, usedInfo, hNameMap, hid, xAxis, param); if(MapUtils.isNotEmpty(tempMap)) { + tempMap.put("allUserdCount",(allusedInfo == null || allusedInfo.get("allUserdCount") == null) ? 0 : allusedInfo.get("allUserdCount")); + /** 方法/使用人数id */ List sendUserIds = couponMapper.findSendUserIds2(param); List usedUserIds = couponMapper.findUsedUserIds2(param);