update

eight

2024-09-26 137e9fb1f28d213d2608c12e17ece1dd57cec452

update

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

@@ -142,7 +142,16 @@
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getDevRent(@RequestParam("id") Long id) {
        DevRentDO devRent = devRentService.getDevRent(id);
        return CommonResult.success(BeanUtils.toBean(devRent, DevRentRespVO.class));

        DevRentRespVO devRentRespVO = BeanUtils.toBean(devRent, DevRentRespVO.class);

        DeviceDO deviceDO = deviceService.getDevice( devRent.getDevId() );
        if (null != deviceDO) {
            devRentRespVO.setCategory(deviceDO.getCategory());
            devRentRespVO.setBrand(deviceDO.getBrand());
            devRentRespVO.setModel(deviceDO.getModel());
        }
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/page")
@@ -187,10 +196,10 @@
        return CommonResult.success(devRentRespVO);
    }

    @GetMapping("/get-dismantle-rent")
    @GetMapping("/get-installed-rent")
    @Operation(summary = "获取患者设备的最近租赁情况")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<DevRentRespVO> getLatestRent( @Valid DevRentSearchReqVO searchReqVO )
    public CommonResult<DevRentRespVO> getInstalledRent( @Valid DevRentSearchReqVO searchReqVO )
    {
        DevRentDO devRent = devRentService.getInstalledOrCancelledRent( searchReqVO );
        if (null == devRent) {