添加LimitShow 限制显示

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -356,6 +356,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>
@@ -475,6 +480,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>
@@ -1040,6 +1050,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>
@@ -1111,6 +1126,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>
@@ -1623,6 +1643,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>
@@ -2002,6 +2027,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 最大答案长度
 		/// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -765,6 +765,16 @@ namespace IRaCIS.Application.Services
 
                 var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
+                if (taskinfo.VisitTaskNum == 0)
+                {
+                    questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow).ToList();
+
+                }
+                else
+                {
+					questions = questions.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
+				}
+
                 questions.ForEach(x =>
                 {
                     x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskinfo.IsConvertedTask);
@@ -1011,8 +1021,18 @@ namespace IRaCIS.Application.Services
             if (inDto.TaskId != null)
             {
                 taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+				if (taskInfo.VisitTaskNum == 0)
+				{
+					qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.BaseLineShow).ToList();
 
-                qusetionList.ForEach(x =>
+				}
+				else
+				{
+					qusetionList = qusetionList.Where(x => x.LimitShow == LimitShow.AllShow || x.LimitShow == LimitShow.FollowShow).ToList();
+				}
+
+
+				qusetionList.ForEach(x =>
                 {
                     x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(taskInfo.IsConvertedTask);
                 });

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2413,10 +2413,34 @@ public enum PET5PSScore
 
     }
 
-    /// <summary>
+
-    /// 限制编辑
+
-    /// </summary>
+	/// <summary>
-    public enum LimitEdit
+	/// 显示限制
+	/// </summary>
+	public enum LimitShow
+	{
+		/// <summary>
+		/// 全都显示
+		/// </summary>
+		AllShow = 0,
+
+		/// <summary>
+		/// 基线显示
+		/// </summary>
+		BaseLineShow = 1,
+
+		/// <summary>
+		/// 随访显示
+		/// </summary>
+		FollowShow = 2,
+
+	}
+
+	/// <summary>
+	/// 限制编辑
+	/// </summary>
+	public enum LimitEdit
     {
 
         /// <summary>

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -182,6 +182,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
 
 		/// <summary>
 		/// 数据来源

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -231,6 +231,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
 
+		/// <summary>
+		/// 限制显示
+		/// </summary>
+		public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
 		/// <summary>
 		/// 自定义计算标记
 		/// </summary>