修改因合并版本造成代码丢失的问题

houruijun

2020-10-22 e50e03e296a2456836afbb7f6bee461ee7bddd05

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

@@ -201,6 +201,10 @@
    public List<OrderChartVo> proCountChart() {
        return baseMapper.proCountChart();
    }
   @Override
    public int getUserdProduct(Long hospitalId, Long departmentId) {
        return baseMapper.getUserdProduct(hospitalId,departmentId);
    }
    /**
     *获取该科室下的所有的套餐信息
     * @param params
@@ -212,6 +216,14 @@
        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();
    }

    @Override
    public PageResult<ProductEndVo> productEndList(Map<String, Object> params) {
        Page<ProductEndVo> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<ProductEndVo> list  =
                baseMapper.productEndList(page,MapUtils.getIntValue(params,"monthPar"),MapUtils.getIntValue(params,"aiCountPar"));
        return PageResult.<ProductEndVo>builder().data(list).code(0).count(page.getTotal()).build();
    }

    /**
@@ -236,7 +248,6 @@
        List<GroupProductDetail> list  =  baseMapper.groupProductDetail(page,params);
        return PageResult.<GroupProductDetail>builder().data(list).code(0).count(page.getTotal()).build();
    }

    /**
   * 根据ProductOrderDetail对象当做查询条件进行查询
   * @param productOrderDetail