Test.EIImageViewer
hang 2022-10-13 15:43:48 +08:00
parent 988ac22ef6
commit 55228dfc26
1 changed files with 7 additions and 3 deletions

View File

@ -165,9 +165,13 @@ namespace IRaCIS.Core.Application.Service
UserCode = user.UserCode, UserCode = user.UserCode,
UserName = user.UserName, UserName = user.UserName,
UserTypeEnum = user.UserTypeRole.UserTypeEnum, UserTypeEnum = user.UserTypeRole.UserTypeEnum,
ReadingCategoryList = allocationRule.Enroll.EnrollReadingCategoryList.AsQueryable()
.WhereIf(selectQuery.ReadingCategory != null,t=> t.ReadingCategory == selectQuery.ReadingCategory) ReadingCategoryList = selectQuery.TrialReadingCriterionId == null ?
.WhereIf(selectQuery.TrialReadingCriterionId != null, t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId) allocationRule.Enroll.EnrollReadingCategoryList
.Select(t => t.ReadingCategory).OrderBy(t => t).ToList():
allocationRule.Enroll.EnrollReadingCategoryList
.Where( t => t.TrialReadingCriterionId == selectQuery.TrialReadingCriterionId)
.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() .Select(t => t.ReadingCategory).OrderBy(t=>t).ToList()
}; };