From 1e228c1191996a8e704cf36dc8042b1c6ca81ef1 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 04 Nov 2020 10:59:05 +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/mapper/ProductOrderDetailMapper.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/mapper/ProductOrderDetailMapper.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java
index 3abf32a..6408ac2 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
@@ -5,6 +5,7 @@
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.vo.GroupProductDetail;
import com.kidgrow.oprationcenter.vo.OrderChartVo;
+import com.kidgrow.oprationcenter.vo.ProductEndVo;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
import org.apache.ibatis.annotations.Param;
@@ -53,6 +54,14 @@
* @return
*/
int getEnabledCount(Long departmentId);
+ /**
+ * 获取一个科室所有的有效套餐
+ * @param departmentId
+ * hospitalId
+ * @return
+ */
+ int getUserdProduct(@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);
+
/**
* 统计获取数据量
@@ -68,7 +77,7 @@
/**
* 按指定类型统计合同数量
* @param params
- * datatype 1 按年
+ * datatype 1 按年
* 2 按月
* 3 按天
* 4 按周
@@ -76,5 +85,29 @@
* 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 monthPar 月条件
+ * @param aiCountPar 读片量条件
+ * @return
+ */
+ List<ProductEndVo>productEndList(Page<ProductEndVo> page,@Param("monthPar") int monthPar,@Param("aiCountPar") int aiCountPar);
+
+ /**
+ *获取该科室下的所有的套餐信息
+ *获取该科室下的所有的套餐信息
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ List<ProductOrderDetail> departmentProductDetail(Page<ProductOrderDetail> page,@Param("hospitalId") Long hospitalId,@Param("departmentId") Long departmentId);
}
--
Gitblit v1.8.0