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/CommonDocumentService.cs

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(queryCommonDocument.CriterionTypeEnum != null, t => t.CriterionTypeEnum == queryCommonDocument.CriterionTypeEnum)
                 .WhereIf(queryCommonDocument.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryCommonDocument.BusinessScenarioEnum)
                 .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Code), t => t.Code.Contains(queryCommonDocument.Code))
-                .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name))
+                .WhereIf(!string.IsNullOrEmpty(queryCommonDocument.Name), t => t.Name.Contains(queryCommonDocument.Name) || t.NameCN.Contains(queryCommonDocument.Name))
                 .ProjectTo<CommonDocumentView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
 
             return await commonDocumentQueryable.ToPagedListAsync(queryCommonDocument);

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

@@ -1730,12 +1730,14 @@ namespace IRaCIS.Core.Application.Service.Common
                     //处理再次阅片人的结果               
                     if (selfAnalysisTask != null)
                     {
-                        foreach (var qItem in selfAnalysisTask.QuestionAnswerList)
+                        var cloneQuestionAnswerList = selfAnalysisTask.QuestionAnswerList.Clone();
+
+                        foreach (var qItem in cloneQuestionAnswerList)
                         {
                             qItem.QuestionName = qItem.QuestionName + $"{(_userInfo.IsEn_Us ? "(Again)" : "(再次)")}";
                         }
 
-                        item.QuestionAnswerList = item.QuestionAnswerList.Union(selfAnalysisTask?.QuestionAnswerList).ToList();
+                        item.QuestionAnswerList = item.QuestionAnswerList.Union(cloneQuestionAnswerList).ToList();
                     }
                 }