Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -58,16 +58,10 @@ namespace IRaCIS.Core.Application.Service
         {
             List<ExportResult> needAdd = new List<ExportResult>()
             {
+                ExportResult.DetailedTableOfAdjudicationResults,
+                ExportResult.DetailedTableOfIntraReaderAnalysisResults,
+                ExportResult.DetailedTableOfInterReaderAnalysisResults
             };
-            if (inDto.ExportType == ExportType.Basic)
-            {
-                needAdd = new List<ExportResult>()
-                {
-                    ExportResult.DetailedTableOfAdjudicationResults,
-                    ExportResult.DetailedTableOfIntraReaderAnalysisResults,
-                    ExportResult.DetailedTableOfInterReaderAnalysisResults
-                };
-            }
             foreach (var item in inDto.QuestionList) 
              {
                 item.ExportResult= item.ExportResult.Except(needAdd).ToList();
@@ -141,12 +135,7 @@ namespace IRaCIS.Core.Application.Service
                 x.Children = tableQuestionList.Where(y => y.QuestionId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList();
             });
 
-            List<string> dicCode = new List<string>() { "1","2"};
-
-            if (inDto.ExportType == ExportType.CDISC)
-            {
-                dicCode = new List<string>() { "8" };
-            }
+            List<string> dicCode = new List<string>() { "1","2", "8" };
             var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult")
                 .Where(x=> dicCode.Contains(x.Code))
                 .OrderBy(x => x.ShowOrder)