检查项目 大屏显示列 配置

eight

2024-10-16 45c86945f735ab5a63025ed5dcff9aeae4106a1f

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java

@@ -54,13 +54,13 @@
    @PostMapping("/routine-finish")
    @Operation(summary = "")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> routineFinish(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
    public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
        try {
            CommonResult<Long> result = devRentService.routineFinishOperation(createReqVO);
            CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);
            return result;
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("checkFinish: " + err);
            log.error("routineFinish: " + err);
            return CommonResult.error(DEV_INSTALL_EXCEPTION);
        }
    }
@@ -120,6 +120,20 @@
        }
    }


    @PostMapping("/routine-check-cancel")
    @Operation(summary = "取消常规检查")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> routineCheckCancel(@Valid @RequestBody DevCancelReqVO cancelReqVO) {
        try {
            return devRentService.cancelRoutineOperation(cancelReqVO);
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("routineCheckCancel: " + err);
            return CommonResult.error(ROUTINE_CANCEL_EXCEPTION);
        }
    }

    @PostMapping("/dev-ready-cancel")
    @Operation(summary = "取消领用")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
@@ -128,8 +142,8 @@
            return devRentService.cancelReadyOperation(cancelReqVO);
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
            log.error("devReadyCancel: " + err);
            return CommonResult.error(DEV_RECEIVE_CANCEL_EXCEPTION);
        }
    }

@@ -141,8 +155,8 @@
            return devRentService.cancelInstallOperation(cancelReqVO);
        } catch ( RuntimeException runtimeException ) {
            String err = ExceptionUtils.formatException( runtimeException );
            log.error("devCancel: " + err);
            return CommonResult.error(DEV_CANCEL_EXCEPTION);
            log.error("devInstallCancel: " + err);
            return CommonResult.error(DEV_INSTALL_CANCEL_EXCEPTION);
        }
    }

@@ -222,6 +236,20 @@
                        BeanUtils.toBean(list, DevRentRespVO.class));
    }

    @GetMapping("/get-free-rent")
    @Operation(summary = "获取已领取租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getFreeRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getFreeRent( searchReqVO );
        if (null == devRent) {
            return CommonResult.success(null);
        }

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/get-ready-rent")
    @Operation(summary = "获取已领取租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")