根据检查类型 安排医生工位 step 1

eight

2024-10-10 20d1b6b5d9955faeed1689d656e1f6bab0097d1e

根据检查类型 安排医生工位 step 1

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/MonitorInfoVO.java

@@ -7,4 +7,6 @@
    private Integer queueNum;
    private Integer activeQueueNum;
    private Integer openingFlag;
    private String  openingInfo;
    private String  operatingInfo;
}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomPageReqVO.java

@@ -31,6 +31,9 @@
    @Schema(description = "检查类型")
    private Integer[] checkTypes;

    @Schema(description = "操作类型")
    private Integer opType;

    @Schema(description = "开诊状态")
    private Integer status;


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomRespVO.java

@@ -36,6 +36,10 @@
    @ExcelProperty("检查类型")
    private Integer[] checkTypes;

    @Schema(description = "操作类型")
    @ExcelProperty("操作类型")
    private Integer opType;

    @Schema(description = "开诊状态", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("开诊状态")
    private Integer status;

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/vo/RoomSaveReqVO.java

@@ -39,4 +39,7 @@

    @Schema(description = "检查类型")
    private Integer[] checkTypes;

    @Schema(description = "操作类型")
    private Integer opType;
}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/dataobject/room/RoomDO.java

@@ -63,4 +63,6 @@

    @TableField(typeHandler = JacksonTypeHandler.class)
    private Integer[] checkTypes;

    private Integer opType;
}

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java

@@ -39,6 +39,9 @@
    @Select("SELECT max(seq_num) FROM lihu.queue")
    Integer getMaxSeqNum();

    @Select("SELECT * FROM lihu.queue where pat_id = #{patId}")
    QueueDO getQueueByPatId(@Param("patId")String patId);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
            "where room_id = #{roomId} and status in (" +
@@ -112,9 +115,10 @@
    @Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
            " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
            "  (select a.id from \n" +
            "    (select id from lihu.queue where status = #{curStatus} order by jump_flag desc, book_timeslot, create_time limit 1) a)")
            "    (select id from lihu.queue where status = #{curStatus} and book_check_type= #{checkType} order by jump_flag desc, book_timeslot, create_time limit 1) a)")
    Integer preemptPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
                           @Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
                           @Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus,
                           @Param("checkType")Integer checkType);

    @Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum}, passed = 1 " +
            " where id = " +

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java

