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/ServiceDonateorganServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index 525832a..38419ab 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -82,6 +82,9 @@
@Override
public List<ServiceDonateorgan> queryList(ServiceDonateorgan serviceDonateorgan) {
LambdaQueryWrapper<ServiceDonateorgan> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotNull(serviceDonateorgan.getBaseId())) {
+ wrappers.eq(ServiceDonateorgan::getBaseId, serviceDonateorgan.getBaseId());
+ }
if (StringUtils.isNotNull(serviceDonateorgan.getInfoid())) {
wrappers.eq(ServiceDonateorgan::getInfoid, serviceDonateorgan.getInfoid());
}
@@ -446,7 +449,7 @@
@Override
public List<DonateOrganVO> selectVOList(DonateOrganVO donateOrganVO) {
List<DonateOrganVO> donateOrganVOS = serviceDonateorganMapper.selectVOList(donateOrganVO);
- for (DonateOrganVO donateOrganVO1:donateOrganVOS) {
+ for (DonateOrganVO donateOrganVO1 : donateOrganVOS) {
if (donateOrganVO1.getBirthday() != null) {
Map<String, String> map = CalculateDateUtils.calculateAge(donateOrganVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
donateOrganVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
--
Gitblit v1.9.3