Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zhaoxiaohao

2020-11-17 e9cbc4b86621cfdc2b7039e56fad760e80865389

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java

@@ -92,6 +92,22 @@
        }
        return productOrderDetailService.all(params);
    }
    /**
     * 列表
     */
    @ApiOperation(value = "查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("alldetail")
    public PageResult alldetail(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return productOrderDetailService.departmentProductDetail(params);
    }

    /**
     * 列表
@@ -128,7 +144,22 @@
        }
        return productOrderDetailService.groupList(params);
    }

    /**
     * 查询到期列表
     */
    @ApiOperation(value = "查询到期列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "page", value = "分页起始位置", required = true, dataType = "Integer"),
            @ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
    })
    @GetMapping("/productEnd")
    public PageResult productEndList(@RequestParam Map<String, Object> params) {
        if (params.size() == 0) {
            params.put("page", 1);
            params.put("limit", 10);
        }
        return productOrderDetailService.productEndList(params);
    }
    /**
     * 获取医院套餐是否到期和到期时间
     * data内 isend为true说明套餐到期
@@ -136,13 +167,14 @@
     *
     * @param hospitalId
     * @param departmentId
     * @param diagnosticId
     * @return
     */

    @ApiOperation(value = "获取医院套餐是否到期和到期时间")
    @GetMapping("/UserProductDetailData")
    public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId) {
        return productOrderDetailService.UserProductDetailData(hospitalId, departmentId);
    public ResultBody<UserProductData> serProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
        return productOrderDetailService.userProductDetailData(hospitalId, departmentId,diagnosticId);
    }

    /**
@@ -155,8 +187,8 @@

    @ApiOperation(value = "获取医院套餐是否到期和到期时间")
    @PostMapping("/serviceperiod")
    public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
        return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId());
    public ResultBody<UserProductData> servicePeriod(@RequestBody HospitalInfo hospitalInfo) {
        return productOrderDetailService.userProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
    }

    /**