@@ -41,13 +41,16 @@
    List<RoomStatisticsDO> roomStatistic();

    @Select("<script> " +
            "SELECT id, room_id, room_name, bed_no, status, doc_id, doc_name FROM lihu.clinic_room " +
            "SELECT * FROM lihu.clinic_room " +
            "where status in ( " +
                    " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
                    "  #{curStatus.status} " +
                    " </foreach> )" +
            " and deleted = 0;" +
            "</script>")
    @Results({
            @Result(property = "checkTypes", column = "check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<RoomDO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList);

    @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo}")

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

@@ -22,7 +22,7 @@
    public ErrorCode call() throws Exception {
        ErrorCode ec = queueService.nextPatient(roomId, bedNo);
        if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
            queueService.hurryup();
            queueService.hurryupOneBed(roomId, bedNo);
        }

        queueService.monitorInfo();

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

@@ -26,7 +26,7 @@
    public ErrorCode call() throws Exception {
        ErrorCode ec = queueService.bedDoctorResume(roomId, bedNo, docId, docName);
        if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
            queueService.hurryup();
            queueService.hurryupOneBed(roomId, bedNo);
        }

        queueService.monitorInfo();

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

@@ -24,7 +24,7 @@
    public ErrorCode call() throws Exception {
        ErrorCode ec = queueService.bedOpen(roomId, roomName, bedNo);
        if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
            queueService.hurryup();
            queueService.hurryupOneBed(roomId, bedNo);
        }

        queueService.monitorInfo();

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

@@ -13,6 +13,8 @@
    AtomicInteger queueNum = new AtomicInteger(0);
    Integer maxQueueNum;
    Integer status;
    Integer[] checkTypes;
    Integer opType;

    @Override
    public int compareTo(@NotNull BedQueueBO o) {

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

@@ -50,7 +50,9 @@
    /**
     *
     */
    void startHurryUp();
    void startHurryUpOneBed(Long roomId, String bedNo);
    void startHurryUpOneCheckType(Integer checkType);

    void startBedReload();
    void startResetRoom(Boolean needCloseBed);
    MonitorInfoVO getMonitorInfo();

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

@@ -218,9 +218,16 @@
    }

    @Override
    public void startHurryUp() {
    public void startHurryUpOneBed(Long roomId, String bedNo) {
        singleThreadExecutor.execute( () -> {
            queueServiceTxFunctions.hurryup();
            queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
        });
    }

    @Override
    public void startHurryUpOneCheckType(Integer checkType) {
        singleThreadExecutor.execute( () -> {
            queueServiceTxFunctions.hurryupOneCheckType( checkType );
        });
    }

@@ -228,7 +235,7 @@
    public void startBedReload() {
        singleThreadExecutor.execute( () -> {
            queueServiceTxFunctions.bedReload();
            queueServiceTxFunctions.hurryup();
            queueServiceTxFunctions.hurryupAllBed();
            queueServiceTxFunctions.monitorInfo();
        });
    }
@@ -296,7 +303,7 @@
        devRent.setState( DevRentStateEnum.FREE.getState() );
        devRentMapper.insert(devRent);

        startHurryUp();
        startHurryUpOneCheckType(Integer.valueOf(queue.getBookCheckType()));
    }

    public void finishNextPatient(Long roomId, String bedNo) {
@@ -362,14 +369,16 @@
    public Integer recallPatient(Long roomId, String bedNo, String patId) {
        Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
                QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
        startHurryUp();
        startHurryUpOneBed(roomId, bedNo);
        return updateNum;
    }

    @Override
    public Integer patientJump(String patId, Byte jumped) {
        Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
        startHurryUp();

        QueueDO queueDO = queueMapper.getQueueByPatId(patId);
        startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
        return updateNum;
    }


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

@@ -15,14 +15,12 @@
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;

@@ -58,8 +56,10 @@
    AtomicInteger openingFlag = new AtomicInteger(0);
    AtomicInteger curSeqNum = new AtomicInteger(0);

    PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
    ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();

    //PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
    Map<Integer, PriorityBlockingQueue<BedQueueBO>> mapCheckTypeVsPriorityQueue = new HashMap();

    Map<Integer, Integer> mapCheckTypeVsReadyMax = null;

@@ -89,7 +89,9 @@
        queueStatusList.add(QueueStatusEnum.READY.getStatus());
        List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);

        // 新增工位 优先队列
        RoomDO roomDO = roomMapper.getRoom(roomId, bedNo);

        // 新增..工位队列
        BedQueueBO bedQueueBO = new BedQueueBO();
        bedQueueBO.setRoomId(roomId);
        bedQueueBO.setRoomName(roomName);
@@ -97,6 +99,8 @@
        bedQueueBO.setMaxQueueNum(getBedReadyMax(roomId, bedNo));
        bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
        bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
        bedQueueBO.setCheckTypes( roomDO.getCheckTypes() );
        bedQueueBO.setOpType( roomDO.getOpType() );
        mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);

        return GlobalErrorCodeConstants.SUCCESS;
@@ -133,7 +137,7 @@
        }

        mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
        priorityQueue.remove(bedQueueBO);
        removePriorityQueue(bedQueueBO);
        return GlobalErrorCodeConstants.SUCCESS;
    }

@@ -154,7 +158,7 @@
        }

        bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
        priorityQueue.remove(bedQueueBO);
        removePriorityQueue(bedQueueBO);
        return GlobalErrorCodeConstants.SUCCESS;
    }

@@ -176,13 +180,7 @@
        }

        bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
        if (!priorityQueue.contains(bedQueueBO)) {
            priorityQueue.offer(bedQueueBO);
        } else {
            log.error("bedDoctorResume priorityQueue still exist!. " + roomId + " " + bedNo);
            return ECG_INNER_ERROR;
        }

        addPriorityQueue(bedQueueBO);
        return GlobalErrorCodeConstants.SUCCESS;
    }

@@ -203,13 +201,7 @@
        }

        bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
        if (!priorityQueue.contains(bedQueueBO)) {
            priorityQueue.offer(bedQueueBO);
        } else {
            log.error("bedDoctorOn priorityQueue still exist!. " + roomId + " " + bedNo);
            return ECG_INNER_ERROR;
        }

        addPriorityQueue(bedQueueBO);
        return GlobalErrorCodeConstants.SUCCESS;
    }

@@ -230,7 +222,7 @@
            return ROOM_INVALID_STATUS;
        }

        priorityQueue.remove(bedQueueBO);
        removePriorityQueue(bedQueueBO);

        bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
        return GlobalErrorCodeConstants.SUCCESS;
@@ -248,9 +240,8 @@
        // 优先队列中 该工位 就诊准备中人的数量 减一
        BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
        bo.queueNum.getAndDecrement(); // 可能已经【并发的】在 hurry-up 中改变了值
        priorityQueue.remove(bo);
        priorityQueue.offer(bo);

        removePriorityQueue(bo);
        return GlobalErrorCodeConstants.SUCCESS;
    }

