From af851a31fa077b9ad5e4efbac15e4d8eb8259695 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 18:58:24 +0800
Subject: [PATCH] 1.修改产品列表排除内置产品信息 2.修改计算分配额不符的bug
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
index 3abf32a..ba2c004 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
+++ b/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);
+
/**
* 统计获取数据量
@@ -68,7 +76,7 @@
/**
* 按指定类型统计合同数量
* @param params
- * datatype 1 按年
+ * datatype 1 按年
* 2 按月
* 3 按天
* 4 按周
@@ -76,5 +84,21 @@
* endTime 结束时间
* @return
*/
- OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
+ List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params);
+
+ /**
+ * 统计产品的使用数量
+ * @return ccount 是数量
+ * units 是产品名称
+ */
+ List<OrderChartVo> proCountChart();
+
+ /**
+ *获取该科室下的所有的套餐信息
+ *获取该科室下的所有的套餐信息
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ List<ProductOrderDetail> departmentProductDetail(Page<ProductOrderDetail> page,@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);
}
--
Gitblit v1.8.0