~yxh/ecg.git - Gitblit

eight

2025-04-14 c04653a6df7a4f9d3bd593f51ae9a8cd7ee93122

患者顺序 处理

已修改4个文件

	jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java	83 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/devrent/DevRentServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -40,30 +40,31 @@
    Integer getMaxSeqNum();

    @Select("SELECT * FROM lihu.queue where seq_num = #{seqNum}")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    QueueDO getQueueItemBySeqNum(@Param("seqNum")Integer seqNum);

    @Select("SELECT * FROM lihu.queue where pat_id = #{patId} and book_check_type = #{bookCheckType}")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    QueueDO getQueueByPatId(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
            "where room_id = #{roomId} and status in (" +
            " <foreach collection='statusList' separator=',' item='status'>" +
            " #{status} " +
            " </foreach> )" +
            " order by status desc, seq_num, book_timeslot" +
            "</script>")
    @Select("""
            <script>
                SELECT * FROM lihu.queue
                where room_id = #{roomId} and status in (
                 <foreach collection='statusList' separator=',' item='status'>
                   #{status} 
                 </foreach> )
                order by status desc, seq_num, create_time
            </script>
            """)
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
            "where room_id = #{roomId} and status in (" +
            " <foreach collection='statusList' separator=',' item='status'>" +
            " #{status} " +
            " </foreach> )" +
            " order by status desc, seq_num, create_time" +
            "</script>")
    List<QueueDO> getRoomInstallQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
@@ -73,7 +74,10 @@
            " </foreach> )" +
            " order by status desc, seq_num, book_timeslot" +
            "</script>")
    List<QueueDO> getQueueByStatus( @Param("statusList")List<Integer> statusList);
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getBigScreenQueueByStatus(@Param("statusList")List<Integer> statusList);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
@@ -84,6 +88,9 @@
            "    </foreach> )" +
            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
            "</script>")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getCurPatGivenCheckTypes(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType);

    @Select("<script>" +
@@ -96,6 +103,9 @@
            "  and status = #{status} " +
            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
            "</script>")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getCurPatGivenCheckTypesAndStatus(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("status")Integer status);

    @Select("<script>" +
@@ -111,6 +121,9 @@
            "    </foreach> ) " +
            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
            "</script>")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getCurPatGivenCheckTypesAndStatusList(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("statusList")List<Integer> statusList);

    @Select("<script>" +
@@ -122,6 +135,9 @@
            " limit #{size} " +
            " order by id" +
            "</script>")
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getPartialQueueByStatus( @Param("statusList")List<Integer> statusList, @Param("from") Integer from, @Param("size") Integer size);

    @Select("<script>" +
@@ -177,21 +193,26 @@
            "</script>")
    Integer bedQueueStatisticByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
            "where room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
            " <foreach collection='statusList' separator=',' item='status'>" +
            "   #{status} " +
            " </foreach> ) " +
            " order by status desc, seq_num, book_timeslot " +
            "</script>")
    @Select("""
            <script>
                SELECT * FROM lihu.queue 
                where room_id = #{roomId} and bed_no = #{bedNo} and status in (
                  <foreach collection='statusList' separator=',' item='status'>
                    #{status} 
                  </foreach> ) 
                order by status desc, seq_num, create_time 
            </script>
            """)
    @Results({
            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
    })
    List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);

    @Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, book_timeslot, create_time limit 1")
    QueueDO getFirstItemByBedAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
    @Select("""
            SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo}
               and status = #{curStatus} order by seq_num, create_time limit 1
            """)
    QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);

    // 某个诊室范围内 [已领用] [已召回-安装] 人员 抢占, 会更新 [工位号]
    // 没有限定检查类型，不要使用时间槽
@@ -202,7 +223,7 @@
            "       </foreach> )" +
            "       order by seq_num, create_time limit 1 " +
            "</script>" )
    QueueDO getFirstInstallItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
    QueueDO getRoomFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);

    @Select("<script> " +
            "select * from lihu.queue where appoint_id in ( " +
@@ -239,7 +260,7 @@
            "           <foreach collection='curStatusList' separator=',' item='status'>" +
            "             #{status} " +
            "           </foreach> )" +
            "       order by seq_num, book_timeslot, create_time limit 1 " +
            "       order by seq_num, create_time limit 1 " +
            "    ) a " +
            "  )" +
            "</script>"

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java

@@ -104,7 +104,7 @@
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
        queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
        List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
        List<QueueDO> queueDOList = queueMapper.getBigScreenQueueByStatus( queueStatusList );
        queueDOList.forEach(queueDO -> {
            List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
            columnQueueData.add( queueDO );
@@ -196,7 +196,7 @@
        queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
        queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
        List<QueueDO> queueDOList = queueMapper.getRoomInstallQueueByStatus(roomId, queueStatusList);
        List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);

        //把 [亲和的] 挪到主项后面
        List<QueueDO> affinityReceivedList = new ArrayList<>();

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

@@ -140,7 +140,7 @@
        //queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());

        QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
        QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(),
                                            createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
        // QueueStatusEnum.ONSTAGE  =>  QueueStatusEnum.FINISH
        firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());  // 默认状态 设置
@@ -227,7 +227,7 @@
        //        QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());

        // QueueStatusEnum.ONSTAGE  =>  QueueStatusEnum.RECEIVED
        QueueDO bedOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(
        QueueDO bedOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(
                createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus() );
        CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedOnStageQueueItem.getBookCheckType() );
        bedOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus());  // [已领用] 状态
