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

fix(#790): 请修复 Bug #790：【住院管理-住院医生工作站】用管理员账号打开住院医生工作站会出现报错：Duplicate key 6005 (attempted merging values EncounterAccountDto(encounterId=6005, advanceAmount=0.000000, totalAmount=0, balanceAmount=0.000000, insutype=null) and EncounterAccountDto

Browse Source
This commit is contained in:
华佗
2026-06-17 14:34:15 +08:00
parent 529d994377
commit 8d02a530c6
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(),
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())) {