From 3acf3d5ee9435576276453ad0fbe0d8f202f10e4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 19:33:52 +0800
Subject: [PATCH] 修改查询到期的接口
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 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 be42aac..87c7ed7 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
@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
@@ -13,8 +14,10 @@
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
+import com.kidgrow.oprationcenter.model.SysProduct;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
+import com.kidgrow.oprationcenter.service.ISysProductService;
import com.kidgrow.oprationcenter.vo.*;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.feign.SysDoctorService;
@@ -52,6 +55,8 @@
@Autowired
private IProductOrderService iProductOrderService;
@Autowired
+ private ISysProductService productService;
+ @Autowired
private RedisUtils redisUtils;
/**
* 列表
@@ -62,6 +67,15 @@
public PageResult<ProductOrderDetail> findList(Map<String, Object> params){
Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<ProductOrderDetail> list = baseMapper.findList(page, params);
+ for (ProductOrderDetail productOrderDetail : list) {
+ if(productOrderDetail.getOrderAilightCount()==null){
+ SysProduct byId = productService.getById(productOrderDetail.getProId());
+ if(byId!=null){
+ productOrderDetail.setOrderAilightCount(byId.getAilightCount());
+ productOrderDetail.setOrderRecordCount(byId.getRecordCount());
+ }
+ }
+ }
return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
/**
@@ -81,10 +95,11 @@
* @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
+ @Override
+ public ResultBody<UserProductData> userProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
{
UserProductData userProductData=new UserProductData();
- userProductData.setEnd(true);
+ userProductData.setIsEnd(true);
userProductData.setRecordCount(0);
userProductData.setAilightCount(0);
userProductData.setLimitDays(0);
@@ -94,7 +109,7 @@
userProductDetail.getProductOrderJoinDetailListShare().addAll(userProductDetail.getProductOrderJoinDetailsListDep());
List<ProductOrderJoinDetail> productOrderJoinDetailList = userProductDetail.getProductOrderJoinDetailListShare();
if (productOrderJoinDetailList.size() > 0) {
- userProductData.setEnd(false);
+ userProductData.setIsEnd(false);
//合并后按id排序并筛除已用完的套餐
List<ProductOrderJoinDetail> productOrderJoinDetailsNewList = productOrderJoinDetailList.stream().filter(f -> f.getAilightCount() >= 0).sorted(Comparator.comparing(ProductOrderJoinDetail::getProEndtime)).collect(Collectors.toList());
for (int i = 0; i <productOrderJoinDetailsNewList.size(); i++) {
@@ -117,7 +132,7 @@
}
}
//是否已经结束
- if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ if (userProductData.getIsEnd()&& StringUtils.isNotBlank(diagnosticId)) {
//写入redis中,防止扣非后不能生成报告
redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
}
@@ -200,6 +215,10 @@
public List<OrderChartVo> proCountChart() {
return baseMapper.proCountChart();
}
+ @Override
+ public int getUserdProduct(Long hospitalId, Long departmentId) {
+ return baseMapper.getUserdProduct(hospitalId,departmentId);
+ }
/**
*获取该科室下的所有的套餐信息
* @param params
@@ -211,6 +230,14 @@
List<ProductOrderDetail> list =
baseMapper.departmentProductDetail(page, Long.parseLong(params.get("hospitalId").toString()),Long.parseLong(params.get("departmentId").toString()));
return PageResult.<ProductOrderDetail>builder().data(list).code(0).count(page.getTotal()).build();
+ }
+
+ @Override
+ public PageResult<ProductEndVo> productEndList(Map<String, Object> params) {
+ Page<ProductEndVo> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ List<ProductEndVo> list =
+ baseMapper.productEndList(page,MapUtils.getIntValue(params,"monthPar"),MapUtils.getIntValue(params,"aiCountPar"));
+ return PageResult.<ProductEndVo>builder().data(list).code(0).count(page.getTotal()).build();
}
/**
@@ -235,7 +262,6 @@
List<GroupProductDetail> list = baseMapper.groupProductDetail(page,params);
return PageResult.<GroupProductDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
-
/**
* 根据ProductOrderDetail对象当做查询条件进行查询
* @param productOrderDetail
@@ -322,15 +348,25 @@
{
//查询当前医院正在使用的套餐
Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("hospitalId", hospitalId);
- List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
- if (productOrderDetailList.size() > 0) {
- UserProductDetail userProductDetail=new UserProductDetail();
- //包含共享的数据
- userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList()));
- //科室私有的数据
- userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList()));
- return userProductDetail;
+ selectMap.put("hospital_id", hospitalId);
+ selectMap.put("is_del",0);
+ selectMap.put("enabled",1);
+ List<ProductOrder> productOrders = iProductOrderService.listByMap(selectMap);
+ if(productOrders!=null&&productOrders.size()>0){
+// List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("is_del",0);
+ queryWrapper.eq("enabled",1);
+ queryWrapper.in("order_id",productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList()));
+ List<ProductOrderJoinDetail> productOrderDetailList = this.baseMapper.selectList(queryWrapper);
+ if (productOrderDetailList.size() > 0) {
+ UserProductDetail userProductDetail=new UserProductDetail();
+ //包含共享的数据
+ userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).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