From 792a4235d2bf0f987533fd38ec63e502a339419f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 25 Oct 2024 17:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8bug=20?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index dafad5e04..fdb5f1de4 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2110,7 +2110,6 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var translateDicNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Distinct().ToList();
 
-            var columNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.QuestionName.IsNotNullOrEmpty()).Select(t => t.QuestionName).Distinct().ToList();
 
             //针对1.1 整体肿瘤评估 有的两列要合并一列
             if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.IRECIST1Point1)
@@ -2137,7 +2136,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     }
                     else
                     {
-                        item.QuestionAnswerList = item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
+                        item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
                     }
                 }
             }
@@ -2165,7 +2164,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     }
                     else
                     {
-                        item.QuestionAnswerList = item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
+                        item.QuestionAnswerList =  item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
                     }
                 }
             }
@@ -2174,6 +2173,8 @@ namespace IRaCIS.Core.Application.Service.Common
 
             }
 
+            var columNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.QuestionName.IsNotNullOrEmpty()).Select(t => t.QuestionName).Distinct().ToList();
+
             #endregion