@@ -259,7 +250,7 @@
     * 2. 服务运维重启时
     */
    public ErrorCode bedReload() {
        priorityQueue.clear();
        mapCheckTypeVsPriorityQueue.clear();
        mapBedVsQueue.clear();

        // 清除非当天的排队人员
@@ -290,7 +281,7 @@
            item.queueNum.set( queueNum );
            mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
            if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) {
                priorityQueue.offer(item);
                addPriorityQueue(item);
            }
        });

@@ -315,39 +306,55 @@
        }
    }

    /**
     * 把医生候诊的队列塞满
     */
    public void hurryup() {
    public void hurryupAllBed() {
        if (0 == openingFlag.get())
            return;

        mapBedVsQueue.values().forEach(bedQueueBO -> hurryupOneBed(bedQueueBO.roomId, bedQueueBO.bedNo));
    }

    /**
     * 把医生候诊的队列塞满
     */
    public void hurryupOneBed(Long roomId, String bedNo) {
        if (0 == openingFlag.get())
            return;

        BedQueueBO bedQueueBO = getBedQueueBO(roomId, bedNo);

        // 处理 过号-回来 的人
        for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
            while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
                // 查看 当前工位 是否有过号-回来的患者
                Integer updateNum = queueMapper.queueRecalledPatient(
                        bedQueueBO.getRoomId(),
                        bedQueueBO.getRoomName(),
                        bedQueueBO.getBedNo(),
                        curSeqNum.get() + 1,
                        QueueStatusEnum.RECALLED.getStatus(),
                        QueueStatusEnum.READY.getStatus());
                if (null == updateNum || 0 == updateNum)
                    break;
        while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
            // 查看 当前工位 是否有过号-回来的患者
            Integer updateNum = queueMapper.queueRecalledPatient(
                    bedQueueBO.getRoomId(),
                    bedQueueBO.getRoomName(),
                    bedQueueBO.getBedNo(),
                    curSeqNum.get() + 1,
                    QueueStatusEnum.RECALLED.getStatus(),
                    QueueStatusEnum.READY.getStatus());
            if (null == updateNum || 0 == updateNum)
                break;

                curSeqNum.getAndIncrement();
            curSeqNum.getAndIncrement();

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

                // 可能已经【并发的】在 nextPatient 中改变了优先队列顺序
                priorityQueue.remove(bedQueueBO);
                priorityQueue.offer(bedQueueBO);
            }
            // 可能已经【并发的】在 nextPatient 中改变了优先队列顺序
            refreshPriorityQueue(bedQueueBO);
        }

        // 处理 排队中 患者
        Integer[] checkTypes = bedQueueBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> hurryupOneCheckType(checkType));
    }

    public void hurryupOneCheckType(Integer checkType) {

        PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypeVsPriorityQueue.get(checkType);
        if (null == priorityQueue)
            return;

        while (true) {
            BedQueueBO bedQueueBO = priorityQueue.peek();
            if (null == bedQueueBO)
@@ -355,7 +362,7 @@

            int curQueueNum = bedQueueBO.queueNum.get();
            if (curQueueNum > bedQueueBO.maxQueueNum)
                throw new RuntimeException("hurryup: exceed max queue number!");
                throw new RuntimeException("hurryupOneCheckType: exceed max queue number!");

            if (curQueueNum == bedQueueBO.maxQueueNum)
                return;
@@ -367,7 +374,8 @@
                    bedQueueBO.getBedNo(),
                    curSeqNum.get() + 1,
                    QueueStatusEnum.WAITING.getStatus(),
                    QueueStatusEnum.READY.getStatus());
                    QueueStatusEnum.READY.getStatus(),
                    checkType);

            // 没有抢到排队患者
            if (null == updateNum || 0 == updateNum) {
@@ -380,8 +388,7 @@
            bedQueueBO.queueNum.incrementAndGet();

            // 可能已经【并发的】在 nextPatient 中改变了优先队列顺序
            priorityQueue.remove(bedQueueBO);
            priorityQueue.offer(bedQueueBO);
            refreshPriorityQueue(bedQueueBO);
        }
    }

