BUGFIX

1、医疗建议按照发生时间排序
2、解决查房记录按时间范围搜索报错问题

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

@@ -67,6 +67,9 @@ public class ElderlyInfoPageReqVO extends PageParam {
 
     @Schema(description = "联系方式")
     private String telPhone;
+
+    @Schema(description = "排序字段")
+    private String orderField;
 }
 
 

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

@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.system.controller.admin.biz.vo;
 
 import lombok.*;
-import java.util.*;
+
+import java.time.LocalDate;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 查房记录分页 Request VO")
 @Data
@@ -22,8 +22,8 @@ public class RoundRecordPageReqVO extends PageParam {
     private String elderName;
 
     @Schema(description = "查房时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] roundTime;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate[] roundTime;
 
     @Schema(description = "查房人")
     private String roundPerson;

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

@@ -26,7 +26,7 @@ public interface MedicalRecordsMapper extends BaseMapperX<MedicalRecordsDO> {
                 .eqIfPresent(MedicalRecordsDO::getHandlingNote, reqVO.getHandlingNote())
                 .eqIfPresent(MedicalRecordsDO::getTenantId, reqVO.getTenantId())
                 .likeIfPresent(MedicalRecordsDO::getElderName, reqVO.getElderName())
-                .orderByDesc(MedicalRecordsDO::getUpdateTime,MedicalRecordsDO::getCreateTime));
+                .orderByDesc(MedicalRecordsDO::getDiscoveryTime,MedicalRecordsDO::getUpdateTime,MedicalRecordsDO::getCreateTime));
     }
 
 }

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

@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.system.controller.admin.biz.vo.RoundRecordPageReq
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.WardRoundRecordDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.time.LocalTime;
+
 
 /**
  * 查房记录 Mapper
@@ -20,12 +22,13 @@ public interface WardRoundRecordMapper extends BaseMapperX<WardRoundRecordDO> {
     default PageResult<WardRoundRecordDO> selectPage(RoundRecordPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WardRoundRecordDO>()
                 .eqIfPresent(WardRoundRecordDO::getElderId, reqVO.getElderId())
-                .betweenIfPresent(WardRoundRecordDO::getRoundTime, reqVO.getRoundTime())
                 .eqIfPresent(WardRoundRecordDO::getRoundPerson, reqVO.getRoundPerson())
                 .eqIfPresent(WardRoundRecordDO::getRoundContent, reqVO.getRoundContent())
                 .eqIfPresent(WardRoundRecordDO::getRemarks, reqVO.getRemarks())
                 .eqIfPresent(WardRoundRecordDO::getTenantId, reqVO.getTenantId())
                 .likeIfPresent(WardRoundRecordDO::getElderName, reqVO.getElderName())
+                .geIfPresent(WardRoundRecordDO::getRoundTime, reqVO.getRoundTime().length >= 1 ? reqVO.getRoundTime()[0].atStartOfDay() : null)
+                .leIfPresent(WardRoundRecordDO::getRoundTime, reqVO.getRoundTime().length == 2 ? reqVO.getRoundTime()[1].atTime(LocalTime.MAX) : null)
                 .orderByDesc(WardRoundRecordDO::getId));
     }