diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 18989d205..b098f7af3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -124,9 +124,10 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task GetTrialQuestionExportResult(GetTrialQuestionExportResultInDto inDto) { + List notShowType=new List() { ReadingQestionType.Group, ReadingQestionType.Screenshot, ReadingQestionType.Summary, ReadingQestionType.Upload }; 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) + var questionList = await _readingQuestionTrialRepository.Where(x => !notShowType.Contains(x.Type) && x.ReadingQuestionCriterionTrialId == inDto.TrialReadingCriterionId) .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() { QuestionId = x.Id, @@ -140,6 +141,7 @@ namespace IRaCIS.Core.Application.Service var questionid = questionList.Select(x => x.QuestionId).ToList(); var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => questionid.Contains(x.ReadingQuestionId)) + .Where(x => !notShowType.Contains(x.Type)) .OrderBy(x => x.ShowOrder).Select(x => new TrialQuestionExport() { QuestionId = x.ReadingQuestionId, @@ -156,7 +158,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", "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) diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 56017d2ef..c9224209c 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -16,6 +16,21 @@ namespace IRaCIS.Core.Domain.Share public static readonly string BasicTable = "basicTable"; public static readonly string Group = "group"; + + /// + /// 截图 + /// + public static readonly string Screenshot = "screenshot"; + + /// + /// 小结 + /// + public static readonly string Summary = "summary"; + + /// + /// 附件 + /// + public static readonly string Upload = "upload"; }