还原此接口

zhaoxiaohao

2020-11-28 60c0d232038152fb6be9a2f579b74f2a837f0498

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

@@ -1,7 +1,6 @@
package com.kidgrow.oprationcenter.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
@@ -348,25 +347,15 @@
    {
        //查询当前医院正在使用的套餐
        Map<String, Object> selectMap = new HashMap<>();
        selectMap.put("hospital_id", hospitalId);
        selectMap.put("is_del",0);
        selectMap.put("enabled",1);
        List<ProductOrder> productOrders = iProductOrderService.listByMap(selectMap);
        if(productOrders!=null&&productOrders.size()>0){
//            List<ProductOrderJoinDetail> productOrderDetailList = this.findAllList(selectMap);
            QueryWrapper queryWrapper=new QueryWrapper();
            queryWrapper.eq("is_del",0);
            queryWrapper.eq("enabled",1);
            queryWrapper.in("order_id",productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList()));
            List<ProductOrderJoinDetail> productOrderDetailList = this.baseMapper.selectList(queryWrapper);
            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())).collect(Collectors.toList()));
                return userProductDetail;
            }
        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())).collect(Collectors.toList()));
            return userProductDetail;
        }
        return null;
    }