From 171f5567cecda191f6b32e6c303c2bea9cd266f0 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Tue, 01 Sep 2020 19:47:37 +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 | 13 +++++++++++--
1 files changed, 11 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 6b38cef..10d516e 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
@@ -76,12 +76,21 @@
* endTime 结束时间
* @return
*/
- OrderChartVo productOrderChart(@Param("p") Map<String, Object> params);
+ List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params);
/**
* 统计产品的使用数量
* @return ccount 是数量
* units 是产品名称
*/
- OrderChartVo proCountChart();
+ 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