Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -925,7 +925,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     return new GetNextIQCQualityOutDto() { };
                     break;
                 case TrialQCProcess.SingleAudit:
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId != _userInfo.Id && (x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId!= _userInfo.Id&&(x.CurrentActionUserId == _userInfo.Id || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake))).Include(x => x.Subject).ToListAsync();
 
                     subjectVisit = visitList.Where(x => x.SubjectId == inDto.SubjectId).OrderBy(x => x.VisitNum).FirstOrDefault();
                     if (subjectVisit != null)
@@ -953,7 +953,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     break;
                 case TrialQCProcess.DoubleAudit:
 
-                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState != SubmitStateEnum.None && x.TrialId == inDto.TrialId &&
+                    visitList = await _subjectVisitRepository.Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId &&
                     ((x.CurrentActionUserId == _userInfo.Id)||(!x.IsTake&& x.AuditState != AuditStateEnum.QCPassed&& (x.PreliminaryAuditUserId != _userInfo.Id)))
                     ).Include(x => x.Subject).ToListAsync();
                     if (subjectVisit != null)

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

@@ -346,6 +346,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>
@@ -454,6 +459,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>
@@ -1000,6 +1010,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>
@@ -1058,6 +1073,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>
@@ -1560,6 +1580,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>
@@ -1916,6 +1941,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

@@ -748,6 +748,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);
@@ -972,8 +982,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

@@ -1811,10 +1811,34 @@ namespace IRaCIS.Core.Domain.Share
 
     }
 
-    /// <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

@@ -181,6 +181,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>