diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index f83022605..99ca55936 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1195,8 +1195,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common generalData.SubjectVisitId = info?.SourceSubjectVisitId != null ? info?.SourceSubjectVisitId : (info?.ReadModuleSubjectVisitId != null ? info?.ReadModuleSubjectVisitId : null); //以后移除 - generalData.SiteCode = info.TrialSiteCode; - generalData.SubjectCode = info.SubjectCode; + generalData.SiteCode = info?.TrialSiteCode?? generalData.SiteCode; + generalData.SubjectCode = info?.SubjectCode ??generalData.SubjectCode; } } @@ -1215,10 +1215,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common generalData.SiteId = info?.SiteId ?? generalData.SiteId; generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId; - //以后移除 - generalData.SiteCode = info.TrialSiteCode; - generalData.SubjectCode = info.SubjectCode; + generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode; + generalData.SubjectCode = info?.SubjectCode?? generalData.SubjectCode; } @@ -1235,8 +1234,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common generalData.SiteId = info?.SiteId ?? generalData.SiteId; //以后移除 - generalData.SiteCode = info.TrialSiteCode; - generalData.SubjectCode = info.SubjectCode; + generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode; + generalData.SubjectCode = info?.SubjectCode?? generalData.SubjectCode; }