From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 47cd7ca..bd19244 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
@@ -27,7 +27,7 @@
.eqIfPresent(QueueDO::getBookTimeslot, reqVO.getBookTimeslot())
.eqIfPresent(QueueDO::getBookCheckType, reqVO.getBookCheckType())
.eqIfPresent(QueueDO::getSeqNum, reqVO.getSeqNum())
- .eqIfPresent(QueueDO::getStatus, reqVO.getStatus())
+ .inIfPresent(QueueDO::getStatus, reqVO.getStatus())
.eqIfPresent(QueueDO::getPassed, reqVO.getPassed())
.eqIfPresent(QueueDO::getExpired, reqVO.getExpired())
.eqIfPresent(QueueDO::getRoomId, reqVO.getRoomId())
@@ -210,11 +210,15 @@
@Param("curStatus")Integer curStatus);
*/
+ @Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and book_check_type = #{checkType} and status = #{curStatus}; " )
+ Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("checkType")Integer checkType, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
@Update("update lihu.queue set status = #{newStatus} where status = #{curStatus} and seq_num = \n" +
"(select a.min_seq_num from \n" +
" (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus}) a )")
Integer updateBedQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+ // 寮冪敤鍘熷洜锛氶渶瑕佸厛鑾峰彇锛屽垽鏂�昏緫澶勭悊鍚庯紝鍐嶆洿鏂�
// 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
// 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
@Update("<script> " +
@@ -232,9 +236,6 @@
)
Integer preemptToBeInstalledPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatusList")List<Integer> curStatusList, @Param("newStatus")Integer newStatus);
- @Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and status = #{curStatus}")
- Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
-
// 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰
@Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
" bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
@@ -244,6 +245,22 @@
@Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
@Param("checkType")Integer checkType);
+ // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰 鏍规嵁 澶氫釜妫�鏌ラ」鐩�
+ @Update("<script>" +
+ "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} " +
+ " and book_check_type in ( " +
+ " <foreach collection='checkTypeArray' separator=',' item='_checkType'>" +
+ " #{_checkType} " +
+ " </foreach> )" +
+ " order by jump_flag desc, book_timeslot, create_time limit 1) a) " +
+ "</script>")
+ Integer preemptWaitingPatientWithBedCheckTypes(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
+ @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
+ @Param("checkTypeArray")Integer[] checkTypeArray);
+
@Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum} " +
" where id = " +
" (select a.id from \n" +
--
Gitblit v1.9.3