From a889b1c990595980888744feef2268c7bf60fc77 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 18:10:56 +0800
Subject: [PATCH] fix open & close logic
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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 83214ce..3863bb2 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,8 +31,11 @@
.orderByDesc(RoomDO::getId));
}
- @Update(" update lihu.clinic_room set status=#{newStatus.status}, doc_id=null, doc_name=null")
- Integer resetRoom(@Param("newStatus") BedStatusEnum newStatus);
+ @Update("<script> " +
+ "update lihu.clinic_room set status=#{newStatus}, doc_id=null, doc_name=null " +
+ " where 1 = 1 " +
+ "</script>")
+ Integer resetRoom(@Param("newStatus") Integer newStatus);
@Select({ "SELECT room_id, room_name, count(1) as bed_num FROM lihu.clinic_room group by room_id;" })
List<RoomStatisticsDO> roomStatistic();
@@ -51,23 +54,34 @@
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 status in ( " +
- " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
- " #{curStatus.status} " +
- " </foreach> );" +
+ "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 = null " +
+ " and status in ( " +
+ " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
+ " #{curStatus.status} " +
+ " </foreach> );" +
"</script>")
- Integer setBedStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("newStatus") BedStatusEnum newStatus, @Param("curStatusList") List<BedStatusEnum> curStatusList);
+ 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 doc_id != null " +
+ " 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} " +
@@ -81,11 +95,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