From ac8623cb19965acc0f8fb021257ceaf5d0000b82 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 18:05:59 +0800
Subject: [PATCH] 修改H端添加医生的时候,医生职称数据出错的问题
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 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 853e235..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
@@ -9,7 +9,6 @@
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
-import com.kidgrow.oprationcenter.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
@@ -76,7 +75,7 @@
* @param departmentId
* @return
*/
- public ResultBody UserProductDetailData(Long hospitalId,Long departmentId)
+ public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
{
UserProductData userProductData=new UserProductData();
userProductData.setEnd(true);
@@ -95,6 +94,11 @@
return ResultBody.ok().data(userProductData);
}
+ /**
+ * 获取需要审核的套餐
+ * @param params
+ * @return
+ */
@Override
public PageResult all(Map<String, Object> params) {
Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
@@ -117,6 +121,54 @@
}
}
return PageResult.<ProductOrderDetailVo>builder().data(volist).code(0).count(page.getTotal()).build();
+ }
+
+ /**
+ * 获取科室试用次数
+ * @param departmentId 科室ID
+ * @return
+ */
+ @Override
+ public int getEnabledCount(Long departmentId) {
+ int counts=baseMapper.getEnabledCount(departmentId);
+ return counts;
+ }
+ /**
+ * 统计获取数据量
+ * @param datatype
+ * 0 试用审核量
+ * 1 套餐总量
+ * 2 未处理用户反馈
+ * 3 未处理数据需求
+ * @return
+ */
+ @Override
+ 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();
}
/**
@@ -235,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