有亲和项的 安装项目 叫号问题 修复

eight

2025-04-14 aadbf9b0e34baa8221ba7b2b555d1fdd2ecc9340

有亲和项的 安装项目 叫号问题 修复

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

@@ -57,6 +57,16 @@

    @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> getRoomQueueByStatusAndInstallOrder(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);

    @Select("<script>" +
            "SELECT * FROM lihu.queue " +
            "where status in (" +
            " <foreach collection='statusList' separator=',' item='status'>" +
            "  #{status} " +

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

@@ -175,6 +175,9 @@
        return queueDOList;
    }

    /**
     * 诊间屏 安装患者列表
     */
    @Override
    public List<QueueDO> getRoomInstallRelatedPatient(String ip, Long roomId) {
        if (null == roomId) {
@@ -193,7 +196,7 @@
        queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
        queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
        queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
        List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, queueStatusList);
        List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatusAndInstallOrder(roomId, queueStatusList);

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