From c58a42aa1acc821e0c3e748de7205e58af6c350b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:44:25 +0800
Subject: [PATCH] 1.修改充值页面,可支持修改起始结束时间 2.修改添加医院/医生页面,增加自动选择当前服务/销售人员 3.调整页面部分显示细节问题
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 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 9f7c20a..96cba5a 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,9 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
@@ -14,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;
@@ -47,6 +51,8 @@
private ConsumptionRecordMapper consumptionRecordMapper;
@Autowired
private IProductOrderService iProductOrderService;
+ @Autowired
+ private RedisUtils redisUtils;
/**
* 列表
* @param params
@@ -72,9 +78,10 @@
* 判定医院科室的套餐是否到期 以及到期时间
* @param hospitalId
* @param departmentId
+ * @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
+ public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
{
UserProductData userProductData=new UserProductData();
userProductData.setEnd(true);
@@ -89,6 +96,11 @@
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());
}
+ }
+ //是否已经结束
+ if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ //写入redis中,防止扣非后不能生成报告
+ redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
}
return ResultBody.ok().data(userProductData);
}
@@ -168,6 +180,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();
}
/**
@@ -309,28 +333,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.stream().map(m -> m.getId()).collect(Collectors.toList());
+ List<Long> shareDetailId = (productOrderJoinDetailListShare.size()>0)
+ ?productOrderJoinDetailListShare.stream().map(m -> m.getId()).collect(Collectors.toList())
+ :new ArrayList<>();
//私有套餐里面的detailid
- List<Long> depDetailId = productOrderJoinDetailsListDep.stream().map(m -> m.getId()).collect(Collectors.toList());
-
+ List<Long> depDetailId = (productOrderJoinDetailsListDep.size()>0)
+ ?productOrderJoinDetailsListDep.stream().map(m -> m.getId()).collect(Collectors.toList())
+ :new ArrayList<>();
//获取所有有效的套餐id
- List<Long> nowDetailList=shareDetailId;
+ List<Long> nowDetailList=new ArrayList<>();
+ BeanUtils.copyProperties(shareDetailId,nowDetailList);
nowDetailList.addAll(depDetailId);
//查询已预扣 未退还 未扣费的数据
List<ConsumptionRecord> consumptionRecordList = consumptionRecordMapper.findDetailList(nowDetailList);
//计算预扣费的总量
if (consumptionRecordList.size() > 0) {
//共享套餐里面预扣费总数
- int shareConCount = consumptionRecordList.stream().filter(f -> shareDetailId.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 = consumptionRecordList.stream().filter(f -> depDetailId.contains(f.getProOrderDetailId())).collect(Collectors.summingInt(ConsumptionRecord::getConsumptionCount));
+ 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