From 1c2c8aa1910866733854e62b0ee4bc637af141d0 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 14 Oct 2020 14:50:50 +0800
Subject: [PATCH] 修改扣费流程中业务状态部分遗漏问题

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
index 9d04b18..6bf6987 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -68,8 +68,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 +119,25 @@
      *    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);
+    /**
+     * 获取一个科室所有的有效套餐
+     * @param departmentId
+     * hospitalId
+     * @return
+     */
+    int getUserdProduct(@Param("hospitalId") Long hospitalId, @Param("departmentId") Long departmentId);
 }
 

--
Gitblit v1.8.0