diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 473a2c0..f9a6e2d 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -282,7 +282,7 @@ namespace IRaCIS.Application.Services join rank in _rankPriceRepository.GetAll() on payInfo.RankId equals rank.Id select new DoctorPayInfo() { - Code = doctor.ReviewerCode, + Code = doctor.Code, ChineseName = doctor.ChineseName, FirstName = doctor.FirstName, LastName = doctor.LastName, diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index e350b1a..a58d51a 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -24,7 +24,7 @@ namespace IRaCIS.Core.Domain.Models public string Code { get; set; } - public string ReviewerCode { get; set; } + [StringLength(100)] diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index 545fbab..203d556 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -21,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models public decimal? AdjustmentMultiple { get; set; } public DateTime? EnrollTime { get; set; } - public DateTime? OutEnrollTime { get; set; } + public string Memo { get; set; } = string.Empty; @@ -32,6 +32,7 @@ namespace IRaCIS.Core.Domain.Models public Guid CreateUserId { get; set; } public DateTime CreateTime { get; set; } + #region 新的计费价格 public int? Training { get; set; } public int? RefresherTraining { get; set; } @@ -52,6 +53,8 @@ namespace IRaCIS.Core.Domain.Models public int? Downtime { get; set; } + #endregion + } }