From 31de20695ac5fc8562c5922fcbe8729ae4e146a1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 29 Jun 2020 14:20:39 +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 |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 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 fd8c1a7..da6a375 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
@@ -8,7 +8,9 @@
 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 java.util.List;
 import java.util.Map;
 
 /**
@@ -26,12 +28,6 @@
      * @return
      */
     PageResult<ProductOrderDetail> findList(Map<String, Object> params);
-    /**
-     * 列表
-     * @param params
-     * @return
-     */
-    PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser);
 
     /**
      * 诊断列表
@@ -58,5 +54,22 @@
      * @return
      */
     ResultBody updateEnabled(Map<String, Object> params);
+
+    ResultBody getTypeByUser(SysUser sysUser);
+    /**
+     * 获取所有的套餐记录数据
+     * @param params
+     * @return
+     */
+    List<ProductOrderJoinDetail> findAllList(Map<String, Object> params);
+    /**
+     * 获取医院的套餐数据
+     * @param hospitalId
+     * @param departmentId
+     * @return
+     */
+    UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
+
+    ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
 }
 

--
Gitblit v1.8.0