just refactor

eight

2025-04-09 a0e8a9e3eb543cf60ae971a9425ea3ce65ccd7d5

just refactor

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

@@ -26,11 +26,11 @@
     * 这两个字段 用于分流控制, 参与分流的工位使用
     * 【候诊中】患者数 、最大允许数
     */
    AtomicInteger readyPatNum = new AtomicInteger(0);
    Integer readyPatNum = 0;
    Integer maxReadyPatNum = 0;

    @Override
    public int compareTo(@NotNull BedBO o) {
        return Integer.compare(this.readyPatNum.get(), o.readyPatNum.get());
        return Integer.compare(this.readyPatNum, o.readyPatNum);
    }
}

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

@@ -270,9 +270,9 @@
        firstReadyQueueItem.setStatus(QueueStatusEnum.ONSTAGE.getStatus());
        queueMapper.updateById( firstReadyQueueItem );

        // 分流队列中 该工位 候诊中中人的数量 减一
        // 分流队列中 该工位 【候诊中】患者数量 减一
        BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) );
        bo.readyPatNum.getAndDecrement(); // 可能已经【并发的】在 hurry-up 中改变了值
        bo.readyPatNum--; // 可能已经在 hurry-up 中改变了值

        refreshBedPriorityLevelInRoutingQueue(bo);
        return GlobalErrorCodeConstants.SUCCESS;
@@ -372,7 +372,7 @@
        BedBO bedBO = getBedQueueBO(roomId, bedNo);

        // 处理 过号-回来 的人
        while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
        while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
            // 查看 当前工位 是否有过号-回来的患者
            Integer updateNum = queueMapper.queueRecalledPatient(
                    bedBO.getRoomId(),
@@ -394,8 +394,8 @@

            curSeqNum.getAndIncrement();

            // 可能已经【并发的】在 nextPatient 中改变了值
            bedBO.readyPatNum.incrementAndGet();
            // 可能已经在 nextPatient 中改变了值
            bedBO.readyPatNum++;

            // 可能已经【并发的】在 nextPatient 中改变了分流队列顺序
            refreshBedPriorityLevelInRoutingQueue(bedBO);
@@ -423,11 +423,11 @@
            if (null == bedBO)
                return;

            int curQueueNum = bedBO.readyPatNum.get();
            if (curQueueNum > bedBO.maxReadyPatNum)
            int curQueueNum = bedBO.getReadyPatNum();
            if (curQueueNum > bedBO.getMaxReadyPatNum())
                throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");

            if (curQueueNum == bedBO.maxReadyPatNum)
            if (curQueueNum == bedBO.getMaxReadyPatNum())
                return;

            // 查看 是否有排队中的患者
@@ -455,8 +455,8 @@

            curSeqNum.getAndIncrement();

            // 可能已经【并发的】在 nextPatient 中改变了值
            bedBO.readyPatNum.incrementAndGet();
            // 可能已经在 nextPatient 中改变了值
            bedBO.readyPatNum++;

            // 可能已经【并发的】在 nextPatient 中改变了分流队列顺序
            refreshBedPriorityLevelInRoutingQueue(bedBO);
@@ -499,7 +499,7 @@
    }

    private void hurryupOneBedCheckTypeList(BedBO bedBO) {
        while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) {
        while (bedBO.getReadyPatNum() < bedBO.getMaxReadyPatNum()) {
            // 抢占 是否有排队中的患者
            Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes(
                    bedBO.getRoomId(),
@@ -525,7 +525,7 @@

            curSeqNum.getAndIncrement();

            bedBO.readyPatNum.incrementAndGet();
            bedBO.readyPatNum++;
        }

        // 改变了分流队列顺序
@@ -584,7 +584,7 @@
        queueStatusList.add(QueueStatusEnum.READY.getStatus()); //[候诊中]
        List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList);
        bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) );
        bedBO.setReadyPatNum(new AtomicInteger(queueDOList.size()));
        bedBO.setReadyPatNum( queueDOList.size() );

        Integer[] checkTypes = bedBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> {
@@ -624,8 +624,10 @@
        Integer[] checkTypes = bedBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> {
            PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType);
            if (null != routingQueue) {
            routingQueue.remove(bedBO);
            routingQueue.offer(bedBO);
            }
        });
    }