From 01a81beea99c0298a3b6178c7796f4c27b30c6c7 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 四月 2025 14:27:50 +0800
Subject: [PATCH] pat detail.  新增 appontment_id

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 acf2165..91a56e2 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
@@ -9,7 +9,6 @@
 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;
 import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
 
 /**
@@ -37,17 +36,18 @@
             "</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();
-
     @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;" +
+            " and deleted = 0" +
+            " order by room_id;" +
             "</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}")
@@ -59,8 +59,8 @@
     @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{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);
+    @Select("SELECT * FROM lihu.clinic_room where doc_id=#{docId}")
+    List<RoomDO> getRoomByDocId(@Param("docId")Long docId);
 
     @Update("<script> " +
             "update lihu.clinic_room set status=#{newStatus.status} " +

--
Gitblit v1.9.3