补充提交

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/asphyxiationbychoking/ElderlyAsphyxiationByChokingRespVO.java

@@ -25,6 +25,9 @@ public class ElderlyAsphyxiationByChokingRespVO {
     @Schema(description = "长者姓名")
     private String elderName;
 
+    @Schema(description = "床号")
+    private String bedName;
+
     @Schema(description = "评估数据")
     private String assessData;
 
@@ -57,4 +60,3 @@ public class ElderlyAsphyxiationByChokingRespVO {
     @Schema(description = "更新人")
     private String updater;
 }
-

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/assessment/ElderlyAssessmentRespVO.java

@@ -25,6 +25,9 @@ public class ElderlyAssessmentRespVO {
     @Schema(description = "长者姓名")
     private String elderName;
 
+    @Schema(description = "床号")
+    private String bedName;
+
     @Schema(description = "评估数据")
     private String assessData;
 
@@ -57,4 +60,3 @@ public class ElderlyAssessmentRespVO {
     @Schema(description = "更新人")
     private String updater;
 }
-

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/pressuresores/ElderlyPressureSoresRespVO.java

@@ -25,6 +25,9 @@ public class ElderlyPressureSoresRespVO {
     @Schema(description = "长者姓名")
     private String elderName;
 
+    @Schema(description = "床号")
+    private String bedName;
+
     @Schema(description = "评估数据")
     private String assessData;
 
@@ -57,4 +60,3 @@ public class ElderlyPressureSoresRespVO {
     @Schema(description = "更新人")
     private String updater;
 }
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyAsphyxiationByChokingMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.asphyxiationbychoking.ElderlyAsphyxiationByChokingRespVO">
         SELECT
             eabc.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_asphyxiation_by_choking eabc
         LEFT JOIN elderly_info ei ON ei.id = eabc.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = eabc.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND eabc.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.asphyxiationbychoking.ElderlyAsphyxiationByChokingRespVO">
         SELECT
             eabc.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_asphyxiation_by_choking eabc
         LEFT JOIN elderly_info ei ON ei.id = eabc.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = eabc.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE eabc.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDailyLifeMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             edl.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_daily_life edl
         LEFT JOIN elderly_info ei ON ei.id = edl.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = edl.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND edl.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             edl.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_daily_life edl
         LEFT JOIN elderly_info ei ON ei.id = edl.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = edl.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE edl.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyEmpyrosisMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ee.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_empyrosis ee
         LEFT JOIN elderly_info ei ON ei.id = ee.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ee.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND ee.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ee.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_empyrosis ee
         LEFT JOIN elderly_info ei ON ei.id = ee.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ee.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE ee.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyEquilibriumMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ee.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_equilibrium ee
         LEFT JOIN elderly_info ei ON ei.id = ee.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ee.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND ee.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ee.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_equilibrium ee
         LEFT JOIN elderly_info ei ON ei.id = ee.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ee.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE ee.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyFallDownMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             efd.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_fall_down efd
         LEFT JOIN elderly_info ei ON ei.id = efd.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = efd.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND efd.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             efd.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_fall_down efd
         LEFT JOIN elderly_info ei ON ei.id = efd.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = efd.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE efd.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyFallPreventionMeasuresMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             efpm.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_fall_prevention_measures efpm
         LEFT JOIN elderly_info ei ON ei.id = efpm.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = efpm.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND efpm.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             efpm.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_fall_prevention_measures efpm
         LEFT JOIN elderly_info ei ON ei.id = efpm.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = efpm.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE efpm.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyNutritionalRiskMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             enr.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_nutritional_risk enr
         LEFT JOIN elderly_info ei ON ei.id = enr.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = enr.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND enr.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             enr.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_nutritional_risk enr
         LEFT JOIN elderly_info ei ON ei.id = enr.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = enr.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE enr.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyPressureSoresMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.pressuresores.ElderlyPressureSoresRespVO">
         SELECT
             eps.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_pressure_sores eps
         LEFT JOIN elderly_info ei ON ei.id = eps.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = eps.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND eps.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.pressuresores.ElderlyPressureSoresRespVO">
         SELECT
             eps.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_pressure_sores eps
         LEFT JOIN elderly_info ei ON ei.id = eps.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = eps.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE eps.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyRiskDisclosureStatementMapper.xml

@@ -9,10 +9,14 @@
             ei.elder_name AS elderName,
             ei.elder_sex AS elderSex,
             ei.elder_age AS elderAge,
-            ei.floor_name AS floorName,
-            ei.bed_name AS bedName
+            COALESCE(obf.floor_name, ei.floor_name) AS floorName,
+            COALESCE(CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name), ei.bed_name) AS bedName
         FROM elderly_risk_disclosure_statement erds
         LEFT JOIN elderly_info ei ON ei.id = erds.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = erds.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND erds.tenant_id IN
@@ -24,7 +28,7 @@
             AND ei.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
         </if>
         <if test="reqVO.floorId != null">
-            AND ei.floor_id = #{reqVO.floorId}
+            AND obf.id = #{reqVO.floorId}
         </if>
         ORDER BY erds.create_time DESC, erds.id DESC
     </select>
@@ -36,12 +40,15 @@
             ei.elder_name AS elderName,
             ei.elder_sex AS elderSex,
             ei.elder_age AS elderAge,
-            ei.floor_name AS floorName,
-            ei.bed_name AS bedName
+            COALESCE(obf.floor_name, ei.floor_name) AS floorName,
+            COALESCE(CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name), ei.bed_name) AS bedName
         FROM elderly_risk_disclosure_statement erds
         LEFT JOIN elderly_info ei ON ei.id = erds.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = erds.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE erds.id = #{id}
     </select>
 
 </mapper>
-

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyWanderAwayMapper.xml

@@ -6,9 +6,14 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ewa.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_wander_away ewa
         LEFT JOIN elderly_info ei ON ei.id = ewa.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ewa.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE 1 = 1
         <if test="reqVO.tenantIds != null">
             AND ewa.tenant_id IN
@@ -35,11 +40,15 @@
             resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.assessment.ElderlyAssessmentRespVO">
         SELECT
             ewa.*,
-            ei.elder_name AS elderName
+            ei.elder_name AS elderName,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
         FROM elderly_wander_away ewa
         LEFT JOIN elderly_info ei ON ei.id = ewa.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = ewa.tenant_id
+        LEFT JOIN org_build_room obr ON obr.id = obb.room_id AND obr.tenant_id = obb.tenant_id
+        LEFT JOIN org_build_floor obf ON obf.id = obr.floor_id AND obf.tenant_id = obr.tenant_id
+        LEFT JOIN org_build ob ON ob.id = obf.build_id AND ob.tenant_id = obf.tenant_id
         WHERE ewa.id = #{id}
     </select>
 
 </mapper>
-