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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Ranyunqiao
2026-06-15 16:48:48 +08:00
parent b25d2fbaa9 690e7ca22c
commit 5e9dbb2f1b
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/paymentmanage/appservice/impl/IChargeBillServiceImpl.java
View File

@@ -970,7 +970,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// } // }
// 根据省市医保分组 // 根据省市医保分组
Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
.stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo)); .stream()
.filter(e -> e.getContractNo() != null && !e.getContractNo().isEmpty())
.collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
// 查询所有的收费项 // 查询所有的收费项
List<String> chargeItemIdStrs = paymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds) List<String> chargeItemIdStrs = paymentReconciliationList.stream().map(PaymentReconciliation::getChargeItemIds)
@@ -1043,7 +1045,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// 长大版本要显示出来省市医保的区别 // 长大版本要显示出来省市医保的区别
List<Contract> redisContractList = iContractService.getRedisContractList(); List<Contract> redisContractList = iContractService.getRedisContractList();
Map<String, List<Contract>> contractMapByBusNo Map<String, List<Contract>> contractMapByBusNo
= redisContractList.stream().collect(Collectors.groupingBy(Contract::getBusNo)); = redisContractList.stream()
.filter(e -> e.getBusNo() != null && !e.getBusNo().isEmpty())
.collect(Collectors.groupingBy(Contract::getBusNo));
for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract
.entrySet()) { .entrySet()) {
String key = stringListEntry.getKey(); String key = stringListEntry.getKey();
@@ -1445,7 +1449,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// 医保人次自费人次计算 // 医保人次自费人次计算
List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate); List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate);
Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract
= list.stream().collect(Collectors.groupingBy(EncounterAccountDto::getContractNo)); = list.stream()
.filter(e -> e.getContractNo() != null && !e.getContractNo().isEmpty())
.collect(Collectors.groupingBy(EncounterAccountDto::getContractNo));
for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract
.entrySet()) { .entrySet()) {
String key = stringListEntry.getKey(); String key = stringListEntry.getKey();
@@ -1519,7 +1525,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// 根据省市医保分组 // 根据省市医保分组
Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList Map<String, List<PaymentRecDetailAccountResult>> paymentDetailsMapByContract = PaymentRecDetailAccountResultList
.stream().collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo)); .stream()
.filter(e -> e.getContractNo() != null && !e.getContractNo().isEmpty())
.collect(Collectors.groupingBy(PaymentRecDetailAccountResult::getContractNo));
BigDecimal cashSum = BigDecimal.ZERO;// 现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum BigDecimal cashSum = BigDecimal.ZERO;// 现金总数 = rmbCashSum + vxCashSum + aliCashSum + uniCashSum
BigDecimal rmbCashSum = BigDecimal.ZERO;// 现金总数 BigDecimal rmbCashSum = BigDecimal.ZERO;// 现金总数
@@ -1535,7 +1543,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// 长大版本要显示出来省市医保的区别 // 长大版本要显示出来省市医保的区别
List<Contract> redisContractList = iContractService.getRedisContractList(); List<Contract> redisContractList = iContractService.getRedisContractList();
Map<String, List<Contract>> contractMapByBusNo Map<String, List<Contract>> contractMapByBusNo
= redisContractList.stream().collect(Collectors.groupingBy(Contract::getBusNo)); = redisContractList.stream()
.filter(e -> e.getBusNo() != null && !e.getBusNo().isEmpty())
.collect(Collectors.groupingBy(Contract::getBusNo));
for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract for (Map.Entry<String, List<PaymentRecDetailAccountResult>> stringListEntry : paymentDetailsMapByContract
.entrySet()) { .entrySet()) {
@@ -1922,7 +1932,9 @@ public class IChargeBillServiceImpl implements IChargeBillService {
// 医保人次自费人次计算 // 医保人次自费人次计算
List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate); List<EncounterAccountDto> list = iEncounterService.getEncounterInfoByTime(startDate, endDate);
Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract Map<String, List<EncounterAccountDto>> encounterAccountDtoMapByContract
= list.stream().collect(Collectors.groupingBy(EncounterAccountDto::getContractNo)); = list.stream()
.filter(e -> e.getContractNo() != null && !e.getContractNo().isEmpty())
.collect(Collectors.groupingBy(EncounterAccountDto::getContractNo));
for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract for (Map.Entry<String, List<EncounterAccountDto>> stringListEntry : encounterAccountDtoMapByContract
.entrySet()) { .entrySet()) {
String key = stringListEntry.getKey(); String key = stringListEntry.getKey();