@@ -315,7 +315,7 @@
        //        QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());

        // QueueStatusEnum.INSTALLING  =>  QueueStatusEnum.FINISH
        QueueDO bedInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(
        QueueDO bedInstallingQueueItem = queueMapper.getBedFirstQueueItemByStatus(
                            createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
        bedInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus());  // 默认状态 设置
        queueMapper.updateById( bedInstallingQueueItem );

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

@@ -260,7 +260,7 @@

    // 常规 或者 领用 时 医生 取下一位患者
    public ErrorCode nextPatient(Long roomId, String bedNo) {
        QueueDO firstReadyQueueItem = queueMapper.getFirstItemByBedAndStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
        QueueDO firstReadyQueueItem = queueMapper.getBedFirstQueueItemByStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
        // 该工位 没有 [候诊中中] 人员
        if (null == firstReadyQueueItem) {
            return QUEUE_NOT_READY_PATIENT;
@@ -281,7 +281,7 @@
    // 装机时 医生 取下一位患者
    public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
        // 从 DB 把 序号最小的 [已领用] [已召回-安装] 的人 设置为 [安装中]
        QueueDO firstItem = queueMapper.getFirstInstallItemByRoomAndStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
        QueueDO firstItem = queueMapper.getRoomFirstQueueItemByStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
        // 该工位 没有 [已领用] | [已召回-安装] 人员
        if (null == firstItem) {
            return QUEUE_NOT_READY_PATIENT;

			@@ -40,30 +40,31 @@
			Integer getMaxSeqNum();

			@Select("SELECT * FROM lihu.queue where seq_num = #{seqNum}")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			QueueDO getQueueItemBySeqNum(@Param("seqNum")Integer seqNum);

			@Select("SELECT * FROM lihu.queue where pat_id = #{patId} and book_check_type = #{bookCheckType}")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			QueueDO getQueueByPatId(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType);

			@Select("<script>" +
			"SELECT * FROM lihu.queue " +
			"where room_id = #{roomId} and status in (" +
			" <foreach collection='statusList' separator=',' item='status'>" +
			" #{status} " +
			" </foreach> )" +
			" order by status desc, seq_num, book_timeslot" +
			"</script>")
			@Select("""
			<script>
			SELECT * FROM lihu.queue
			where room_id = #{roomId} and status in (
			<foreach collection='statusList' separator=',' item='status'>
			#{status}
			</foreach> )
			order by status desc, seq_num, create_time
			</script>
			""")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);

			@Select("<script>" +
			"SELECT * FROM lihu.queue " +
			"where room_id = #{roomId} and status in (" +
			" <foreach collection='statusList' separator=',' item='status'>" +
			" #{status} " +
			" </foreach> )" +
			" order by status desc, seq_num, create_time" +
			"</script>")
			List<QueueDO> getRoomInstallQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);

			@Select("<script>" +
			"SELECT * FROM lihu.queue " +
			@@ -73,7 +74,10 @@
			" </foreach> )" +
			" order by status desc, seq_num, book_timeslot" +
			"</script>")
			List<QueueDO> getQueueByStatus( @Param("statusList")List<Integer> statusList);
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getBigScreenQueueByStatus(@Param("statusList")List<Integer> statusList);

			@Select("<script>" +
			"SELECT * FROM lihu.queue " +
			@@ -84,6 +88,9 @@
			" </foreach> )" +
			" and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
			"</script>")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getCurPatGivenCheckTypes(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType);

			@Select("<script>" +
			@@ -96,6 +103,9 @@
			" and status = #{status} " +
			" and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
			"</script>")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getCurPatGivenCheckTypesAndStatus(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("status")Integer status);

			@Select("<script>" +
			@@ -111,6 +121,9 @@
			" </foreach> ) " +
			" and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
			"</script>")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getCurPatGivenCheckTypesAndStatusList(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("statusList")List<Integer> statusList);

			@Select("<script>" +
			@@ -122,6 +135,9 @@
			" limit #{size} " +
			" order by id" +
			"</script>")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getPartialQueueByStatus( @Param("statusList")List<Integer> statusList, @Param("from") Integer from, @Param("size") Integer size);

			@Select("<script>" +
			@@ -177,21 +193,26 @@
			"</script>")
			Integer bedQueueStatisticByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);

			@Select("<script>" +
			"SELECT * FROM lihu.queue " +
			"where room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
			" <foreach collection='statusList' separator=',' item='status'>" +
			" #{status} " +
			" </foreach> ) " +
			" order by status desc, seq_num, book_timeslot " +
			"</script>")
			@Select("""
			<script>
			SELECT * FROM lihu.queue
			where room_id = #{roomId} and bed_no = #{bedNo} and status in (
			<foreach collection='statusList' separator=',' item='status'>
			#{status}
			</foreach> )
			order by status desc, seq_num, create_time
			</script>
			""")
			@Results({
			@Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
			})
			List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);

			@Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, book_timeslot, create_time limit 1")
			QueueDO getFirstItemByBedAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
			@Select("""
			SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo}
			and status = #{curStatus} order by seq_num, create_time limit 1
			""")
			QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);

			// 某个诊室范围内 [已领用] [已召回-安装] 人员抢占, 会更新 [工位号]
			// 没有限定检查类型，不要使用时间槽
			@@ -202,7 +223,7 @@
			" </foreach> )" +
			" order by seq_num, create_time limit 1 " +
			"</script>" )
			QueueDO getFirstInstallItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
			QueueDO getRoomFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);

			@Select("<script> " +
			"select * from lihu.queue where appoint_id in ( " +
			@@ -239,7 +260,7 @@
			" <foreach collection='curStatusList' separator=',' item='status'>" +
			" #{status} " +
			" </foreach> )" +
			" order by seq_num, book_timeslot, create_time limit 1 " +
			" order by seq_num, create_time limit 1 " +
			" ) a " +
			" )" +
			"</script>"

			@@ -104,7 +104,7 @@
			queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
			queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
			queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
			List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
			List<QueueDO> queueDOList = queueMapper.getBigScreenQueueByStatus( queueStatusList );
			queueDOList.forEach(queueDO -> {
			List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
			columnQueueData.add( queueDO );
			@@ -196,7 +196,7 @@
			queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
			queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
			queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
			List<QueueDO> queueDOList = queueMapper.getRoomInstallQueueByStatus(roomId, queueStatusList);
			List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);

			//把 [亲和的] 挪到主项后面
			List<QueueDO> affinityReceivedList = new ArrayList<>();

			@@ -140,7 +140,7 @@
			//queueMapper.updateBedQueueStatus(createReqVO.getRoomId(), createReqVO.getBedNo(),
			// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());

			QueueDO firstOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(createReqVO.getRoomId(),
			QueueDO firstOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(createReqVO.getRoomId(),
			createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus());
			// QueueStatusEnum.ONSTAGE => QueueStatusEnum.FINISH
			firstOnStageQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 默认状态设置
			@@ -227,7 +227,7 @@
			// QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.RECEIVED.getStatus());

			// QueueStatusEnum.ONSTAGE => QueueStatusEnum.RECEIVED
			QueueDO bedOnStageQueueItem = queueMapper.getFirstItemByBedAndStatus(
			QueueDO bedOnStageQueueItem = queueMapper.getBedFirstQueueItemByStatus(
			createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.ONSTAGE.getStatus() );
			CheckTypeDO checkTypeDO = queueServiceTxFunctions.getCheckTypeItem( bedOnStageQueueItem.getBookCheckType() );
			bedOnStageQueueItem.setStatus(QueueStatusEnum.RECEIVED.getStatus()); // [已领用] 状态
			@@ -315,7 +315,7 @@
			// QueueStatusEnum.INSTALLING.getStatus(), QueueStatusEnum.FINISH.getStatus());

			// QueueStatusEnum.INSTALLING => QueueStatusEnum.FINISH
			QueueDO bedInstallingQueueItem = queueMapper.getFirstItemByBedAndStatus(
			QueueDO bedInstallingQueueItem = queueMapper.getBedFirstQueueItemByStatus(
			createReqVO.getRoomId(), createReqVO.getBedNo(), QueueStatusEnum.INSTALLING.getStatus());
			bedInstallingQueueItem.setStatus(QueueStatusEnum.FINISH.getStatus()); // 默认状态设置
			queueMapper.updateById( bedInstallingQueueItem );

			@@ -260,7 +260,7 @@

			// 常规或者领用时医生取下一位患者
			public ErrorCode nextPatient(Long roomId, String bedNo) {
			QueueDO firstReadyQueueItem = queueMapper.getFirstItemByBedAndStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
			QueueDO firstReadyQueueItem = queueMapper.getBedFirstQueueItemByStatus(roomId, bedNo, QueueStatusEnum.READY.getStatus());
			// 该工位没有 [候诊中中] 人员
			if (null == firstReadyQueueItem) {
			return QUEUE_NOT_READY_PATIENT;
			@@ -281,7 +281,7 @@
			// 装机时医生取下一位患者
			public ErrorCode nextInstallPatient(Long roomId, String bedNo) {
			// 从 DB 把序号最小的 [已领用] [已召回-安装] 的人设置为 [安装中]
			QueueDO firstItem = queueMapper.getFirstInstallItemByRoomAndStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
			QueueDO firstItem = queueMapper.getRoomFirstQueueItemByStatus(roomId, List.of(QueueStatusEnum.RECEIVED.getStatus(), QueueStatusEnum.RECALLED_INSTALL.getStatus()));
			// 该工位没有 [已领用] \| [已召回-安装] 人员
			if (null == firstItem) {
			return QUEUE_NOT_READY_PATIENT;