diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 4983fb326..3b55fe1bf 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -356,6 +356,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
@@ -475,6 +480,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
@@ -1040,6 +1050,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
@@ -1111,6 +1126,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
@@ -1623,6 +1643,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
@@ -2002,6 +2027,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 最大答案长度
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 439ef3c4b..f78d2a27b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/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(_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(_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);
});
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index b3d5cebd1..fd28b89c1 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -2413,10 +2413,34 @@ public enum PET5PSScore
}
- ///
- /// 限制编辑
- ///
- public enum LimitEdit
+
+
+ ///
+ /// 显示限制
+ ///
+ public enum LimitShow
+ {
+ ///
+ /// 全都显示
+ ///
+ AllShow = 0,
+
+ ///
+ /// 基线显示
+ ///
+ BaseLineShow = 1,
+
+ ///
+ /// 随访显示
+ ///
+ FollowShow = 2,
+
+ }
+
+ ///
+ /// 限制编辑
+ ///
+ public enum LimitEdit
{
///
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
index 1b7e453c3..1de10ce86 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
@@ -182,6 +182,10 @@ namespace IRaCIS.Core.Domain.Models
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
///
/// 数据来源
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index 0ffbd778d..89f2cfec6 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -231,6 +231,11 @@ namespace IRaCIS.Core.Domain.Models
///
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
+ ///
+ /// 限制显示
+ ///
+ public LimitShow LimitShow { get; set; } = LimitShow.AllShow;
+
///
/// 自定义计算标记
///