修改因合并版本造成代码丢失的问题

houruijun

2020-10-22 e50e03e296a2456836afbb7f6bee461ee7bddd05

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java

@@ -6,7 +6,6 @@
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.vo.*;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;
@@ -68,8 +67,22 @@
     */
    UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);

    /**
     *
     * @param hospitalId
     * @param departmentId
     * @return
     */
    ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
    ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId);

    /**
     * 获取医院的到期时间
     * @param hospitalId
     * @param departmentId
     * @param diagnosticId
     * @return
     */
    ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);

    /**
     * 试用审核的列表
@@ -105,6 +118,30 @@
     *    endTime   结束时间
     * @return
     */
    OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
    List<OrderChartVo> productOrderChart(Map<String, Object> params);
    /**
     * 统计产品的使用数量
     * @return  ccount 是数量
     *          units 是产品名称
     */
    List<OrderChartVo> proCountChart();
    /**
     *获取该科室下的所有的套餐信息
     * @param params
     * @return
     */
    PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params);
    /**
     * 获取最近即将到期的套餐
     * @return
     */
    PageResult<ProductEndVo>productEndList(Map<String, Object> params);
   /**
     * 获取一个科室所有的有效套餐
     * @param departmentId
     * hospitalId
     * @return
     */
    int getUserdProduct(Long hospitalId,Long departmentId);
}