diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index d967834a3..16e259776 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -24,7 +24,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public string QuestionName { get; set; } = string.Empty;
         public string TypeValue { get; set; } = string.Empty;
 
-        public int? CriterionEnum { get; set; }
+        public CriterionType? CriterionTypeEnum { get; set; }
+
+        public bool? IsGeneral { get; set; }
 
         public Guid? TrialReadingCriterionId { get; set; }
 
@@ -189,9 +191,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public ReadingCategory ReadingCategory { get; set; }
 
 
-        public string CriterionEnumStr { get; set; } = string.Empty;
+        public CriterionType CriterionTypeEnum { get; set; }
 
-        public List<int> CriterionEnumList { get; set; }
+        public bool IsGeneral { get; set; }
     }
 
     public class ReadingMedicineTrialQuestionView : ReadingMedicineSystemQuestionAddOrEdit
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
index 0a35dbe12..6bfaa2972 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
@@ -54,8 +54,9 @@ namespace IRaCIS.Core.Application.Service
 				  .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
 				  .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}|"))
+				  .WhereIf(inDto.CriterionTypeEnum != null, x => x.CriterionTypeEnum==inDto.CriterionTypeEnum)
+				  .WhereIf(inDto.TrialReadingCriterionId != null, x => x.CriterionTypeEnum== criterionEnum || x.IsGeneral==true)
+				  .WhereIf(inDto.IsGeneral != null, x => x.IsGeneral == inDto.IsGeneral)
 				  .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder);
 
 			return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize,inDto.SortField,inDto.Asc);
@@ -107,7 +108,7 @@ namespace IRaCIS.Core.Application.Service
 				return ResponseOutput.NotOk("当前问题序号存在重复");
 			}
 
-			inDto.CriterionEnumStr = $"|{String.Join('|', inDto.CriterionEnumList)}|";
+			//inDto.CriterionEnumStr = $"|{String.Join('|', inDto.CriterionEnumList)}|";
 
 			var entity = await _readingMedicineSystemQuestionRepository.InsertOrUpdateAsync(inDto);
 			await _readingMedicineSystemQuestionRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 9b67048c8..3303edf19 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -76,7 +76,7 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
                   IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
                   IRepository<ReadingQuestionSystem> ReadingQuestionSystem,
-                   ITrialEmailNoticeConfigService trialEmailNoticeConfigService
+                   ITrialEmailNoticeConfigService trialEmailNoticeConfigService,
                     IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem,
                   IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
           )
diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
index c9411b234..83c26f232 100644
--- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
+++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
@@ -90,11 +90,17 @@ namespace IRaCIS.Core.Domain.Models
 		public ReadingMedicineSystemQuestion ParentQuestion { get; set; }
 
 
-		//  |1|2| 这种保存
-        public string CriterionEnumStr { get; set; } = string.Empty;
 
-        [NotMapped]
-        public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList();
+		public CriterionType CriterionTypeEnum { get; set; }
 
-    }
+		public bool IsGeneral { get; set; }
+
+
+		////  |1|2| 这种保存
+		//      public string CriterionEnumStr { get; set; } = string.Empty;
+
+		//      [NotMapped]
+		//      public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList();
+
+	}
 }