1.调整套餐信息查询接口 2.调整医生信息接口 3.调整获取医生列表接口

houruijun

2020-06-29 20210ee1c0101cb9741e04592ae3daa419663c89

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java

@@ -7,16 +7,12 @@
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.oprationcenter.vo.*;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
@@ -25,10 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
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;

/**
@@ -44,8 +37,6 @@
public class ProductOrderDetailServiceImpl extends SuperServiceImpl<ProductOrderDetailMapper, ProductOrderDetail> implements IProductOrderDetailService {
   @Autowired
    DiagnosticService diagnosticService;
    @Autowired
    private RoleOrganizationService roleOrganizationService;
    @Autowired
    private SysDoctorService sysDoctorService;
    @Autowired
@@ -74,6 +65,30 @@
    }

    /**
     * 判定医院科室的套餐是否到期 以及到期时间
     * @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);
    }
    /**
     * 获取诊断列表
     * @param params
     * @return