From abba1aff81da3cc9d74d75f64cbd48d25716aec3 Mon Sep 17 00:00:00 2001 From: luliqiang <kidgrow> Date: Fri, 12 Mar 2021 19:19:10 +0800 Subject: [PATCH] 1、增加对于套餐中的剩余读片量、有效开始日期、结束日期的加密 2、增加扣费过程中对于剩余读片量的加密 3、为下载私有云数据库增加合同与明细的查询Feign接口 4、修改合作商数据库(影像版API)的合同与明细的查询bug --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 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 a340b86..5c86d6e 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 @@ -6,7 +6,6 @@ import com.kidgrow.common.service.ISuperService; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.vo.*; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -68,8 +67,22 @@ */ UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId); + /** + * + * @param hospitalId + * @param departmentId + * @return + */ ResultBody biUserNowProduct(Long hospitalId,Long departmentId); - ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId); + + /** + * 获取医院的到期时间 + * @param hospitalId + * @param departmentId + * @param diagnosticId + * @return + */ + ResultBody<UserProductData> userProductDetailData(Long hospitalId, Long departmentId,String diagnosticId); /** * 试用审核的列表 @@ -105,12 +118,39 @@ * endTime 结束时间 * @return */ - List<OrderChartVo> productOrderChart(@Param("p") Map<String, Object> params); + List<OrderChartVo> productOrderChart(Map<String, Object> params); /** * 统计产品的使用数量 * @return ccount 是数量 * units 是产品名称 */ List<OrderChartVo> proCountChart(); + /** + *获取该科室下的所有的套餐信息 + * @param params + * @return + */ + PageResult<ProductOrderDetailVo> departmentProductDetail(Map<String, Object> params); + /** + * 获取最近即将到期的套餐 + * @return + */ + PageResult<ProductEndVo>productEndList(Map<String, Object> params); + /** + * 获取一个科室所有的有效套餐 + * @param departmentId + * hospitalId + * @return + */ + int getUserdProduct(Long hospitalId,Long departmentId); + + /** + * 私有云套餐验证 + * @param hospitalId 医院ID + * @param departmentId 科室ID + * @return com.kidgrow.common.model.ResultBody + */ + ResultBody verificateProductOrderDetail(Long hospitalId, Long departmentId ); + } -- Gitblit v1.8.0