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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 c3d4ead..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
@@ -158,7 +158,7 @@
* @return
*/
@Override
- public OrderChartVo productOrderChart(Map<String, Object> params) {
+ public List<OrderChartVo> productOrderChart(Map<String, Object> params) {
return baseMapper.productOrderChart(params);
}
/**
@@ -167,7 +167,7 @@
* units 是产品名称
*/
@Override
- public OrderChartVo proCountChart() {
+ public List<OrderChartVo> proCountChart() {
return baseMapper.proCountChart();
}
@@ -287,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