From aadbf9b0e34baa8221ba7b2b555d1fdd2ecc9340 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 11:27:20 +0800
Subject: [PATCH] 有亲和项的 安装项目 叫号问题 修复
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 10 ++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 5 ++++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
index 1dac181..bf2767e 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
+++ b/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} " +
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 3f8911a..ce48544 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/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<>();
--
Gitblit v1.9.3