wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#790): zhaoyun (文件合入)

Browse Source
This commit is contained in:
赵云
2026-06-17 14:36:23 +08:00
committed by 华佗
parent 0156884099
commit e7bdf4e5ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
View File

@@ -133,9 +133,9 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
List<EncounterAccountDto> list = adviceManageAppMapper.getAmount(AccountType.PERSONAL_CASH_ACCOUNT.getCode(), List<EncounterAccountDto> list = adviceManageAppMapper.getAmount(AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(), ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
ChargeItemStatus.REFUNDED.getValue(), wrapper); ChargeItemStatus.REFUNDED.getValue(), wrapper);
// 转换为Map,key = encounter_id // 转换为Map,key = encounter_id（同一encounterId存在多条账户记录时取第一条）
Map<Long, EncounterAccountDto> dtoMap 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 -> { regPatientMainInfo.getRecords().forEach(e -> {
// 设置费用详情 // 设置费用详情
if (dtoMap.containsKey(e.getEncounterId())) { if (dtoMap.containsKey(e.getEncounterId())) {