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 | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 e2e8920..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
@@ -2,10 +2,13 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
+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;
@@ -25,12 +28,13 @@
* @return
*/
PageResult<ProductOrderDetail> findList(Map<String, Object> params);
+
/**
- * 列表
+ * 诊断列表
* @param params
* @return
*/
- PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params);
+ PageResult<DiagnosisRecord> findAllDataList(Map<String, Object> params);
/**
* 统计产品使用量列表
* @param params
@@ -51,12 +55,21 @@
*/
ResultBody updateEnabled(Map<String, Object> params);
+ ResultBody getTypeByUser(SysUser sysUser);
/**
- * 批量写入数据
- * @param list
+ * 获取所有的套餐记录数据
+ * @param params
* @return
*/
- int batchInsert(List<ProductOrderDetail> list);
+ 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