From 7c25809ad5481245660c061a495d99876660bc7b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 22 Nov 2024 17:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 20d48cc0e..4ed8530d3 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -3683,7 +3683,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 if (generalData.TrialId == null || /*generalData.TrialSiteId == null ||*/ generalData.SubjectId == null || generalData.TrialReadingCriterionId == null)
                 {
-                    var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode, SubjectId = x.SubjectId, x.Subject.TrialSiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId, x.TrialReadingCriterionId }).FirstOrDefaultAsync();
+                    var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code,  SubjectId = x.SubjectId, x.Subject.TrialSiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId, x.TrialReadingCriterionId }).FirstOrDefaultAsync();
 
                     generalData.TrialReadingCriterionId = info?.TrialReadingCriterionId ?? generalData.TrialReadingCriterionId;
                     generalData.TrialId = info?.TrialId ?? generalData.TrialId;
@@ -3692,7 +3692,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     generalData.SubjectVisitId = info?.SourceSubjectVisitId != null ? info?.SourceSubjectVisitId : (info?.ReadModuleSubjectVisitId != null ? info?.ReadModuleSubjectVisitId : null);
 
                     //以后移除
-                    generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode;
                     generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode;
                 }
 
@@ -3715,7 +3714,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 if (generalData.TrialId == null /*|| generalData.TrialSiteId == null*/ || generalData.SubjectId == null)
                 {
                     var info = await _dbContext.SubjectVisit.Where(x => x.Id == generalData.SubjectVisitId).Select(x =>
-                  new { x.SubjectId, x.TrialSiteId, x.TrialId, SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode }).FirstOrDefaultAsync();
+                  new { x.SubjectId, x.TrialSiteId, x.TrialId, SubjectCode = x.Subject.Code }).FirstOrDefaultAsync();
 
 
                     generalData.TrialId = info?.TrialId ?? generalData.TrialId;
@@ -3723,7 +3722,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId;
 
                     //以后移除
-                    generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode;
                     generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode;
                 }