From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java |   80 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 4 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 da6a375..57353ef 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
@@ -5,10 +5,7 @@
 import com.kidgrow.common.model.SysUser;
 import com.kidgrow.common.service.ISuperService;
 import com.kidgrow.oprationcenter.model.ProductOrderDetail;
-import com.kidgrow.oprationcenter.vo.DiagnosisRecord;
-import com.kidgrow.oprationcenter.vo.GroupProductDetail;
-import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
-import com.kidgrow.oprationcenter.vo.UserProductDetail;
+import com.kidgrow.oprationcenter.vo.*;
 
 import java.util.List;
 import java.util.Map;
@@ -70,6 +67,81 @@
      */
     UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
 
+    /**
+     *
+     * @param hospitalId
+     * @param departmentId
+     * @return
+     */
     ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
+
+    /**
+     * 获取医院的到期时间
+     * @param hospitalId
+     * @param departmentId
+     * @param diagnosticId
+     * @return
+     */
+    ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
+
+    /**
+     * 试用审核的列表
+     * @param params
+     * @return
+     */
+    PageResult all(Map<String, Object> params);
+
+    /**
+     * 获取一个科室使用过多少个试用套餐
+     * @param departmentId
+     * @return
+     */
+    int getEnabledCount(Long departmentId);
+    /**
+     * 统计获取数据量
+     * @param datatype
+     * 0 试用审核量
+     * 1 套餐总量
+     * 2 未处理用户反馈
+     * 3 未处理数据需求
+     * @return
+     */
+    int oprationChart(int datatype);
+    /**
+     * 按指定类型统计合同数量
+     * @param params
+     *    datatype      1 按年
+     *                 2 按月
+     *                 3 按天
+     *                 4 按周
+     *    beginTime 查询时间段的开始时间
+     *    endTime   结束时间
+     * @return
+     */
+    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);
 }
 

--
Gitblit v1.8.0