From 1a64c07c8e6193c7a2273ae066f739efddac4bde Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 6 Jan 2025 17:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=A1=A8=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs      | 29 ++++++++++++++-----
 .../Service/QC/DTO/QCListViewModel.cs         | 10 ++++---
 .../Service/QC/_MapConfig.cs                  |  1 +
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 428317322..0d6cc4f25 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -2122,10 +2122,20 @@ namespace IRaCIS.Core.Application.Service.Common
                 export_Template = StaticData.Export.ReadingLession_Export;
 
             }
+            else if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
+            {
+                //OCT
+                export_Template = StaticData.Export.OCT_ReadingLession_Export;
+
+            }
 
 
-            //病灶明细表 需要单独处理
-            if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions && inQuery.ReadingExportType != ExportResult.OCT_ReadingLession_Export)
+
+            if (inQuery.ReadingExportType == ExportResult.TableOfAssessmentResults ||
+                inQuery.ReadingExportType == ExportResult.DetailedTableOfAssessmentResults ||
+                 inQuery.ReadingExportType == ExportResult.DetailedTableOfAdjudicationResults
+                )
+
             {
                 //其他可以统一处理
                 list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
@@ -2138,13 +2148,10 @@ namespace IRaCIS.Core.Application.Service.Common
                      isEn_Us = _userInfo.IsEn_Us
                  }).ToListAsync();
             }
-            else
+            //病灶明细表  斑块表 需要单独处理
+            else if (inQuery.ReadingExportType == ExportResult.DetailedTableOfLesions ||
+                inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
             {
-                //病灶明细表
-                if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
-                {
-                    export_Template = StaticData.Export.OCT_ReadingLession_Export;
-                }
 
                 var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
                  new
@@ -2241,6 +2248,12 @@ namespace IRaCIS.Core.Application.Service.Common
 
                 }
 
+            }
+            else if (inQuery.ReadingExportType == ExportResult.CDISC)
+            {
+                // 配置在外层问题 或者表格问题上
+
+
             }
 
             #endregion
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 9fe4dab16..ffe5176de 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -1231,10 +1231,10 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class CommonLessionExport : CommonEvaluationExport
     {
-        /// <summary>
-        /// 最终导出的病灶信息
-        /// </summary>
-        public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; }
+        ///// <summary>
+        ///// 最终导出的病灶信息
+        ///// </summary>
+        //public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; }
 
 
         [JsonIgnore]
@@ -1267,6 +1267,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string QuestionValue { get; set; }
 
         public string TranslateDicName { get; set; }
+
+        public string CDISCCode { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 8d3f6badc..241024ac7 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -295,6 +295,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.QuestionMark, t => t.MapFrom(u => u.ReadingTableQuestionTrial.QuestionMark))
                  .ForMember(o => o.QuestionName, t => t.MapFrom(u => isEn_Us ? u.ReadingTableQuestionTrial.QuestionEnName : u.ReadingTableQuestionTrial.QuestionName))
                  .ForMember(o => o.QuestionValue, t => t.MapFrom(u => u.Answer))
+                  .ForMember(o => o.CDISCCode, t => t.MapFrom(u => u.ReadingTableQuestionTrial.CDISCCode))
                  .ForMember(o => o.TranslateDicName, t => t.MapFrom(u => u.ReadingTableQuestionTrial.DictionaryCode))
                  ;