修改查询科室套餐是否到期的接口,返回字段增加剩余读片量/报告量/剩余天数 删除原有的结束时间参数

houruijun

2020-09-04 a35f96d1e086655a9ee61e997520dbbe0ddc3395

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

@@ -75,7 +75,7 @@
    }

    /**
     * 判定医院科室的套餐是否到期 以及到期时间
     * 判定医院科室的套餐是否到期 以及剩余的读片量
     * @param hospitalId
     * @param departmentId
     * @param diagnosticId
@@ -85,6 +85,9 @@
    {
        UserProductData userProductData=new UserProductData();
        userProductData.setEnd(true);
        userProductData.setRecordCount(0);
        userProductData.setAilightCount(0);
        userProductData.setLimitDays(0);
        UserProductDetail userProductDetail = this.getUserProductDetail(hospitalId, departmentId);
        if (userProductDetail != null) {
            //合并集合
@@ -93,8 +96,24 @@
            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());
                List<ProductOrderJoinDetail> productOrderJoinDetailsNewList = productOrderJoinDetailList.stream().filter(f -> f.getAilightCount() >= 0).sorted(Comparator.comparing(ProductOrderJoinDetail::getProEndtime)).collect(Collectors.toList());
                for (int i = 0; i <productOrderJoinDetailsNewList.size(); i++) {
                    userProductData.setAilightCount(productOrderJoinDetailsNewList.get(i).getAilightCount());
                    userProductData.setRecordCount(productOrderJoinDetailsNewList.get(i).getRecordCount());
                    Double days=DateUtils.getDays(new Date(),productOrderJoinDetailsNewList.get(i).getProEndtime());
                    if (i<productOrderJoinDetailsNewList.size()-1) {
                        //按照结束日期正序排序后,如果第二条的开始时间减去第一条的结束时间 差值大于0  说明套餐间有中断 则以当前这条套餐作为当前套餐的剩余天数
                        Double daysTemp=DateUtils.getDays(productOrderJoinDetailsNewList.get(i).getProEndtime(),
                                productOrderJoinDetailsNewList.get(i+1).getProBegintime());
                        if (daysTemp>0) {
                            userProductData.setLimitDays(Integer.valueOf(Double.valueOf(days).intValue()));
                        }
                    }
                    else
                    {
                        userProductData.setLimitDays(Integer.valueOf(Double.valueOf(days).intValue()));
                    }
                }
            }
        }
        //是否已经结束