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/ServiceDonateorganBaseServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
index 224028a..5db6561 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganBaseServiceImpl.java
@@ -128,7 +128,7 @@
     }
 
     @Override
-    public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
+    public long add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
         ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
         boolean save = false;
         if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
@@ -141,7 +141,7 @@
             }
         }
 
-        return save;
+        return serviceDonateorganBase.getId();
     }
 
     @Override
@@ -152,7 +152,11 @@
             b = updateById(serviceDonateorganBase);
             if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
                 for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
-                    serviceDonateorganMapper.updateById(serviceDonateorgan);
+                    if(ObjectUtils.isNotEmpty(serviceDonateorgan.getId()) ) {
+                        serviceDonateorganMapper.updateById(serviceDonateorgan);
+                    }else {
+                        serviceDonateorganMapper.insert(serviceDonateorgan);
+                    }
                 }
             }
         }

--
Gitblit v1.9.3