This commit is contained in:
he
2024-10-24 09:24:45 +08:00
parent 9385e22c58
commit 2a853e49f6
6 changed files with 18090 additions and 3 deletions
@@ -1620,7 +1620,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid SystemCriterionId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public List<string> TypeList { get; set; } = new List<string>();
}
@@ -1630,7 +1634,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid TrialCriterionId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public List<string> TypeList { get; set; } = new List<string>();
@@ -138,7 +138,8 @@ namespace IRaCIS.Core.Application.Service
var result = await _readingQuestionSystemRepository
.Where(x => x.ReadingQuestionCriterionSystemId == inDto.SystemCriterionId)
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
.WhereIf(inDto.TypeList.Count() > 0, x => inDto.TypeList.Contains(x.Type))
.OrderBy(x => x.ShowOrder)
.Select(x => new GetCalculateQuestionsOutDto
()