From 2a3af1e765722cae585967c0010d90acef077aee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 25 五月 2026 17:41:54 +0800
Subject: [PATCH] 捐献基础表新增归档时间 捐献亲属确认表新增其他亲属 供体维护记录新增住院号排序，新增年龄区间、入院区间，协调员查询 捐献亲属确认修改住院号排序 医学评估表新增住院号排序，新增评估时间区间查询 患者死亡信息增住院号排序，新增死亡时间区间查询 伦理审查发起表增住院号排序，新增发起时间区间查询 捐献器官分配基础表表增住院号排序，新增分配状态，分配时间区间查询 捐献完成表增住院号排序，新增分配状态查询
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
index 6513d0b..8d33768 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java
@@ -48,12 +48,10 @@
if (serviceMeeting.getOrganizerId() != null){
wrappers.eq(ServiceMeeting::getOrganizerId ,serviceMeeting.getOrganizerId());
}
- if (serviceMeeting.getStartTime() != null){
- wrappers.eq(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime());
+ if (serviceMeeting.getStartTime() != null&&serviceMeeting.getEndTime() != null){
+ wrappers.between(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime(),serviceMeeting.getEndTime() );
}
- if (serviceMeeting.getEndTime() != null){
- wrappers.eq(ServiceMeeting::getEndTime ,serviceMeeting.getEndTime());
- }
+
if (StringUtils.isNotBlank(serviceMeeting.getSummary())){
wrappers.eq(ServiceMeeting::getSummary ,serviceMeeting.getSummary());
}
@@ -99,18 +97,7 @@
if (serviceMeeting.getApprovalTime() != null){
wrappers.eq(ServiceMeeting::getApprovalTime ,serviceMeeting.getApprovalTime());
}
- if (StringUtils.isNotBlank(serviceMeeting.getCreatedBy())){
- wrappers.eq(ServiceMeeting::getCreatedBy ,serviceMeeting.getCreatedBy());
- }
- if (serviceMeeting.getCreatedTime() != null){
- wrappers.eq(ServiceMeeting::getCreatedTime ,serviceMeeting.getCreatedTime());
- }
- if (StringUtils.isNotBlank(serviceMeeting.getUpdatedBy())){
- wrappers.eq(ServiceMeeting::getUpdatedBy ,serviceMeeting.getUpdatedBy());
- }
- if (serviceMeeting.getUpdatedTime() != null){
- wrappers.eq(ServiceMeeting::getUpdatedTime ,serviceMeeting.getUpdatedTime());
- }
+
return this.list(wrappers);
}
--
Gitblit v1.9.3