diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index a577c15f9..a53094fa6 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -58,16 +58,10 @@ namespace IRaCIS.Core.Application.Service { List needAdd = new List() { + ExportResult.DetailedTableOfAdjudicationResults, + ExportResult.DetailedTableOfIntraReaderAnalysisResults, + ExportResult.DetailedTableOfInterReaderAnalysisResults }; - if (inDto.ExportType == ExportType.Basic) - { - needAdd = new List() - { - 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 dicCode = new List() { "1","2"}; - - if (inDto.ExportType == ExportType.CDISC) - { - dicCode = new List() { "8" }; - } + List dicCode = new List() { "1","2", "8" }; var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult") .Where(x=> dicCode.Contains(x.Code)) .OrderBy(x => x.ShowOrder)