liusheng
16 小时以前 971bd30b611531464d7a878352e453ab4511f93f
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java
@@ -8,11 +8,12 @@
import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.devrent.DevRentDO;
import cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper;
import cn.lihu.jh.module.ecg.dal.mysql.appointment.AppointmentMapper;
import cn.lihu.jh.module.ecg.dal.mysql.devrent.DevRentMapper;
import cn.lihu.jh.module.ecg.enums.DevRentStateEnum;
import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -29,6 +30,7 @@
import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.queue.QueueMapper;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
@@ -57,7 +59,7 @@
    private RoomMapper roomMapper;
    @Resource
    private CallMapper callMapper;
    private AppointmentMapper appointmentMapper;
    @Resource
    private DevRentMapper devRentMapper;
@@ -94,7 +96,7 @@
    @Override
    public ErrorCode startBedOpen(Long roomId, String roomName, String bedNo) {
        Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(queueServiceTxFunctions, roomId, roomName, bedNo));
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedOpenCallable(queueServiceTxFunctions, roomId, roomName, bedNo));
        try {
            ErrorCode ret = future.get();
@@ -111,7 +113,7 @@
    @Override
    public ErrorCode startBedClose(Long roomId, String bedNo) {
        Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(queueServiceTxFunctions, roomId, bedNo));
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedCloseCallable(queueServiceTxFunctions, roomId, bedNo));
        try {
            ErrorCode ret = future.get();
@@ -128,9 +130,7 @@
    @Override
    public ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
            new BedDoctorPauseCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorPauseCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
        try {
            ErrorCode ret = future.get();
@@ -147,9 +147,7 @@
    @Override
    public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
            new BedDoctorResumeCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorResumeCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
        try {
            ErrorCode ret = future.get();
@@ -166,9 +164,7 @@
    @Override
    public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
            new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOnCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
        try {
            ErrorCode ret = future.get();
@@ -185,9 +181,7 @@
    @Override
    public ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
            new BedDoctorOffCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorOffCallable(queueServiceTxFunctions, roomId, bedNo, docId, docName));
        try {
            ErrorCode ret = future.get();
@@ -204,9 +198,7 @@
    @Override
    public ErrorCode startNextPatient(Long roomId, String bedNo) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
                new BedDoctorNextPatientCallable(queueServiceTxFunctions, roomId, bedNo)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorNextPatientCallable(queueServiceTxFunctions, roomId, bedNo));
        try {
            ErrorCode ret = future.get();
@@ -223,9 +215,7 @@
    @Override
    public ErrorCode startNextInstallPatient(Long roomId, String bedNo) {
        Future<ErrorCode> future = singleThreadExecutor.submit(
                new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo)
        );
        Future<ErrorCode> future = singleThreadExecutor.submit(new BedDoctorNextInstallPatientCallable(queueServiceTxFunctions, roomId, bedNo));
        try {
            ErrorCode ret = future.get();
@@ -242,21 +232,21 @@
    @Override
    public void startHurryUpOneBed(Long roomId, String bedNo) {
        singleThreadExecutor.execute( () -> {
        singleThreadExecutor.execute(() -> {
            queueServiceTxFunctions.hurryupOneBed(roomId, bedNo);
        });
    }
    @Override
    public void startHurryUpOneCheckType(Integer checkType) {
        singleThreadExecutor.execute( () -> {
            queueServiceTxFunctions.hurryupOneCheckType( checkType );
        singleThreadExecutor.execute(() -> {
            queueServiceTxFunctions.hurryupOneCheckType(checkType);
        });
    }
    @Override
    public void startBedReload() {
        singleThreadExecutor.execute( () -> {
        singleThreadExecutor.execute(() -> {
            queueServiceTxFunctions.bedReload();
            queueServiceTxFunctions.hurryupAllBed();
            queueServiceTxFunctions.monitorInfo();
@@ -265,7 +255,7 @@
    @Override
    public void startResetRoom(Boolean needCloseBed) {
        singleThreadExecutor.execute( () -> {
        singleThreadExecutor.execute(() -> {
            queueServiceTxFunctions.resetRoom(needCloseBed);
            queueServiceTxFunctions.bedReload();
            queueServiceTxFunctions.monitorInfo();
@@ -284,8 +274,8 @@
            return error(ROOM_NOT_SIT);
        }
        BedQueueBO bedQueueBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
        if (null == bedQueueBO) {
        BedBO bedBO = queueServiceTxFunctions.getBedQueueBO(roomId, bedNo);
        if (null == bedBO) {
            log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
            return error(QUEUE_BED_NOT_EXIST);
        }
@@ -307,12 +297,17 @@
    @Override
    public PageResult<QueueDO> getqueuePage(QueuePageReqVO pageReqVO) {
        return queueMapper.selectPage(pageReqVO);
        PageResult<QueueDO> queueDOPageResult = queueMapper.selectPage(pageReqVO);
        queueDOPageResult.getList().forEach(queueDO -> {
            queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
        });
        return queueDOPageResult;
    }
    /**
     * 预约确认后的排队
     *
     * @param queueSaveReqVO
     */
    @Override
@@ -322,8 +317,8 @@
        queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus());
        // 处理 检查项目.亲和性 逻辑
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( queueSaveReqVO.getBookCheckType() );
        if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(queueSaveReqVO.getBookCheckType());
        if (checkTypeDO.getAffinityCheckTypes().length > 0) {
            procAffinityWhenQueue(/*IN,OUT*/queueSaveReqVO, checkTypeDO.getAffinityCheckTypes());
        }
@@ -331,12 +326,19 @@
        queueMapper.insert(queue);
        DevRentDO devRent = BeanUtils.toBean(queueSaveReqVO, DevRentDO.class);
        devRent.setState( DevRentStateEnum.FREE.getState() );
        devRent.setPatDetails( queueSaveReqVO.getPatDetails() );
        devRent.setCheckType( queueSaveReqVO.getBookCheckType() );
        devRent.setApplyNo(queueSaveReqVO.getApplyNo());
        devRent.setEpisodeId(queueSaveReqVO.getEpisodeId());
        devRent.setState(DevRentStateEnum.FREE.getState());
        devRent.setPatDetails(queueSaveReqVO.getPatDetails());
        devRent.setCheckType(queueSaveReqVO.getBookCheckType());
        devRentMapper.insert(devRent);
        startHurryUpOneCheckType( queue.getBookCheckType() );
        startHurryUpOneCheckType(queue.getBookCheckType());
    }
    @Override
    public List<QueueDO> selectBookSeqNumByAppointIdList(List<Long> appointIdList) {
        return queueMapper.selectBookSeqNumByAppointIdList(appointIdList);
    }
    // 常规检查 叫号
@@ -350,8 +352,7 @@
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
        if ( num != null && num > 0)
            return;
        if (num != null && num > 0) return;
        startNextPatient(roomId, bedNo);
    }
@@ -363,8 +364,7 @@
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
        if ( num != null && num > 0)
            return;
        if (num != null && num > 0) return;
        startNextPatient(roomId, bedNo);
    }
@@ -376,16 +376,20 @@
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
        Integer num = queueMapper.bedQueueStatisticByStatus(roomId, bedNo, queueStatusList);
        if ( num != null && num > 0)
            return;
        if (num != null && num > 0) return;
        startNextInstallPatient(roomId, bedNo);
    }
    @Override
    public void passWaitingPatient(String patId, Integer bookCheckType) {
        // 从 DB 把 排队中的人 设置为 过号-排队中
        Integer ret = queueMapper.updatePatientQueueStatus(patId, bookCheckType, QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.PASSED_WAITING.getStatus());
    }
    public void passNextPatient(Long roomId, String bedNo) {
        // 从 DB 把 就诊中的人 设置为过号
        Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
                QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
        Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
        startNextPatient(roomId, bedNo);
    }
@@ -393,20 +397,30 @@
    @Override
    public void passInstallNextPatient(Long roomId, String bedNo) {
        // 从 DB 把 [安装中]的人 设置为 [过号-安装]
        Integer ret =  queueMapper.updateBedQueueStatus(roomId, bedNo,
                QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus());
        Integer ret = queueMapper.updateBedQueueStatus(roomId, bedNo, QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.PASSED_INSTALL.getStatus());
        startNextPatient(roomId, bedNo);
    }
    public List<QueueDO> getBedQueueByStatus(Long roomId, String bedNo, List<Integer> statusList) {
        List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, statusList);
        if (!CollectionUtils.isEmpty(queueDOList)) {
            queueDOList.forEach(queueDO -> {
                queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
            });
        }
        return queueDOList;
    }
    @Override
    public List<QueueDO> getRoomQueueByStatus(Long roomId, List<Integer> statusList) {
        List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
        if (!CollectionUtils.isEmpty(queueDOList)) {
            queueDOList.forEach(queueDO -> {
                queueDO.setTolerance(appointmentMapper.getByApplyNo(queueDO.getApplyNo()).getTolerance());
            });
        }
        return queueDOList;
    }
@@ -447,15 +461,23 @@
        });
        // 装机界面:统计 该诊室 [已领用] 的数量, 因为安装工位看不到 [已领用] 患者,所以无法根据装机工位来统计,只能按诊室统计
        patientStatisticVO.setReceivedNum( 0 );
        patientStatisticVO.setReceivedNum(0);
        List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
        roomQueueStatisticDOList.forEach(item -> {
            if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
                patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
                patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
            }
        });
        return patientStatisticVO;
    }
    @Override
    public Integer recallPassWaitingPatient(String patId, Integer bookCheckType) {
        // 从 DB 把 过号-排队中的人 设置为 排队中
        Integer ret = queueMapper.updatePatientQueueStatus(patId, bookCheckType, QueueStatusEnum.PASSED_WAITING.getStatus(), QueueStatusEnum.WAITING.getStatus());
        return ret;
    }
    public PatientStatisticVO getBedDevReadyStatistic(Long roomId, String bedNo) {
@@ -470,15 +492,15 @@
        });
        // 领用界面:统计 该诊室 [已领用] 的数量, 因为安装时患者归属工位从领用工位变更到安装工位,所以无法根据领用工位来统计,只能按诊室统计
        patientStatisticVO.setReceivedNum( 0 );
        patientStatisticVO.setReceivedNum(0);
        List<BedQueueStatisticDO> roomQueueStatisticDOList = queueMapper.roomQueueStatistic(roomId);
        roomQueueStatisticDOList.forEach(item -> {
            if (QueueStatusEnum.RECEIVED.getStatus() == item.getStatus()) {
                patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
                patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
            } else if (QueueStatusEnum.INSTALLING.getStatus() == item.getStatus()) {
                patientStatisticVO.setReceivedNum( patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
                patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
            } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
                patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus() );
                patientStatisticVO.setReceivedNum(patientStatisticVO.getReceivedNum() + item.getTotalInStatus());
            }
        });
@@ -494,12 +516,11 @@
    }
    public void initCheckType() {
        queueServiceTxFunctions.initCheckType( );
        queueServiceTxFunctions.initCheckType();
    }
    public void startBiz() {
        if (1 == queueServiceTxFunctions.getOpeningFlag())
            return;
        if (1 == queueServiceTxFunctions.getOpeningFlag()) return;
        queueServiceTxFunctions.setOpeningFlag(1);
        startBedReload();
@@ -512,8 +533,7 @@
    @Override
    public Integer recallPatient(Long roomId, String bedNo, String patId, Integer checkType) {
        Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId, checkType,
                QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
        Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId, checkType, QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus());
        // 检查项目.亲和性 不需要在这里处理
        // 会在 HurryUpOnBed 里面处理 检查项目.亲和性
@@ -524,13 +544,12 @@
    @Override
    public Integer recallInstallPatient(Long roomId, String bedNo, String patId, Integer checkType, Long roomId_operator, String bedNo_operator) {
        Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo_operator, patId, checkType,
                QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus());
        Integer updateNum = queueMapper.recallPassedInstallPatient(roomId, bedNo_operator, patId, checkType, QueueStatusEnum.PASSED_INSTALL.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus());
        // 检查项目.亲和性 处理
        if (null != updateNum && 1 == updateNum) {
            CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( checkType );
            if ( checkTypeDO.getAffinityCheckTypes().length > 0) {
            CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem(checkType);
            if (checkTypeDO.getAffinityCheckTypes().length > 0) {
                procAffinityWhenInstallRecall(patId, checkTypeDO.getAffinityCheckTypes(), roomId_operator, bedNo_operator);
            }
        }
@@ -540,34 +559,42 @@
        return updateNum;
    }
    /**
     * 加急
     *
     * @param patId
     * @param jumped
     * @return
     */
    @Override
    public Integer patientJump(String patId, Byte jumped) {
        Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
    public Integer patientJump(String patId, Integer bookCheckType, Byte jumped) {
        Integer updateNum = queueMapper.queueJump(patId, bookCheckType, QueueStatusEnum.WAITING.getStatus(), jumped);
        QueueDO queueDO = queueMapper.getQueueByPatId(patId);
        QueueDO queueDO = queueMapper.getQueueByPatId(patId, bookCheckType);
        startHurryUpOneCheckType(Integer.valueOf(queueDO.getBookCheckType()));
        return updateNum;
    }
    @Override
    public RoomDO getDocRoomInfo(Long docId) {
    public List<RoomDO> getDocRoomInfo(Long docId) {
        return roomMapper.getRoomByDocId(docId);
    }
    /**
     * 获取 指定工位 待检查|待领用的人
     * 获取 指定工位  【检查|领用】相关的患者
     *
     * @param roomId
     * @param bedNo
     * @return
     */
    @Override
    public List<QueueDO> getToBeCheckedPatient(Long roomId, String bedNo) {
    public List<QueueDO> getCheckRelatedPatient(Long roomId, String bedNo) {
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
        queueStatusList.add(QueueStatusEnum.READY.getStatus());
        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
        queueStatusList.add(QueueStatusEnum.AFFINITY_WAITING.getStatus());
        queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
        List<QueueDO> queueDOList = getBedQueueByStatus(roomId, bedNo, queueStatusList);
        //把 [亲和的] 挪到主项后面
@@ -575,14 +602,14 @@
        ListIterator<QueueDO> iterator = queueDOList.listIterator();
        while (iterator.hasNext()) {
            QueueDO item = iterator.next();
            if (item.getStatus() == QueueStatusEnum.AFFINITY_WAITING.getStatus()) {
            if (item.getStatus() == QueueStatusEnum.AFFINITY.getStatus()) {
                iterator.remove();
                affinityWaitingList.add(item);
            }
        }
        affinityWaitingList.forEach( affinityWaitingItem -> {
            for (int i = queueDOList.size()-1; i >= 0; i--) {
                if ( affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
        affinityWaitingList.forEach(affinityWaitingItem -> {
            for (int i = queueDOList.size() - 1; i >= 0; i--) {
                if (affinityWaitingItem.getSeqNum() == queueDOList.get(i).getSeqNum()) {
                    queueDOList.add(i + 1, affinityWaitingItem);
                    break;
                }
@@ -592,32 +619,39 @@
        return queueDOList;
    }
    /**
     * 获取 指定工位  【安装】相关的患者
     *
     * @param roomId
     * @param bedNo
     * @return
     */
    @Override
    public List<QueueDO> getToBeInstalledPatient(Long roomId, String bedNo) {
    public List<QueueDO> getInstallRelatedPatient(Long roomId, String bedNo) {
        List<Integer> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
        queueStatusList.add(QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
        List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList);
        queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
        List<QueueDO> queueDOList = getRoomQueueByStatus(roomId, queueStatusList); // 可以看到本诊室 待安装的患者
        queueStatusList.clear();
        queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
        queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList) );
        queueDOList.addAll(0, getBedQueueByStatus(roomId, bedNo, queueStatusList)); // 当前工位的
        //把 [亲和的] 挪到主项后面
        List<QueueDO> affinityReceivedList = new ArrayList<>();
        ListIterator<QueueDO> iterator = queueDOList.listIterator();
        while (iterator.hasNext()) {
            QueueDO item = iterator.next();
            if (item.getStatus() == QueueStatusEnum.AFFINITY_RECEIVED.getStatus()) {
            if (item.getStatus() == QueueStatusEnum.AFFINITY_INSTALL.getStatus()) {
                iterator.remove();
                affinityReceivedList.add(item);
            }
        }
        affinityReceivedList.forEach( affinityReceivedItem -> {
            for (int i = queueDOList.size()-1; i >= 0; i--) {
                if ( affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum() ) {
        affinityReceivedList.forEach(affinityReceivedItem -> {
            for (int i = queueDOList.size() - 1; i >= 0; i--) {
                if (affinityReceivedItem.getSeqNum() == queueDOList.get(i).getSeqNum()) {
                    queueDOList.add(i + 1, affinityReceivedItem);
                    break;
                }
@@ -628,33 +662,36 @@
    }
    private RoomDO getRoomDO(Long roomId, String bedNo) {
        RoomDO roomDO = mapRoomBed.get( Utils.formatRoomBed(roomId, bedNo) );
        if ( null == roomDO)
            roomDO = roomMapper.getRoom(roomId, bedNo);
        RoomDO roomDO = mapRoomBed.get(Utils.formatRoomBed(roomId, bedNo));
        if (null == roomDO) roomDO = roomMapper.getRoom(roomId, bedNo);
        return roomDO;
    }
    /**
     * 装机召回,是抢占式的,会改变装机工位
     */
    private void procAffinityWhenInstallRecall(String patId, Integer[] affinityCheckTypes, Long roomId_operator, String bedNo_operator) {
        List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(
                        patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_RECEIVED.getStatus());
        List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatus(patId, affinityCheckTypes, QueueStatusEnum.AFFINITY_INSTALL.getStatus());
        for (int i = 0; i < affinityItems.size(); i++) {
            QueueDO queueItem = affinityItems.get(i);
            queueItem.setRoomId( roomId_operator );
            queueItem.setBedNo( bedNo_operator );
            queueItem.setRoomId(roomId_operator);
            queueItem.setBedNo(bedNo_operator);
            //queueItem.setSeqNum( preemptQueueItem.getSeqNum() );  // 装机时 内部序号不变 故不需更新
            queueMapper.updateById(queueItem);
        }
    }
    /**
     * 预约确认后,主动寻求依附
     */
    private void procAffinityWhenQueue(/*IN, OUT*/QueueSaveReqVO queueSaveReqVO, Integer[] affinityCheckTypes) {
        // 如果存在 处于 [就诊准备中] | [就诊中] 的亲和项,则跟随其中一个亲和项
        List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatusList(
                queueSaveReqVO.getPatId(), affinityCheckTypes,
                List.of(QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus()));
        // 如果存在 [候诊中] [就诊中] [过号] [已召回] 能被依附的检查项,则依附到其中一个
        List<QueueDO> affinityItems = queueMapper.getCurPatGivenCheckTypesAndStatusList(queueSaveReqVO.getPatId(), affinityCheckTypes, List.of(QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.RECALLED.getStatus()));
        if (!affinityItems.isEmpty()) {
            QueueDO queueItem = affinityItems.get(0);
            queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY_WAITING.getStatus()); // [亲和-排队] 状态
            queueSaveReqVO.setStatus(QueueStatusEnum.AFFINITY.getStatus()); // [亲和-排队] 状态
            queueSaveReqVO.setAffinityItem(1);
            queueSaveReqVO.setRoomId(queueItem.getRoomId());
            queueSaveReqVO.setRoomName(queueItem.getRoomName());
            queueSaveReqVO.setBedNo(queueItem.getBedNo());