From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 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 8dd1665..a340b86 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,8 @@
 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 org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -71,6 +69,48 @@
     UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
 
     ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
-    ResultBody UserProductDetailData(Long hospitalId,Long departmentId);
+    ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId);
+
+    /**
+     * 试用审核的列表
+     * @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(@Param("p") Map<String, Object> params);
+    /**
+     * 统计产品的使用数量
+     * @return  ccount 是数量
+     *          units 是产品名称
+     */
+    List<OrderChartVo> proCountChart();
 }
 

--
Gitblit v1.8.0