@@ -404,14 +411,16 @@
    public MonitorInfoVO getMonitorInfo() {
        MonitorInfoVO monitorInfoVO = new MonitorInfoVO();
        monitorInfoVO.setOpeningFlag( openingFlag.get() );
        monitorInfoVO.setQueueNum( mapBedVsQueue.size() );
        monitorInfoVO.setActiveQueueNum( priorityQueue.size() );
        String[] arrStatInfo = roomBedStatistic();
        monitorInfoVO.setOpeningInfo(arrStatInfo[0]);
        monitorInfoVO.setOperatingInfo(arrStatInfo[1]);

        return monitorInfoVO;
    }

    public void monitorInfo() {
        log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
                + " opening " + openingFlag.get());
        String[] arrStatInfo = roomBedStatistic();
        log.info(" opening " + openingFlag.get() + " openingInfo " + arrStatInfo[0] + " operatingInfo " + arrStatInfo[1] );
    }

    private Integer getBedReadyMax(Long roomId, String bedNo) {
@@ -424,4 +433,81 @@
        }
        return ret;
    }

    private void addPriorityQueue(BedQueueBO bedQueueBO) {
        Integer[] checkTypes = bedQueueBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> {
            PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypeVsPriorityQueue.get(checkType);
            if (!priorityQueue.contains(bedQueueBO)) {
                priorityQueue.offer(bedQueueBO);
            } else {
                log.error("bedDoctorResume priorityQueue still exist!. " + bedQueueBO.getRoomId() + " " + bedQueueBO.getBedNo());
            }
        });
    }

    private void removePriorityQueue(BedQueueBO bedQueueBO) {
        Integer[] checkTypes = bedQueueBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> {
            PriorityBlockingQueue<BedQueueBO> priorityBlockingQueue = mapCheckTypeVsPriorityQueue.get(checkType);
            if (null != priorityBlockingQueue)
                priorityBlockingQueue.remove(bedQueueBO);
        });
    }

    private void refreshPriorityQueue(BedQueueBO bedQueueBO) {
        Integer[] checkTypes = bedQueueBO.getCheckTypes();
        Arrays.stream(checkTypes).forEach(checkType -> {
            PriorityBlockingQueue<BedQueueBO> priorityQueue = mapCheckTypeVsPriorityQueue.get(checkType);
            priorityQueue.remove(bedQueueBO);
            priorityQueue.offer(bedQueueBO);
        });
    }

    private String[]  roomBedStatistic() {
        Map<Integer, Integer>  mapOpeningCheckBedStatInfo = new HashMap<>();
        Map<Integer, Integer>  mapOpeningReadyBedStatInfo = new HashMap<>();
        Map<Integer, Integer>  mapOperatingCheckBedStatInfo = new HashMap<>();
        Map<Integer, Integer>  mapOperatingReadyBedStatInfo = new HashMap<>();
        mapCheckTypeVsReadyMax.keySet().forEach( checkType -> {
            mapOpeningCheckBedStatInfo.put(checkType, 0);
            mapOpeningReadyBedStatInfo.put(checkType, 0);
            mapOperatingCheckBedStatInfo.put(checkType, 0);
            mapOperatingReadyBedStatInfo.put(checkType, 0);
        });

        //开通的工位统计
        mapBedVsQueue.values().forEach( bedQueueBO -> {
            Integer[] checkTypes = bedQueueBO.getCheckTypes();
            Arrays.stream(checkTypes).forEach(checkType -> {
                if (bedQueueBO.opType == 0)
                    mapOpeningCheckBedStatInfo.put(checkType, mapOpeningCheckBedStatInfo.get(checkType) + 1 );
                else
                    mapOpeningReadyBedStatInfo.put(checkType, mapOpeningReadyBedStatInfo.get(checkType) + 1 );
            });
        });

        String openingBedInfo = "总数：" + mapBedVsQueue.size() + "  检查工位数: " + mapOpeningCheckBedStatInfo.toString() + "  领用工位数: " + mapOpeningReadyBedStatInfo.toString();

        //运营中工位统计
        HashSet<BedQueueBO> hashSetOperatingBedQueue = new HashSet<>();
        mapCheckTypeVsPriorityQueue.values().forEach(priorityQueue->{
            priorityQueue.stream().forEach(bedQueueBO -> hashSetOperatingBedQueue.add(bedQueueBO));
        });

        hashSetOperatingBedQueue.stream().forEach( bedQueueBO -> {
            Integer[] checkTypes = bedQueueBO.getCheckTypes();
            Arrays.stream(checkTypes).forEach(checkType -> {
                if (bedQueueBO.opType == 0)
                    mapOperatingCheckBedStatInfo.put(checkType, mapOperatingCheckBedStatInfo.get(checkType) + 1 );
                else
                    mapOperatingReadyBedStatInfo.put(checkType, mapOperatingReadyBedStatInfo.get(checkType) + 1 );
            });
        });

        String operatingBedInfo = "总数：" + hashSetOperatingBedQueue.size() + "  检查工位数: " + mapOperatingCheckBedStatInfo.toString() + "  领用工位数: " + mapOperatingReadyBedStatInfo.toString();

        return new String[]{openingBedInfo, operatingBedInfo};
    }

}