From 711c9567937a01288888269d14682f94048c447a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 23 Sep 2020 09:52:20 +0800
Subject: [PATCH] 添加字段，，去掉fegin客户端
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 19 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 413a1fa..df69cd0 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
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kidgrow.common.constant.ConsumptionConstant;
+import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
@@ -15,11 +16,13 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
+import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
@@ -48,6 +51,8 @@
private ConsumptionRecordMapper consumptionRecordMapper;
@Autowired
private IProductOrderService iProductOrderService;
+ @Autowired
+ private RedisUtils redisUtils;
/**
* 列表
* @param params
@@ -70,26 +75,52 @@
}
/**
- * 判定医院科室的套餐是否到期 以及到期时间
+ * 判定医院科室的套餐是否到期 以及剩余的读片量
* @param hospitalId
* @param departmentId
+ * @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
+ @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);
UserProductDetail userProductDetail = this.getUserProductDetail(hospitalId, departmentId);
if (userProductDetail != null) {
//合并集合
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).reversed()).collect(Collectors.toList());
- userProductData.setMaxEndTime(productOrderJoinDetailsNewList.get(0).getProEndtime());
+ 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++) {
+ userProductData.setAilightCount(productOrderJoinDetailsNewList.get(i).getAilightCount());
+ userProductData.setRecordCount(productOrderJoinDetailsNewList.get(i).getRecordCount());
+ Double days=DateUtils.getDays(new Date(),productOrderJoinDetailsNewList.get(i).getProEndtime());
+ if (i<productOrderJoinDetailsNewList.size()-1) {
+ //按照结束日期正序排序后,如果第二条的开始时间减去第一条的结束时间 差值大于0 说明套餐间有中断 则以当前这条套餐作为当前套餐的剩余天数
+ Double daysTemp=DateUtils.getDays(productOrderJoinDetailsNewList.get(i).getProEndtime(),
+ productOrderJoinDetailsNewList.get(i+1).getProBegintime());
+ if (daysTemp>0) {
+ userProductData.setLimitDays(Integer.valueOf(Double.valueOf(days).intValue()));
+ }
+ }
+ else
+ {
+ userProductData.setLimitDays(Integer.valueOf(Double.valueOf(days).intValue()));
+ }
+ }
}
+ }
+ //是否已经结束
+ if (userProductData.getIsEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ //写入redis中,防止扣非后不能生成报告
+ redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
}
return ResultBody.ok().data(userProductData);
}
@@ -169,6 +200,18 @@
@Override
public List<OrderChartVo> proCountChart() {
return baseMapper.proCountChart();
+ }
+ /**
+ *获取该科室下的所有的套餐信息
+ * @param params
+ * @return
+ */
+ @Override
+ public PageResult<ProductOrderDetail> departmentProductDetail(Map<String, Object> params) {
+ Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ 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();
}
/**
@@ -310,24 +353,40 @@
//科室私有的数据
List<ProductOrderJoinDetail> productOrderJoinDetailsListDep = userProductDetail.getProductOrderJoinDetailsListDep();
//本医院可共享的读片总量
- int shareCount = productOrderJoinDetailListShare.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount));
+ int shareCount = (productOrderJoinDetailListShare.size()>0)?
+ productOrderJoinDetailListShare.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount))
+ :0;
//本科室私有读片总量
- int depCount = productOrderJoinDetailsListDep.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount));
+ int depCount = (productOrderJoinDetailsListDep.size()>0)?
+ productOrderJoinDetailsListDep.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount))
+ :0;
//可用的总量
userAICount = shareCount + depCount;
+
+ //共享套餐里面的detailid
+ List<Long> shareDetailId = (productOrderJoinDetailListShare.size()>0)
+ ?productOrderJoinDetailListShare.stream().map(m -> m.getId()).collect(Collectors.toList())
+ :new ArrayList<>();
+ //私有套餐里面的detailid
+ List<Long> depDetailId = (productOrderJoinDetailsListDep.size()>0)
+ ?productOrderJoinDetailsListDep.stream().map(m -> m.getId()).collect(Collectors.toList())
+ :new ArrayList<>();
+ //获取所有有效的套餐id
+ List<Long> nowDetailList=new ArrayList<>();
+ BeanUtils.copyProperties(shareDetailId,nowDetailList);
+ nowDetailList.addAll(depDetailId);
+ //查询已预扣 未退还 未扣费的数据
+ List<ConsumptionRecord> consumptionRecordList = consumptionRecordMapper.findDetailList(nowDetailList);
//计算预扣费的总量
- Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("recordType", ConsumptionConstant.BEFORE_DEDUCTION);
- List<ConsumptionRecord> consumptionRecordList = consumptionRecordMapper.findList(selectMap);;
if (consumptionRecordList.size() > 0) {
- //共享套餐里面的detailid
- List<Long> shareDetailId = productOrderJoinDetailListShare.stream().map(m -> m.getId()).collect(Collectors.toList());
- //私有套餐里面的detailid
- List<Long> depDetailId = productOrderJoinDetailsListDep.stream().map(m -> m.getId()).collect(Collectors.toList());
//共享套餐里面预扣费总数
- int shareConCount = consumptionRecordList.stream().filter(f -> shareDetailId.contains(f.getProOrderDetailId())).collect(Collectors.summingInt(ConsumptionRecord::getConsumptionCount));
- //共享套餐里面预扣费总数
- int depConCount = consumptionRecordList.stream().filter(f -> depDetailId.contains(f.getProOrderDetailId())).collect(Collectors.summingInt(ConsumptionRecord::getConsumptionCount));
+ int shareConCount = (shareDetailId.size()>0)?consumptionRecordList.stream()
+ .filter(f -> shareDetailId.contains(f.getProOrderDetailId()))
+ .collect(Collectors.summingInt(ConsumptionRecord::getConsumptionCount)):0;
+ //私有套餐里面预扣费总数
+ int depConCount = (depDetailId.size()>0)?consumptionRecordList.stream()
+ .filter(f -> depDetailId.contains(f.getProOrderDetailId()))
+ .collect(Collectors.summingInt(ConsumptionRecord::getConsumptionCount)):0;
userAICount -= (shareConCount + depConCount);
}
}
--
Gitblit v1.8.0