From 647095a34d62db02533cf9c121436900b51c757c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 十月 2024 15:07:13 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 65326de..f352a2f 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
@@ -6,10 +6,7 @@
 import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX;
 import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
 import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
@@ -31,9 +28,12 @@
                 .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 " +
+            " where deleted = 0 " +
             "</script>")
     Integer resetRoom(@Param("newStatus") Integer newStatus);
 
@@ -41,17 +41,29 @@
     List<RoomStatisticsDO> roomStatistic();
 
     @Select("<script> " +
-            "SELECT id, room_id, room_name, bed_no, status, doc_id, doc_name FROM lihu.clinic_room " +
+            "SELECT * FROM lihu.clinic_room " +
             "where status in ( " +
                     " <foreach collection='curStatusList' separator=',' item='curStatus'>" +
                     "  #{curStatus.status} " +
                     " </foreach> )" +
             " and deleted = 0;" +
             "</script>")
+    @Results({
+            @Result(property = "checkTypes", column = "check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<RoomDO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList);
 
+    @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo}")
+    @Results({
+        @Result(property = "checkTypes", column = "check_types", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
+    RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo);
+
     @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId}")
-    RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId);
+    RoomDO getRoomByRoomBedDoc(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId);
+
+    @Select("SELECT * FROM lihu.clinic_room where doc_id=#{docId} limit 1")
+    RoomDO getRoomByDocId(@Param("docId")Long docId);
 
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status} " +

--
Gitblit v1.9.3