From 393abdb0f64c21b407062ec107a1e7b43c2f4cb2 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 26 Aug 2022 10:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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;
                 }