From db363a7daa97dc9750dd1f86cd07f9e408a5ab9e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 6 Nov 2024 16:56:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E9=97=B4=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90=E5=AF=BC=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 37a7938c6..94c3af096 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -1607,11 +1607,11 @@ namespace IRaCIS.Core.Application.Service.Common
             var criterion = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule }).FirstNotNullAsync();
 
 
-            var query = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && t.TaskAllocationState==TaskAllocationState.Allocated && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
+            var query = _visitTaskRepository.Where(t => t.TrialId == inQuery.TrialId && t.TaskAllocationState == TaskAllocationState.Allocated && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze))
 
                 //一致性分析
                 .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults, t => t.IsSelfAnalysis == true || t.IsSelfAnalysis == null)
-                .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults, t => t.IsSelfAnalysis == null? t.Subject.SubjectVisitTaskList.Any(u=>u.IsSelfAnalysis==true && u.DoctorUserId==t.DoctorUserId && u.TrialReadingCriterionId==t.TrialReadingCriterionId ):true)
+                .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfIntraReaderAnalysisResults, t => t.IsSelfAnalysis == null ? t.Subject.SubjectVisitTaskList.Any(u => u.IsSelfAnalysis == true && u.DoctorUserId == t.DoctorUserId && u.TrialReadingCriterionId == t.TrialReadingCriterionId) : true)
                 .WhereIf(inQuery.ReadingExportType == ExportResult.DetailedTableOfInterReaderAnalysisResults, t => t.IsSelfAnalysis == false || t.IsSelfAnalysis == null)
 
                //访视和全局查询已签名完成的，裁判可以是未签名，未完成的
@@ -1763,8 +1763,9 @@ namespace IRaCIS.Core.Application.Service.Common
                             //非一致性分析任务
                             var cloneObj = subjectVisitTaskArm.Clone();
 
+                            var otherTaskQuestionAnserList = otherTask.QuestionAnswerList.Clone();
 
-                            foreach (var qItem in otherTask.QuestionAnswerList)
+                            foreach (var qItem in otherTaskQuestionAnserList)
                             {
                                 qItem.QuestionName = qItem.QuestionName + $"{(_userInfo.IsEn_Us ? "(Again)" : "(再次)")}";
                             }
@@ -1776,7 +1777,7 @@ namespace IRaCIS.Core.Application.Service.Common
                             addQuestionList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Reviwer Role(Again)" : "阅片人角色(再次)", QuestionValue = ((int)otherTask.ArmEnum).ToString(), TranslateDicName = "ArmEnum" });
 
 
-                            cloneObj.QuestionAnswerList = cloneObj.QuestionAnswerList.Union(otherTask.QuestionAnswerList).ToList();
+                            cloneObj.QuestionAnswerList = cloneObj.QuestionAnswerList.Union(addQuestionList).Union(otherTaskQuestionAnserList).ToList();
 
 
                             cloneObj.IsGroupAnalysisDiffToOriginalData = cloneObj.ArmEnum == Arm.DoubleReadingArm1 ? otherTask.IsGroupDiffArm1 : otherTask.IsGroupDiffArm2;
@@ -1785,6 +1786,7 @@ namespace IRaCIS.Core.Application.Service.Common
                         }
                     }
                 }
+                translateDicNameList.Add("ArmEnum");
 
                 list = newList;