From 6f9f5260a6ccf2fb653707f54b44bc5f111d684a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 14:58:34 +0800
Subject: [PATCH] 移除 已不用的字段

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
index 4a5e580..a99128c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java
@@ -31,6 +31,9 @@
                 .orderByDesc(RoomDO::getId));
     }
 
+    @Select("select * from lihu.clinic_room where ip = #{ip}")
+    List<RoomDO> queueByIp(@Param("ip") String ip);
+
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus}, doc_id=null, doc_name=null " +
             " where 1 = 1 " +
@@ -54,28 +57,38 @@
     RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId);
 
     @Update("<script> " +
+            "update lihu.clinic_room set status=#{newStatus.status} " +
+            " where room_id=#{roomId} and bed_no=#{bedNo} and isNull(doc_id) " +
+            " and status in ( " +
+            "  <foreach collection='curStatusList' separator=',' item='curStatus'>" +
+            "   #{curStatus.status} " +
+            "  </foreach> );" +
+            "</script>")
+    Integer setBedOpeningOpening(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+
+    @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null " +
-            "where room_id=#{roomId} and bed_no=#{bedNo} " +
-            "and status in ( " +
-            " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
-            "  #{curStatus.status} " +
-            " </foreach> );" +
+            " where room_id=#{roomId} and bed_no=#{bedNo} and isNull(doc_id) " +
+            " and status in ( " +
+            "  <foreach collection='curStatusList' separator=',' item='curStatus'>" +
+            "   #{curStatus.status} " +
+            "  </foreach> );" +
             "</script>")
     Integer setBedOpeningClosed(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
 
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status} " +
-            "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId} and doc_name=#{docName}" +
+            "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId} " +
             "and status in ( " +
             " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
             "  #{curStatus.status} " +
             " </foreach> );" +
             "</script>")
-    Integer setBedDoctorPause(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("docName")String docName, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+    Integer setBedDoctorStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
 
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status}, doc_id=#{docId}, doc_name=#{docName} " +
-            "where room_id=#{roomId} and bed_no=#{bedNo} " +
+            "where room_id=#{roomId} and bed_no=#{bedNo} and isNull(doc_id)" +
             "and status in ( " +
             " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
             "  #{curStatus.status} " +
@@ -85,11 +98,11 @@
 
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null " +
-            "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId} and doc_name=#{docName}" +
+            "where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId} " +
             "and status in ( " +
             " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
             "  #{curStatus.status} " +
             " </foreach> );" +
             "</script>")
-    Integer setBedDoctorOff(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("docName")String docName, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+    Integer setBedDoctorOff(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
 }

--
Gitblit v1.9.3