liusheng
2 天以前 5ba25cb53dab2ef0f8052a93796ef67a8a2ee820
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/devrent/DevRentController.java
@@ -79,11 +79,12 @@
    @Operation(summary = "设备领用完成")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        createReqVO.setOperater(userNickname);
        CommonResult<Long> result = devRentService.readyOperation(createReqVO);
        try {
            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
            Long rentId = createReqVO.getId();
            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 故意 不检查返回值
        } catch (Exception e) {