From 68b49efb4da346edb42a5d8ebb39af47207402bd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 12 十月 2026 11:14:13 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
index 453f215..42176f1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java
@@ -25,7 +25,9 @@
import java.time.LocalDate;
import java.time.ZoneId;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -132,6 +134,22 @@
}
List<DonationCompletionVO> donationCompletionVOS = serviceDonatecompletioninfoMapper.selectVOList(donationCompletionVO);
+ // 涓�娆℃�у彇鍑哄悇鎹愮尞鍩虹瀵瑰簲鐨勬浜℃椂闂达紝閬垮厤鍦ㄥ惊鐜噷鎸� InfoID 閫愭潯鏌ヨ璇佽〃锛圢+1锛�
+ List<Long> infoIds = new ArrayList<>();
+ for (DonationCompletionVO item : donationCompletionVOS) {
+ if (item.getInfoid() != null) {
+ infoIds.add(item.getInfoid());
+ }
+ }
+ Map<Long, Date> deathTimeMap = new HashMap<>();
+ if (!infoIds.isEmpty()) {
+ for (ServiceDonationwitness witness : serviceDonationwitnessMapper.selectDeathTimeByInfoIds(infoIds)) {
+ if (witness.getInfoid() != null && !deathTimeMap.containsKey(witness.getInfoid())) {
+ deathTimeMap.put(witness.getInfoid(), witness.getDeathtime());
+ }
+ }
+ }
+
for (DonationCompletionVO donationCompletionVO1 : donationCompletionVOS) {
// if (donationCompletionVO1.getBirthday() != null) {
// Map<String, String> map = CalculateDateUtils.calculateAge(donationCompletionVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
@@ -146,23 +164,18 @@
donationCompletionVO1.setAge(null);
donationCompletionVO1.setAge2(null);
//鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
- ServiceDonationwitness sdw = new ServiceDonationwitness();
- sdw.setInfoid(donationCompletionVO1.getInfoid());
- List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
- if (!org.springframework.util.CollectionUtils.isEmpty(serviceDonationwitnessList) && donationCompletionVO1.getBirthday() != null) {
- Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
- if (ObjectUtils.isNotEmpty(deathtime)) {
- Map<String, String> map = CalculateDateUtils.calculateAge(donationCompletionVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
- if (ObjectUtils.isEmpty(map)) {
- log.error("DonationCompletionVO鍑虹敓鏃ユ湡锛歿},DonationCompletionVO姝讳骸鏃ユ湡锛歿}", donationCompletionVO1.getBirthday(), deathtime);
- continue;
- }
-
- donationCompletionVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- donationCompletionVO1.setAgeunit(map.get("ageUnit"));
- donationCompletionVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- donationCompletionVO1.setAgeunit2(map.get("ageUnit2"));
+ Date deathtime = deathTimeMap.get(donationCompletionVO1.getInfoid());
+ if (ObjectUtils.isNotEmpty(deathtime) && donationCompletionVO1.getBirthday() != null) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(donationCompletionVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (ObjectUtils.isEmpty(map)) {
+ log.error("DonationCompletionVO鍑虹敓鏃ユ湡锛歿},DonationCompletionVO姝讳骸鏃ユ湡锛歿}", donationCompletionVO1.getBirthday(), deathtime);
+ continue;
}
+
+ donationCompletionVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ donationCompletionVO1.setAgeunit(map.get("ageUnit"));
+ donationCompletionVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ donationCompletionVO1.setAgeunit2(map.get("ageUnit2"));
}
}
--
Gitblit v1.9.3