From 58c555d0897948ff5e943f0be3ecf90b1ca3be76 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 10 Mar 2026 09:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=A0=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientRegisters/PatientRegisterAppService.cs              | 3 ++-
 .../PeisReports/PeisReportAppService.cs                        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index eee3b429..8112db4b 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -1037,6 +1037,7 @@ namespace Shentun.Peis.PatientRegisters
                                   registerCheckAsbitemHaveEmpty.Amount,
                                   registerCheckAsbitemHaveEmpty.ChargePrice,
                                   registerCheckAsbitemHaveEmpty.IsCharge,
+                                  registerCheckAsbitemHaveEmpty.PayTypeFlag
                               } : null,
                               payModePayHaveEmpty = payModePayHaveEmpty != null ? new
                               {
@@ -1145,7 +1146,7 @@ namespace Shentun.Peis.PatientRegisters
                 if (group.Count(m => m.registerCheckAsbitemHaveEmpty != null) > 0)
                 {
                     entDto.StandardAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount);
-                    entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
+                    entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.PayTypeFlag != RegisterCheckAsbitemPayTypeFlag.Free).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
                     entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
                 }
 
diff --git a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
index be2f3ca3..6b8237c5 100644
--- a/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
+++ b/src/Shentun.Peis.Application/PeisReports/PeisReportAppService.cs
@@ -770,6 +770,7 @@ namespace Shentun.Peis.PeisReports
                                    registerCheckAsbitemHaveEmpty.Amount,
                                    registerCheckAsbitemHaveEmpty.ChargePrice,
                                    registerCheckAsbitemHaveEmpty.IsCharge,
+                                   registerCheckAsbitemHaveEmpty.PayTypeFlag
                                } : null,
                                payModePayHaveEmpty = payModePayHaveEmpty != null ? new
                                {
@@ -846,7 +847,7 @@ namespace Shentun.Peis.PeisReports
                 if (group.Count(m => m.registerCheckAsbitemHaveEmpty != null) > 0)
                 {
                     entDto.StandardAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.StandardPrice * s.Key.Amount);
-                    entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
+                    entDto.ReceivableAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.PayTypeFlag != RegisterCheckAsbitemPayTypeFlag.Free).GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
                     entDto.ChargeAmount = group.Where(m => m.registerCheckAsbitemHaveEmpty != null && m.registerCheckAsbitemHaveEmpty.IsCharge == 'Y').GroupBy(g => g.registerCheckAsbitemHaveEmpty).Sum(s => s.Key.ChargePrice * s.Key.Amount);
                 }