IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -1877,9 +1877,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetTrialQuestionExportResultOutDto
     {
-        public CriterionType CriterionType { get; set; }
-        public CriterionGroup CriterionGroup { get; set; }
-
         public List<TrialQuestionExport> QuestionList = new List<TrialQuestionExport>();
 
         public List<TrialQuestionExportDic> DicList = new List<TrialQuestionExportDic>();
@@ -1903,8 +1900,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public int ShowOrder { get; set; }
 
-        public bool IsTableQuestion { get; set; }
-
         public bool HasChildren => Children.Count() > 0;
 
         public List<TrialQuestionExport> Children { get; set; } = new List<TrialQuestionExport>();

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

@@ -117,8 +117,6 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<GetTrialQuestionExportResultOutDto> GetTrialQuestionExportResult(GetTrialQuestionExportResultInDto inDto)
         {
-
-            var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
             var questionList = await _readingQuestionTrialRepository.Where(x => x.Type != ReadingQestionType.Group && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId)
                 .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport()
                 {
@@ -126,7 +124,6 @@ namespace IRaCIS.Core.Application.Service
                     QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
                     ExportResult = x.ExportResult,
                     ShowOrder = x.ShowOrder,
-                    IsTableQuestion=false,
                     CDISCCode = x.CDISCCode,
                 }).ToListAsync();
 
@@ -140,7 +137,6 @@ namespace IRaCIS.Core.Application.Service
                    QuestionName = _userInfo.IsEn_Us ? x.QuestionEnName : x.QuestionName,
                    ExportResult = x.ExportResult,
                    ShowOrder = x.ShowOrder,
-                   IsTableQuestion=true,
                    CDISCCode = x.CDISCCode,
                }).ToListAsync();
 
@@ -163,8 +159,6 @@ namespace IRaCIS.Core.Application.Service
 
             return new GetTrialQuestionExportResultOutDto()
             {
-                CriterionType = criterionInfo.CriterionType,
-                CriterionGroup = criterionInfo.CriterionGroup,
                 DicList = dicList,
                 QuestionList = questionList
             };