From 64c9ab17a187d6087acbda902c01d14f5707922a Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Sun, 28 Jun 2020 16:34:36 +0800 Subject: [PATCH] 1.调整扣费业务支持feign调用 2.更新运营平台支持统一格式化时间 3.修改zuu网关,增加请求头doctorId字段,修改departmentId字段的取值 --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 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 acdfb9a..b508878 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,17 +2,21 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kidgrow.common.constant.ConsumptionConstant; import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.common.utils.DateUtils; import com.kidgrow.oprationcenter.feign.DiagnosticService; import com.kidgrow.oprationcenter.feign.RoleOrganizationService; +import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper; import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper; +import com.kidgrow.oprationcenter.model.ConsumptionRecord; import com.kidgrow.oprationcenter.model.ProductOrderDetail; import com.kidgrow.oprationcenter.service.IProductOrderDetailService; import com.kidgrow.oprationcenter.vo.DiagnosisRecord; import com.kidgrow.oprationcenter.vo.GroupProductDetail; import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail; +import com.kidgrow.oprationcenter.vo.UserProductDetail; import com.kidgrow.usercenter.feign.SysDoctorService; import com.kidgrow.usercenter.feign.SysHospitalService; import com.kidgrow.usercenter.model.SysHospital; @@ -25,6 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -45,6 +50,8 @@ private SysDoctorService sysDoctorService; @Autowired private SysHospitalService sysHospitalService; + @Autowired + private ConsumptionRecordMapper consumptionRecordMapper; /** * 列表 * @param params @@ -163,4 +170,72 @@ return ResultBody.failed("该用户的组织已经失效"); } } + /** + *获取医院的套餐数据 + * @param hospitalId + * @param departmentId + * @return + */ + @Override + public UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId) + { + //查询当前医院正在使用的套餐 + 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() == false)).collect(Collectors.toList())); + return userProductDetail; + } + return null; + } + /** + * 统计用户所有套餐剩余 套餐剩余量=(有效期内的医院所有共享+科室私有的套餐的读片量)-预扣费的读片量 + * + * @param hospitalId + * @param departmentId + * @return + */ + @Override + public ResultBody biUserNowProduct(Long hospitalId, Long departmentId) { + if (hospitalId > 0 && departmentId > 0) { + UserProductDetail userProductDetail=getUserProductDetail(hospitalId,departmentId); + int userAICount = 0; + if (userProductDetail!=null) { + //包含共享的数据 + List<ProductOrderJoinDetail> productOrderJoinDetailListShare = userProductDetail.getProductOrderJoinDetailListShare(); + //科室私有的数据 + List<ProductOrderJoinDetail> productOrderJoinDetailsListDep = userProductDetail.getProductOrderJoinDetailsListDep(); + //本医院可共享的读片总量 + int shareCount = productOrderJoinDetailListShare.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount)); + //本科室私有读片总量 + int depCount = productOrderJoinDetailsListDep.stream().collect(Collectors.summingInt(ProductOrderJoinDetail::getAilightCount)); + //可用的总量 + userAICount = shareCount + depCount; + //计算预扣费的总量 + 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)); + userAICount -= (shareConCount + depConCount); + } + } + + return ResultBody.ok().data(userAICount); + } else { + return ResultBody.failed("医院和科室数据有误!"); + } + } } -- Gitblit v1.8.0