领用完成、 常规检查完成 启动抢 排队 患者

eight

2025-03-31 ad51febb28df10c3c5e6352f33d6610100802465

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

@@ -60,24 +60,40 @@
    public CommonResult<Long> routineFinish(@Valid @RequestBody RoutineFinishReqVO routineFinishReqVO) {
        CommonResult<Long> result = devRentService.routineFinishOperation(routineFinishReqVO);

        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
        Long rentId = routineFinishReqVO.getId();
        devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 故意 不检查返回值
        // 抢 排队 患者
        queueService.startHurryUpOneBed(routineFinishReqVO.getRoomId(), routineFinishReqVO.getBedNo());

        // 自动确费
        try {
            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
            Long rentId = routineFinishReqVO.getId();
            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 故意 不检查返回值
        } catch (Exception e) {
            log.error("常规检查完成, 自动确费失败", e);
        }

        return result;
    }

    @PostMapping("/dev-ready")
    @Operation(summary = "设备领用")
    @Operation(summary = "设备领用完成")
    @PreAuthorize("@ss.hasPermission('ecg:doctor:task')")
    public CommonResult<Long> devReady(@Valid @RequestBody DevRentSaveReqVO createReqVO) {
        CommonResult<Long> result = devRentService.readyOperation(createReqVO);

        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
        Long rentId = createReqVO.getId();
        devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 故意 不检查返回值
        // 抢 排队 患者
        queueService.startHurryUpOneBed(createReqVO.getRoomId(), createReqVO.getBedNo());

        // 自动确费
        try {
            String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
            String userHisId = SecurityFrameworkUtils.getLoginUserHisId();
            Long rentId = createReqVO.getId();
            devRentService.feeConfirm(rentId, userHisId, userNickname, true);  // 故意 不检查返回值
        } catch (Exception e) {
            log.error("设备领用完成, 自动确费失败", e);
        }

        return result;
    }