From cac7f142c909d712d6d49c45b0d4efbdef673e48 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 13 十一月 2024 16:25:16 +0800
Subject: [PATCH] 过号 - 检查项目.亲和性

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   19 +++++++++++++++----
 1 files changed, 15 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 d79bc05..7592e6b 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
@@ -174,6 +174,15 @@
             "</script>" )
     QueueDO getFirstItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
 
+
+/*
+    @Select("select * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
+            " and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    QueueDO XXX(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                       @Param("patId")String patId, @Param("checkType")Integer checkType,
+                                       @Param("curStatus")Integer curStatus);
+*/
+
     @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 )")
@@ -220,14 +229,16 @@
 
     // 甯歌妫�鏌� 鎴� 棰嗙敤 鐨勬偅鑰呭彫鍥�, 鍘熷伐浣嶅鐞�
     @Update("update lihu.queue set status = #{newStatus}, passed = 1 " +
-            " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} ")
-    Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
+            " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                @Param("patId")String patId, @Param("checkType")Integer checkType,
                                 @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
 
     // 瑁呮満鍖荤敓 鍏佽鎶㈠崰 鏈瀹� [瀹夎杩囧彿] 鐨勬偅鑰�
     @Update("update lihu.queue set status = #{newStatus}, bed_no = #{bedNo}, passed = 1 " +
-            " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} ")
-    Integer recallPassedInstallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
+            " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    Integer recallPassedInstallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                       @Param("patId")String patId, @Param("checkType")Integer checkType,
                                 @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
 
     @Update("update lihu.queue set jump_flag = #{jumped} " +

--
Gitblit v1.9.3