From e50e03e296a2456836afbb7f6bee461ee7bddd05 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Thu, 22 Oct 2020 10:37:41 +0800 Subject: [PATCH] 修改因合并版本造成代码丢失的问题 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 97 insertions(+), 4 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 b86b43f..57353ef 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 @@ -5,9 +5,9 @@ import com.kidgrow.common.model.SysUser; import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.ProductOrderDetail; -import com.kidgrow.oprationcenter.vo.GroupProductDetail; -import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; +import com.kidgrow.oprationcenter.vo.*; +import java.util.List; import java.util.Map; /** @@ -25,12 +25,13 @@ * @return */ PageResult<ProductOrderDetail> findList(Map<String, Object> params); + /** - * 列表 + * 诊断列表 * @param params * @return */ - PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser); + PageResult<DiagnosisRecord> findAllDataList(Map<String, Object> params); /** * 统计产品使用量列表 * @param params @@ -50,5 +51,97 @@ * @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); + + /** + * + * @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); + + /** + * 试用审核的列表 + * @param params + * @return + */ + PageResult all(Map<String, Object> params); + + /** + * 获取一个科室使用过多少个试用套餐 + * @param departmentId + * @return + */ + int getEnabledCount(Long departmentId); + /** + * 统计获取数据量 + * @param datatype + * 0 试用审核量 + * 1 套餐总量 + * 2 未处理用户反馈 + * 3 未处理数据需求 + * @return + */ + int oprationChart(int datatype); + /** + * 按指定类型统计合同数量 + * @param params + * datatype 1 按年 + * 2 按月 + * 3 按天 + * 4 按周 + * beginTime 查询时间段的开始时间 + * endTime 结束时间 + * @return + */ + List<OrderChartVo> productOrderChart(Map<String, Object> params); + /** + * 统计产品的使用数量 + * @return ccount 是数量 + * units 是产品名称 + */ + List<OrderChartVo> proCountChart(); + /** + *获取该科室下的所有的套餐信息 + * @param params + * @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