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 /// public decimal? Price { get; set; } + public decimal? CanAddMoney { get; set; } + /// /// 姓名 /// 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("已有今天及之后的预约订单,必须先取消订单才能重新预约"); }