From 33bf0d908df51c493a1ed481268e224868f82a15 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 7 Nov 2024 14:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E5=85=A8=E5=B1=80=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/Common/ExcelExportService.cs | 2 +-
 IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 80efec6ee..ad1b6385c 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -1796,7 +1796,7 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var columNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.QuestionName.IsNotNullOrEmpty()).Select(t => t.QuestionName).Distinct().ToList();
 
-            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list.Where(t => t.ReadingCategory != ReadingCategory.Global).ToList(), _userInfo.TimeZoneId);
             exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
 
             var dynamicColumnConfig = new DynamicColumnConfig()
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index d75222599..bbf7745d7 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -1087,6 +1087,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string UserName { get; set; }
         public bool? IsBaseline { get; set; }
 
+        public ReadingCategory ReadingCategory { get; set; }
 
         /// <summary>
         /// 自身一致性分析任务上会有这个值