Merge remote-tracking branch 'origin/pay_master' into pay_master

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java

@@ -53,6 +53,14 @@
     * @return
     */
    int getEnabledCount(Long departmentId);
    /**
     * 获取一个科室所有的有效套餐
     * @param departmentId
     * hospitalId
     * @return
     */
    int getUserdProduct(@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);


    /**
     * 统计获取数据量
@@ -76,12 +84,21 @@
     *    endTime   结束时间
     * @return
     */
    OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
    List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params);

    /**
     * 统计产品的使用数量
     * @return  ccount 是数量
     *          units 是产品名称
     */
    OrderChartVo proCountChart();
    List<OrderChartVo> proCountChart();

    /**
     *获取该科室下的所有的套餐信息
     *获取该科室下的所有的套餐信息
     * @param hospitalId
     * @param departmentId
     * @return
     */
    List<ProductOrderDetail> departmentProductDetail(Page<ProductOrderDetail> page,@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);
}