From a04d76dc568b4a13455ea6ca4ae2a92e6387736d Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 25 Nov 2020 16:36:14 +0800
Subject: [PATCH] Merge branch 'development' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 7952d1d..1276644 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
@@ -67,12 +67,19 @@
*/
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);
@@ -124,5 +131,18 @@
* @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