修改bug

2022-10-26 12:04:58 +08:00
parent a2f5f9abc2
commit 55e26202d8
7 changed files with 65 additions and 48 deletions
@@ -26,11 +26,16 @@ namespace IRaCIS.Core.Application.ViewModel

        public int? CriterionEnum { get; set; }

+        public Guid? TrialReadingCriterionId { get; set; }
+
        /// <summary>
        /// 任务类型
        /// </summary>
        public ReadingCategory? ReadingCategory { get; set; }

+
+
+
    }


@@ -45,6 +45,9 @@ namespace IRaCIS.Core.Application.Service
 		[HttpPost]
 		public async Task<List<ReadingMedicineSystemQuestionView>> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
 		{
+			//避免前端遍历 
+			var criterionEnum = inDto.TrialReadingCriterionId != null ? _readingQuestionCriterionTrialRepository.Where(t => t.Id == inDto.TrialReadingCriterionId).Select(t => t.CriterionType).FirstOrDefault(): CriterionType.NoCriterion;
+
 			var query = _readingMedicineSystemQuestionRepository.AsQueryable()
 				  .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
 				  .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
@@ -52,6 +55,7 @@ namespace IRaCIS.Core.Application.Service
 				  .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
 				  .WhereIf(inDto.ReadingCategory != null, x => x.ReadingCategory == inDto.ReadingCategory)
 				  .WhereIf(inDto.CriterionEnum != null, x => x.CriterionEnumStr.Contains($"|{inDto.CriterionEnum}|") )
+				  .WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionEnumStr.Contains($"|{criterionEnum}|"))
 				  .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
 			return await query.ToListAsync();
 		}