Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -484,7 +484,7 @@ namespace IRaCIS.Core.Application.Service.Common
         }
 
         /// <summary>
-        /// 影像质控导出
+        /// 影像质控导出---new
         /// </summary>
         /// <param name="inQuery"></param>
         /// <param name="_commonDocumentRepository"></param>
@@ -503,9 +503,9 @@ namespace IRaCIS.Core.Application.Service.Common
         {
             var svExpression = QCCommon.GetSubjectVisitFilter(inQuery.VisitPlanArray);
             var query = _subjectVisitRepository.Where(x => x.TrialId == inQuery.TrialId)
-                              .WhereIf(inQuery.VisitId != null, t => t.Id == inQuery.VisitId)
-                           .WhereIf(inQuery.CurrentActionUserId != null, t => t.CurrentActionUserId == inQuery.CurrentActionUserId)
-                         .WhereIf(inQuery.ChallengeState != null, t => t.ChallengeState == inQuery.ChallengeState)
+                         .WhereIf(inQuery.VisitId != null, t => t.Id == inQuery.VisitId)
+                        .WhereIf(inQuery.CurrentActionUserId != null, t => t.CurrentActionUserId == inQuery.CurrentActionUserId)
+                        .WhereIf(inQuery.ChallengeState != null, t => t.ChallengeState == inQuery.ChallengeState)
                         .WhereIf(inQuery.TrialSiteId != null, t => t.TrialSiteId == inQuery.TrialSiteId)
                         .WhereIf(inQuery.SubjectId != null, t => t.Subject.Id == inQuery.SubjectId)
                         .WhereIf(!string.IsNullOrEmpty(inQuery.SubjectInfo), t => /*t.Subject.FirstName.Contains(subjectInfo) || t.Subject.LastName.Contains(subjectInfo) ||*/ t.Subject.Code.Contains(inQuery.SubjectInfo))