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 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 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())) {