From 4ad4d385f7fd4d62a10a5bef4dd104002ce69e7c Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Mon, 6 May 2024 18:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChargeRequests/ChargeRequestAppService.cs                | 5 ++---
 .../PatientRegisters/PatientRegisterAppService.cs            | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs
index be0bc23..1cb8600 100644
--- a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs
+++ b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs
@@ -166,10 +166,9 @@ namespace Shentun.Peis.ChargeRequests
                 throw new UserFriendlyException("input参数不能为空");
             }
             var chargeRequest = await _chargeRequestRepository.GetAsync(input.ChargeRequestId);
-            if (chargeRequest.ChargeRequestFlag != ChargeRequestFlag.ChargeRequest &&
-                chargeRequest.ChargeRequestFlag != ChargeRequestFlag.CancelChargeRequest)
+            if (chargeRequest.ChargeRequestFlag != ChargeRequestFlag.AlreadyCharge)
             {
-                throw new UserFriendlyException("状态不是收费申请和作废申请，不允许退费申请");
+                throw new UserFriendlyException("状态不是已收费，不允许退费申请");
             }
                 await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId, "RefundRequestAsync");
 
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index 60b951f..a018ece 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -2460,6 +2460,7 @@ namespace Shentun.Peis.PatientRegisters
             {
                 entdto = new PatientRegisterOrNoDto
                 {
+                    HisPatientId = ent.HisPatientId,
                     Age = ent.Age,
                     AuditDate = DataHelper.ConversionDateToString(ent.AuditDate),
                     Id = ent.Id,