just comment

eight

2024-11-14 9abd695cac8c79a41b6497e0e9c8414138210f90

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java

@@ -147,12 +147,17 @@
        return CommonResult.success(rent_id);
    }

    /**
     * 领用完成 操作
     * @param createReqVO 创建信息
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public CommonResult<Long> readyOperation(DevRentSaveReqVO createReqVO) {
        Long userId = SecurityFrameworkUtils.getLoginUserId();
        String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
        Long rent_id = createReqVO.getId();
        Long rent_id = createReqVO.getId();  // dev_rent 表的ID

        // 标注设备 已领取
        Integer ret = markDevRecieved(createReqVO.getDevId(), rent_id);
@@ -227,18 +232,11 @@

        // 检查项目.亲和性 处理逻辑
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            List<QueueDO> affinityReadyItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.READY.getStatus());
            if (!affinityReadyItems.isEmpty()) {
                QueueDO tmpQueueDO = affinityReadyItems.get(0);
            List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
            if (!affinityAffinityWaitingItems.isEmpty()) {
                QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
                tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                queueMapper.updateById(tmpQueueDO);
            } else {
                List<QueueDO> affinityAffinityWaitingItems = queueMapper.getCurPatGivenCheckTypesAndStatus(firstOnStageQueueItem.getPatId(), checkTypeDO.getAffinityCheckTypes(), QueueStatusEnum.AFFINITY_WAITING.getStatus());
                if (!affinityAffinityWaitingItems.isEmpty()) {
                    QueueDO tmpQueueDO = affinityAffinityWaitingItems.get(0);
                    tmpQueueDO.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
                    queueMapper.updateById(tmpQueueDO);
                }
            }
        }