新增

1、九防模块列表增加床位号字段
BUGFIX
1、解决新增日常费用退住结算单应收、应退金额字段没更新的问题

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

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.biz.ExpensePayOrderDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ExpensePayOrderItemDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.RefundSettlementOrderItemDO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -12,6 +13,8 @@ import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 已结算退住订单详情 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -33,9 +36,11 @@ public class RefundSettledOrderDetailVO {
     private Date checkInTime;
 
     @Schema(description = "退住日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate retreatDate;
 
     @Schema(description = "费用截止日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate costDeadlineDate;
 
     @Schema(description = "结算时间")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessAnxietyMapper.java

@@ -2,22 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessanxiety.ElderlyAssessAnxietyPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessanxiety.ElderlyAssessAnxietyRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessAnxietyDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessAnxietyMapper extends BaseMapperX<ElderlyAssessAnxietyDO> {
 
-    default PageResult<ElderlyAssessAnxietyDO> selectPage(ElderlyAssessAnxietyPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessAnxietyDO>()
-                .likeIfPresent(ElderlyAssessAnxietyDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessAnxietyDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessAnxietyDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyAssessAnxietyDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessAnxietyDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessAnxietyDO::getAssessDate, ElderlyAssessAnxietyDO::getId));
+    List<ElderlyAssessAnxietyRespVO> selectPageWithBedName(Page<ElderlyAssessAnxietyRespVO> page,
+                                                           @Param("reqVO") ElderlyAssessAnxietyPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessAnxietyRespVO> selectPageWithBedName(ElderlyAssessAnxietyPageReqVO reqVO) {
+        Page<ElderlyAssessAnxietyRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessAnxietyRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessAttackRiskFactorsMapper.java

@@ -2,24 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessattackriskfactors.ElderlyAssessAttackRiskFactorsPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessattackriskfactors.ElderlyAssessAttackRiskFactorsRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessAttackRiskFactorsDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessAttackRiskFactorsMapper extends BaseMapperX<ElderlyAssessAttackRiskFactorsDO> {
 
-    default PageResult<ElderlyAssessAttackRiskFactorsDO> selectPage(ElderlyAssessAttackRiskFactorsPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessAttackRiskFactorsDO>()
-                .likeIfPresent(ElderlyAssessAttackRiskFactorsDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessAttackRiskFactorsDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessAttackRiskFactorsDO::getAssessDate, reqVO.getAssessDate())
-                .eqIfPresent(ElderlyAssessAttackRiskFactorsDO::getElderId, reqVO.getElderId())
-                .eqIfPresent(ElderlyAssessAttackRiskFactorsDO::getRiskLevel, reqVO.getRisk())
-                .inIfPresent(ElderlyAssessAttackRiskFactorsDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessAttackRiskFactorsDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessAttackRiskFactorsDO::getAssessDate, ElderlyAssessAttackRiskFactorsDO::getId));
+    List<ElderlyAssessAttackRiskFactorsRespVO> selectPageWithBedName(Page<ElderlyAssessAttackRiskFactorsRespVO> page,
+                                                                     @Param("reqVO") ElderlyAssessAttackRiskFactorsPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessAttackRiskFactorsRespVO> selectPageWithBedName(ElderlyAssessAttackRiskFactorsPageReqVO reqVO) {
+        Page<ElderlyAssessAttackRiskFactorsRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessAttackRiskFactorsRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessDepressionMapper.java

@@ -2,22 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessdepression.ElderlyAssessDepressionPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessdepression.ElderlyAssessDepressionRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessDepressionDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessDepressionMapper extends BaseMapperX<ElderlyAssessDepressionDO> {
 
-    default PageResult<ElderlyAssessDepressionDO> selectPage(ElderlyAssessDepressionPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessDepressionDO>()
-                .likeIfPresent(ElderlyAssessDepressionDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessDepressionDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessDepressionDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyAssessDepressionDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessDepressionDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessDepressionDO::getAssessDate, ElderlyAssessDepressionDO::getId));
+    List<ElderlyAssessDepressionRespVO> selectPageWithBedName(Page<ElderlyAssessDepressionRespVO> page,
+                                                              @Param("reqVO") ElderlyAssessDepressionPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessDepressionRespVO> selectPageWithBedName(ElderlyAssessDepressionPageReqVO reqVO) {
+        Page<ElderlyAssessDepressionRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessDepressionRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessPerceptionCommunicationMapper.java

@@ -2,24 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessperceptioncommunication.ElderlyAssessPerceptionCommunicationPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessperceptioncommunication.ElderlyAssessPerceptionCommunicationRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessPerceptionCommunicationDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessPerceptionCommunicationMapper extends BaseMapperX<ElderlyAssessPerceptionCommunicationDO> {
 
-    default PageResult<ElderlyAssessPerceptionCommunicationDO> selectPage(ElderlyAssessPerceptionCommunicationPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessPerceptionCommunicationDO>()
-                .likeIfPresent(ElderlyAssessPerceptionCommunicationDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessPerceptionCommunicationDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessPerceptionCommunicationDO::getAssessDate, reqVO.getAssessDate())
-                .eqIfPresent(ElderlyAssessPerceptionCommunicationDO::getElderId, reqVO.getElderId())
-                .eqIfPresent(ElderlyAssessPerceptionCommunicationDO::getRiskLevel, reqVO.getRisk())
-                .inIfPresent(ElderlyAssessPerceptionCommunicationDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessPerceptionCommunicationDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessPerceptionCommunicationDO::getAssessDate, ElderlyAssessPerceptionCommunicationDO::getId));
+    List<ElderlyAssessPerceptionCommunicationRespVO> selectPageWithBedName(Page<ElderlyAssessPerceptionCommunicationRespVO> page,
+                                                                           @Param("reqVO") ElderlyAssessPerceptionCommunicationPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessPerceptionCommunicationRespVO> selectPageWithBedName(ElderlyAssessPerceptionCommunicationPageReqVO reqVO) {
+        Page<ElderlyAssessPerceptionCommunicationRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessPerceptionCommunicationRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessPsychologySocialMapper.java

@@ -2,22 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesspsychologysocial.ElderlyAssessPsychologySocialPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesspsychologysocial.ElderlyAssessPsychologySocialRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessPsychologySocialDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessPsychologySocialMapper extends BaseMapperX<ElderlyAssessPsychologySocialDO> {
 
-    default PageResult<ElderlyAssessPsychologySocialDO> selectPage(ElderlyAssessPsychologySocialPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessPsychologySocialDO>()
-                .likeIfPresent(ElderlyAssessPsychologySocialDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessPsychologySocialDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessPsychologySocialDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyAssessPsychologySocialDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessPsychologySocialDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessPsychologySocialDO::getAssessDate, ElderlyAssessPsychologySocialDO::getId));
+    List<ElderlyAssessPsychologySocialRespVO> selectPageWithBedName(Page<ElderlyAssessPsychologySocialRespVO> page,
+                                                                    @Param("reqVO") ElderlyAssessPsychologySocialPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessPsychologySocialRespVO> selectPageWithBedName(ElderlyAssessPsychologySocialPageReqVO reqVO) {
+        Page<ElderlyAssessPsychologySocialRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessPsychologySocialRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessSimpleMentalStateMapper.java

@@ -2,24 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssimplementalstate.ElderlyAssessSimpleMentalStatePageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssimplementalstate.ElderlyAssessSimpleMentalStateRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessSimpleMentalStateDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessSimpleMentalStateMapper extends BaseMapperX<ElderlyAssessSimpleMentalStateDO> {
 
-    default PageResult<ElderlyAssessSimpleMentalStateDO> selectPage(ElderlyAssessSimpleMentalStatePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessSimpleMentalStateDO>()
-                .likeIfPresent(ElderlyAssessSimpleMentalStateDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessSimpleMentalStateDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessSimpleMentalStateDO::getAssessDate, reqVO.getAssessDate())
-                .eqIfPresent(ElderlyAssessSimpleMentalStateDO::getElderId, reqVO.getElderId())
-                .eqIfPresent(ElderlyAssessSimpleMentalStateDO::getRiskLevel, reqVO.getRisk())
-                .inIfPresent(ElderlyAssessSimpleMentalStateDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessSimpleMentalStateDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessSimpleMentalStateDO::getAssessDate, ElderlyAssessSimpleMentalStateDO::getId));
+    List<ElderlyAssessSimpleMentalStateRespVO> selectPageWithBedName(Page<ElderlyAssessSimpleMentalStateRespVO> page,
+                                                                     @Param("reqVO") ElderlyAssessSimpleMentalStatePageReqVO reqVO);
+
+    default PageResult<ElderlyAssessSimpleMentalStateRespVO> selectPageWithBedName(ElderlyAssessSimpleMentalStatePageReqVO reqVO) {
+        Page<ElderlyAssessSimpleMentalStateRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessSimpleMentalStateRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyAssessSuicideRiskMapper.java

@@ -2,24 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssuiciderisk.ElderlyAssessSuicideRiskPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssuiciderisk.ElderlyAssessSuicideRiskRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyAssessSuicideRiskDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface ElderlyAssessSuicideRiskMapper extends BaseMapperX<ElderlyAssessSuicideRiskDO> {
 
-    default PageResult<ElderlyAssessSuicideRiskDO> selectPage(ElderlyAssessSuicideRiskPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyAssessSuicideRiskDO>()
-                .likeIfPresent(ElderlyAssessSuicideRiskDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyAssessSuicideRiskDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyAssessSuicideRiskDO::getAssessDate, reqVO.getAssessDate())
-                .eqIfPresent(ElderlyAssessSuicideRiskDO::getElderId, reqVO.getElderId())
-                .eqIfPresent(ElderlyAssessSuicideRiskDO::getRiskLevel, reqVO.getRisk())
-                .inIfPresent(ElderlyAssessSuicideRiskDO::getTenantId, reqVO.getTenantIds())
-                .inSql(reqVO.getFloorId() != null, ElderlyAssessSuicideRiskDO::getElderId,
-                        "SELECT id FROM elderly_info WHERE floor_id = " + reqVO.getFloorId())
-                .orderByDesc(ElderlyAssessSuicideRiskDO::getAssessDate, ElderlyAssessSuicideRiskDO::getId));
+    List<ElderlyAssessSuicideRiskRespVO> selectPageWithBedName(Page<ElderlyAssessSuicideRiskRespVO> page,
+                                                               @Param("reqVO") ElderlyAssessSuicideRiskPageReqVO reqVO);
+
+    default PageResult<ElderlyAssessSuicideRiskRespVO> selectPageWithBedName(ElderlyAssessSuicideRiskPageReqVO reqVO) {
+        Page<ElderlyAssessSuicideRiskRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyAssessSuicideRiskRespVO> list = selectPageWithBedName(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/DailyExpensesServiceImpl.java

@@ -723,6 +723,11 @@ public class DailyExpensesServiceImpl implements DailyExpensesService {
             BigDecimal currentAmount = refundSettlementOrderDO.getRefundAmount() != null ? refundSettlementOrderDO.getRefundAmount() : BigDecimal.ZERO;
             BigDecimal newAmount = currentAmount.add(orderItem.getRefundAmount());
             refundSettlementOrderDO.setRefundAmount(newAmount);
+            if (dailyExpensesDO.getAmount().compareTo(BigDecimal.ZERO) > 0) {
+                refundSettlementOrderDO.setReceivableAmount(refundSettlementOrderDO.getReceivableAmount().add(orderItem.getActualRefundAmount()));
+            }else {
+                refundSettlementOrderDO.setRefundableAmount(refundSettlementOrderDO.getRefundableAmount().add(orderItem.getActualRefundAmount()));
+            }
             refundSettlementOrderMapper.updateById(refundSettlementOrderDO);
         }
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAskLeaveServiceImpl.java

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mzt.logapi.starter.annotation.LogRecord;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -164,7 +165,7 @@ public class ElderlyAskLeaveServiceImpl implements ElderlyAskLeaveService {
         checkLeaveUpdateDate(elderlyAskLeaveDO);
         elderlyAskLeaveMapper.updateById(elderlyAskLeaveDO);
 
-        if (elderlyAskLeaveDO.getUpdateDate() != null && elderlyAskLeaveDO.getOutboundRefundConfigId() != null) {
+        if (elderlyAskLeaveDO.getUpdateDate() != null && StringUtils.isNotBlank(elderlyAskLeaveDO.getBelongMonth()) && elderlyAskLeaveDO.getOutboundRefundConfigId() != null) {
             Date endDate = elderlyAskLeaveDO.getUpdateDate();
             Date outDate = elderlyAskLeaveDO.getOutDate();
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessAnxietyServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessAnxietyServiceImpl implements ElderlyAssessAnxietyServ
 
     @Override
     public PageResult<ElderlyAssessAnxietyRespVO> getPage(ElderlyAssessAnxietyPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessAnxietyDO> pageResult = elderlyAssessAnxietyMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessAnxietyRespVO.class);
+        return elderlyAssessAnxietyMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessAttackRiskFactorsServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessAttackRiskFactorsServiceImpl implements ElderlyAssessA
 
     @Override
     public PageResult<ElderlyAssessAttackRiskFactorsRespVO> getPage(ElderlyAssessAttackRiskFactorsPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessAttackRiskFactorsDO> pageResult = elderlyAssessAttackRiskFactorsMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessAttackRiskFactorsRespVO.class);
+        return elderlyAssessAttackRiskFactorsMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessDepressionServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessDepressionServiceImpl implements ElderlyAssessDepressi
 
     @Override
     public PageResult<ElderlyAssessDepressionRespVO> getPage(ElderlyAssessDepressionPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessDepressionDO> pageResult = elderlyAssessDepressionMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessDepressionRespVO.class);
+        return elderlyAssessDepressionMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessPerceptionCommunicationServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessPerceptionCommunicationServiceImpl implements ElderlyA
 
     @Override
     public PageResult<ElderlyAssessPerceptionCommunicationRespVO> getPage(ElderlyAssessPerceptionCommunicationPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessPerceptionCommunicationDO> pageResult = elderlyAssessPerceptionCommunicationMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessPerceptionCommunicationRespVO.class);
+        return elderlyAssessPerceptionCommunicationMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessPsychologySocialServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessPsychologySocialServiceImpl implements ElderlyAssessPs
 
     @Override
     public PageResult<ElderlyAssessPsychologySocialRespVO> getPage(ElderlyAssessPsychologySocialPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessPsychologySocialDO> pageResult = elderlyAssessPsychologySocialMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessPsychologySocialRespVO.class);
+        return elderlyAssessPsychologySocialMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessSimpleMentalStateServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessSimpleMentalStateServiceImpl implements ElderlyAssessS
 
     @Override
     public PageResult<ElderlyAssessSimpleMentalStateRespVO> getPage(ElderlyAssessSimpleMentalStatePageReqVO pageReqVO) {
-        PageResult<ElderlyAssessSimpleMentalStateDO> pageResult = elderlyAssessSimpleMentalStateMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessSimpleMentalStateRespVO.class);
+        return elderlyAssessSimpleMentalStateMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyAssessSuicideRiskServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyAssessSuicideRiskServiceImpl implements ElderlyAssessSuicide
 
     @Override
     public PageResult<ElderlyAssessSuicideRiskRespVO> getPage(ElderlyAssessSuicideRiskPageReqVO pageReqVO) {
-        PageResult<ElderlyAssessSuicideRiskDO> pageResult = elderlyAssessSuicideRiskMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyAssessSuicideRiskRespVO.class);
+        return elderlyAssessSuicideRiskMapper.selectPageWithBedName(pageReqVO);
     }
 
     private void validateExists(Long id) {

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessAnxietyMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessanxiety.ElderlyAssessAnxietyRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_anxiety t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessAttackRiskFactorsMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessattackriskfactors.ElderlyAssessAttackRiskFactorsRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_attack_risk_factors t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderId != null">
+            AND t.elder_id = #{reqVO.elderId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND t.risk_level = #{reqVO.risk}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessDepressionMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessdepression.ElderlyAssessDepressionRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_depression t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessPerceptionCommunicationMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassessperceptioncommunication.ElderlyAssessPerceptionCommunicationRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_perception_communication t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderId != null">
+            AND t.elder_id = #{reqVO.elderId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND t.risk_level = #{reqVO.risk}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessPsychologySocialMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesspsychologysocial.ElderlyAssessPsychologySocialRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_psychology_social t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessSimpleMentalStateMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssimplementalstate.ElderlyAssessSimpleMentalStateRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_simple_mental_state t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderId != null">
+            AND t.elder_id = #{reqVO.elderId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND t.risk_level = #{reqVO.risk}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyAssessSuicideRiskMapper">
+
+    <select id="selectPageWithBedName"
+            resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyassesssuiciderisk.ElderlyAssessSuicideRiskRespVO">
+        SELECT
+            t.*,
+            CONCAT_WS('-', ob.build_name, obf.floor_name, obr.room_name, obb.bed_name) AS bedName
+        FROM elderly_assess_suicide_risk t
+        LEFT JOIN elderly_info ei ON ei.id = t.elder_id
+        LEFT JOIN org_build_bed obb ON obb.id = ei.bed_id AND obb.tenant_id = t.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 reqVO.tenantIds.length > 0">
+            AND t.tenant_id IN
+            <foreach item="id" collection="reqVO.tenantIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ei.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.elderId != null">
+            AND t.elder_id = #{reqVO.elderId}
+        </if>
+        <if test="reqVO.elderName != null and reqVO.elderName != ''">
+            AND t.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
+        </if>
+        <if test="reqVO.assessor != null and reqVO.assessor != ''">
+            AND t.assessor LIKE CONCAT('%', #{reqVO.assessor}, '%')
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length &gt;= 1">
+            AND t.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND t.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        <if test="reqVO.risk != null and reqVO.risk != ''">
+            AND t.risk_level = #{reqVO.risk}
+        </if>
+        ORDER BY t.assess_date DESC, t.id DESC
+    </select>
+
+</mapper>