From 6b236042d0451185e83116a47f9340d4e1b317e7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Fri, 7 Jun 2024 16:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=A2=9E=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientRegisters/PatientRegisterDto.cs                     | 2 ++
 .../AppointPatientRegisterAppService.cs                        | 3 ++-
 .../AppointPatientRegisters/AppointPatientRegisterManager.cs   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Shentun.WebPeis.Application.Contracts/PatientRegisters/PatientRegisterDto.cs b/src/Shentun.WebPeis.Application.Contracts/PatientRegisters/PatientRegisterDto.cs
index 4da3ea1..a8c3867 100644
--- a/src/Shentun.WebPeis.Application.Contracts/PatientRegisters/PatientRegisterDto.cs
+++ b/src/Shentun.WebPeis.Application.Contracts/PatientRegisters/PatientRegisterDto.cs
@@ -64,6 +64,8 @@ namespace Shentun.WebPeis.PatientRegisters
         /// </summary>
         public decimal? Price { get; set; }
 
+        public decimal? CanAddMoney { get; set; }
+
         /// <summary>
         /// 姓名
         /// </summary>
diff --git a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
index d9ae17f..1a1f3a7 100644
--- a/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
+++ b/src/Shentun.WebPeis.Application/AppointPatientRegisters/AppointPatientRegisterAppService.cs
@@ -475,7 +475,8 @@ namespace Shentun.WebPeis.AppointPatientRegisters
                                           CustomerOrgRegisterId = patientRegister.CustomerOrgRegisterId,
                                           CustomerOrgGroupId = patientRegister.CustomerOrgGroupId,
                                           CustomerOrgGroupName = haveCustomerOrgGroup == null?"": haveCustomerOrgGroup.CustomerOrgGroupName,
-                                          Price = haveCustomerOrgGroup == null ? 0:haveCustomerOrgGroup.Price
+                                          Price = haveCustomerOrgGroup == null ? 0:haveCustomerOrgGroup.Price,
+                                          CanAddMoney = haveCustomerOrgGroup == null ? 0 : haveCustomerOrgGroup.CanAddMoney,
                                       }).FirstOrDefault();
             if (patientRegisterDto == null)
             {
diff --git a/src/Shentun.WebPeis.Domain/AppointPatientRegisters/AppointPatientRegisterManager.cs b/src/Shentun.WebPeis.Domain/AppointPatientRegisters/AppointPatientRegisterManager.cs
index 37df02c..c539f05 100644
--- a/src/Shentun.WebPeis.Domain/AppointPatientRegisters/AppointPatientRegisterManager.cs
+++ b/src/Shentun.WebPeis.Domain/AppointPatientRegisters/AppointPatientRegisterManager.cs
@@ -239,7 +239,7 @@ namespace Shentun.WebPeis.AppointPatientRegisters
 
             var appoentPatientRegisters = await _repository.GetListAsync(o => o.PersonId == entity.PersonId &&
              o.AppointDate >= DateTime.Now.Date);
-            if(appoentPatientRegisters.Count > 1)
+            if(appoentPatientRegisters.Count >= 1)
             {
                 throw new UserFriendlyException("已有今天及之后的预约订单，必须先取消订单才能重新预约");
             }