From f517d33dfd56950569cfc4e26ff88ba9ef57eb49 Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Sat, 15 Aug 2020 12:28:36 +0800 Subject: [PATCH] 修改 mq的配置 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java index 4eaa4e5..413a1fa 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java @@ -146,6 +146,30 @@ public int oprationChart(int datatype) { return baseMapper.oprationChart(datatype); } + /** + * 按指定类型统计合同数量 + * @param params + * datatype 1 按年 + * 2 按月 + * 3 按天 + * 4 按周 + * beginTime 查询时间段的开始时间 + * endTime 结束时间 + * @return + */ + @Override + public List<OrderChartVo> productOrderChart(Map<String, Object> params) { + return baseMapper.productOrderChart(params); + } + /** + * 统计产品的使用数量 + * @return ccount 是数量 + * units 是产品名称 + */ + @Override + public List<OrderChartVo> proCountChart() { + return baseMapper.proCountChart(); + } /** * 获取诊断列表 @@ -263,7 +287,7 @@ //包含共享的数据 userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList())); //科室私有的数据 - userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && f.getIsShare() == false)).collect(Collectors.toList())); + userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList())); return userProductDetail; } return null; -- Gitblit v1.8.0