From 2a0e777c3d5d8198554bcdf50f36d54927176fae Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 23 Jul 2020 12:05:12 +0800
Subject: [PATCH] 网关修改 判断逻辑 ， 数据权限修改
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 11 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 b508878..853e235 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
@@ -7,28 +7,25 @@
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.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ConsumptionRecord;
+import com.kidgrow.oprationcenter.model.ProductOrder;
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.oprationcenter.service.IProductOrderService;
+import com.kidgrow.oprationcenter.vo.*;
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.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,13 +42,13 @@
@Autowired
DiagnosticService diagnosticService;
@Autowired
- private RoleOrganizationService roleOrganizationService;
- @Autowired
private SysDoctorService sysDoctorService;
@Autowired
private SysHospitalService sysHospitalService;
@Autowired
private ConsumptionRecordMapper consumptionRecordMapper;
+ @Autowired
+ private IProductOrderService iProductOrderService;
/**
* 列表
* @param params
@@ -74,6 +71,55 @@
}
/**
+ * 判定医院科室的套餐是否到期 以及到期时间
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ public ResultBody UserProductDetailData(Long hospitalId,Long departmentId)
+ {
+ UserProductData userProductData=new UserProductData();
+ userProductData.setEnd(true);
+ 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);
+ //合并后按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());
+ }
+ }
+ return ResultBody.ok().data(userProductData);
+ }
+
+ @Override
+ public PageResult all(Map<String, Object> params) {
+ Page<ProductOrderDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ List<ProductOrderDetail> list = baseMapper.findList(page, params);
+ List<ProductOrderDetailVo> volist=new ArrayList<>();
+ for (ProductOrderDetail productOrderDetail : list) {
+ ProductOrderDetailVo productOrderDetailVo=new ProductOrderDetailVo();
+ BeanCopier beanCopier = BeanCopier.create(ProductOrderDetail.class, ProductOrderDetailVo.class, false);
+ beanCopier.copy(productOrderDetail,productOrderDetailVo,null);
+ //查询医院
+ if(productOrderDetail.getOrderId()!=null){
+ ProductOrder productOrder = iProductOrderService.getById(productOrderDetail.getOrderId());
+ if(productOrder!=null){
+ productOrderDetailVo.setDepartmentId(productOrder.getDepartmentId());
+ productOrderDetailVo.setDepartmentName(productOrder.getDepartmentName());
+ productOrderDetailVo.setHospitalId(productOrder.getHospitalId());
+ productOrderDetailVo.setHospitalName(productOrder.getHospitalName());
+ }
+ volist.add(productOrderDetailVo);
+ }
+ }
+ return PageResult.<ProductOrderDetailVo>builder().data(volist).code(0).count(page.getTotal()).build();
+ }
+
+ /**
* 获取诊断列表
* @param params
* @return
@@ -88,6 +134,7 @@
* @param params
* @return
*/
+
@Override
public PageResult<GroupProductDetail> groupList(Map<String, Object> params) {
Page<GroupProductDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
--
Gitblit v1.8.0