diff --git a/IRaCIS.Core.API/_PipelineExtensions/Serilog/RequestResponseLoggingMiddleware.cs b/IRaCIS.Core.API/_PipelineExtensions/Serilog/RequestResponseLoggingMiddleware.cs index 79559f5dc..7b2bd5c96 100644 --- a/IRaCIS.Core.API/_PipelineExtensions/Serilog/RequestResponseLoggingMiddleware.cs +++ b/IRaCIS.Core.API/_PipelineExtensions/Serilog/RequestResponseLoggingMiddleware.cs @@ -38,15 +38,13 @@ namespace IRaCIS.Core.API._PipelineExtensions.Serilog else { - await _next.Invoke(context); + var requestBodyPayload = await ReadRequestBody(context.Request); - //var requestBodyPayload = await ReadRequestBody(context.Request); - - //using (LogContext.PushProperty("RequestBody", requestBodyPayload)) - //{ - // //await _next.Invoke() - // await _next.Invoke(context); - //} + using (LogContext.PushProperty("RequestBody", requestBodyPayload)) + { + //await _next.Invoke() + await _next.Invoke(context); + } } //var request = context.Request; diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 9314583bf..d785ac735 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models /// 受试者 /// [Table("Subject")] - public class Subject : Entity, IAuditAdd, IAuditUpdate + public class Subject : Entity, IAuditAdd, IAuditUpdate, ISoftDelete { public List SubjectVisitList { get; set; } = new List(); @@ -81,5 +81,8 @@ namespace IRaCIS.Core.Domain.Models public DateTime? FirstGiveMedicineTime { get; set; } public bool IsUrgent { get; set; } + + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } } } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index f634c3f73..afd3c2448 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal; namespace IRaCIS.Core.Domain.Models { [Table("SubjectVisit")] - public class SubjectVisit : Entity, IAuditUpdate, IAuditAdd + public class SubjectVisit : Entity, IAuditUpdate, IAuditAdd, ISoftDelete { //一个访视 对应有对应Site的 TrialSiteCode 所以 fluentApi中配置 TrialSite 连表用TrialId SiteId 双字段 public TrialSite TrialSite { get; set; } @@ -139,6 +139,10 @@ namespace IRaCIS.Core.Domain.Models public string CloseTheReason { get; set; } + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } + + //导航属性 [ForeignKey("TrialId")] diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index 379432433..f95f5ccba 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -33,10 +33,9 @@ namespace IRaCIS.Core.Domain.Models public Guid UpdateUserId { get; set; } public DateTime UpdateTime { get; set; } - public bool IsDeleted { get; set; } public bool IsHaveFirstConfirmed { get; set; } - + public bool IsDeleted { get; set; } public DateTime? DeletedTime { get; set; } }