just refactor

eight

2025-03-31 8aebf6bafb60a882ebd84bf727e39ef27233ac32

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java

@@ -418,43 +418,15 @@
        }

        // 处理 排队中 患者
        hurryupOneBedCheckTypes( bedQueueBO );
        hurryupOneBedCheckTypeList( bedQueueBO );
    }

    public void hurryupOneBedCheckTypes(BedQueueBO bedQueueBO) {
        while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
            // 抢占 是否有排队中的患者
            Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
                    bedQueueBO.getRoomId(),
                    bedQueueBO.getRoomName(),
                    bedQueueBO.getBedNo(),
                    curSeqNum.get() + 1,
                    QueueStatusEnum.WAITING.getStatus(),
                    QueueStatusEnum.READY.getStatus(),
                    bedQueueBO.checkTypes);

            // 没有抢到排队患者
            if (null == updateNum || 0 == updateNum) {
                return;
            }

            QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
            CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );

            // 抢到排队患者后，处理 检查项目.亲和性 逻辑
            if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
                procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
            }

            curSeqNum.getAndIncrement();

            bedQueueBO.queueNum.incrementAndGet();
        }

        // 改变了优先队列顺序
        refreshPriorityQueue(bedQueueBO);
    }

    /**
     * Deprecated  代码保留，实际已经不再使用
     * 原因: 同一工位可以同时处理多个检查项目，所以需要保证多个检查项目的就诊时间先后顺序
     * 按照一个检查项目来处理，就不能保证同一个工位的多个检查项目的就诊时间的先后顺序
     * @param checkType
     */
    public void hurryupOneCheckType(Integer checkType) {

        PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypePriorityQueue.get(checkType);
@@ -541,6 +513,40 @@
        log.info(" opening " + openingFlag.get() + " " + monitorInfoVO.getQueueNum() + " " + monitorInfoVO.getActiveQueueNum() + " " + monitorInfoVO.getCheckTypeBedInfo().toString() );
    }

    private void hurryupOneBedCheckTypeList(BedQueueBO bedQueueBO) {
        while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
            // 抢占 是否有排队中的患者
            Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
                    bedQueueBO.getRoomId(),
                    bedQueueBO.getRoomName(),
                    bedQueueBO.getBedNo(),
                    curSeqNum.get() + 1,
                    QueueStatusEnum.WAITING.getStatus(),
                    QueueStatusEnum.READY.getStatus(),
                    bedQueueBO.checkTypes);

            // 没有抢到排队患者
            if (null == updateNum || 0 == updateNum) {
                return;
            }

            QueueDO preemptQueueItem = queueMapper.getQueueItemBySeqNum(curSeqNum.get() + 1);
            CheckTypeDO checkTypeDO = getCheckTypeItem( preemptQueueItem.getBookCheckType() );

            // 抢到排队患者后，处理 检查项目.亲和性 逻辑
            if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
                procAffinityWhenPreempt(preemptQueueItem, checkTypeDO.getAffinityCheckTypes());
            }

            curSeqNum.getAndIncrement();

            bedQueueBO.queueNum.incrementAndGet();
        }

        // 改变了优先队列顺序
        refreshPriorityQueue(bedQueueBO);
    }

    private void procAffinityWhenPreempt(QueueDO preemptQueueItem, Integer[] affinityCheckTypes) {
        List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
                preemptQueueItem.getPatId(), affinityCheckTypes, QueueStatusEnum.WAITING.getStatus());