From 1676516441796e44f7cc16732d11373ebc3295c5 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 6 Jan 2025 16:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Helper/FileDocProcess/ExcelExportHelper.cs              | 6 +++++-
 .../Service/TrialSiteUser/TrialConfigService.cs             | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
index 48700c78c..cc94a4302 100644
--- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
@@ -421,7 +421,7 @@ public static class ExcelExportHelper
                 workbook.RemoveSheetAt(1);
             }
 
-            //中文替换项目术语
+            #region 中文替换项目术语
             if (data.TrialObjectNameList?.Count > 0)
             {
                 var replaceObjectList = data.TrialObjectNameList;
@@ -457,6 +457,9 @@ public static class ExcelExportHelper
                     }
                 }
             }
+            #endregion
+
+
 
             if (dynamicColumnConfig != null)
             {
@@ -468,6 +471,7 @@ public static class ExcelExportHelper
                 //动态移除列的数量
                 var dynamicRemoveColunmCount = dynamicColumnConfig.RemoveColunmIndexList.Count();
 
+                //在动态列开始前移除的数量
                 var beforeDynamicRemoveCount = dynamicColumnConfig.RemoveColunmIndexList.Where(t => t < dynamicColumnConfig.AutoColumnStartIndex).Count();
 
                 //动态添加列的数量
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 2ab7a341a..acff62e72 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -1362,12 +1362,14 @@ namespace IRaCIS.Core.Application
         [AllowAnonymous]
         public async Task<TrialExtraConfig> GetTrialExtralConfig(Guid trialId)
         {
-            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList }).FirstOrDefault();
+            var extralObj = _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.TrialExtraConfigJsonStr, t.TrialObjectNameList, t.CollectImagesEnum }).FirstOrDefault();
 
             var extralConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(extralObj?.TrialExtraConfigJsonStr) ?? new TrialExtraConfig();
 
             extralConfig.TrialObjectNameList = extralObj.TrialObjectNameList;
 
+            extralConfig.CollectImagesEnum = extralConfig.CollectImagesEnum;
+
             return extralConfig;
         }
         /// <summary>