From e7bdf4e5acf4cad98615fc7e2af441469212c80d Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Wed, 17 Jun 2026 14:36:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(#790):=20zhaoyun=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appservice/impl/AdviceManageAppServiceImpl.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
index 2ec6982c2..cb81e7677 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -133,9 +133,9 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         List<EncounterAccountDto> list = adviceManageAppMapper.getAmount(AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
                 ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
                 ChargeItemStatus.REFUNDED.getValue(), wrapper);
-        // 转换为Map,key = encounter_id
+        // 转换为Map,key = encounter_id（同一encounterId存在多条账户记录时取第一条）
         Map<Long, EncounterAccountDto> dtoMap
-                = list.stream().collect(Collectors.toMap(EncounterAccountDto::getEncounterId, e -> e));
+                = list.stream().collect(Collectors.toMap(EncounterAccountDto::getEncounterId, e -> e, (existing, replacement) -> existing));
         regPatientMainInfo.getRecords().forEach(e -> {
             // 设置费用详情
             if (dtoMap.containsKey(e.getEncounterId())) {