From 533ffe54ffc7f0f39b9df8f7d99fee4880b50952 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 09:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index fb10d55..dd539ff 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -22,10 +22,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鎹愮尞涓婃姤鍩虹Service涓氬姟灞傚鐞�
@@ -124,16 +121,25 @@
//灏唕eport鏁版嵁澶嶅埗鍒皊erviceDonatebaseinfo涓�
ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
serviceDonatebaseinfo1.setId(null);
+ serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId());
+ serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
+ serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
+ serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital());
+ serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
+ serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType());
+ serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin());
//鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
+ serviceDonatebaseinfo1.setUpdateTime(new Date());
serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
return true;
}
//鍒涘缓
+ serviceDonatebaseinfo1.setDonatetime(new Date());
return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
}
--
Gitblit v1.9.3