From 69f3072a05d43406fe52d4f8ddeca86207463fc0 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 28 Oct 2022 17:21:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingQuestionViewModel.cs   | 22 +++++++++++++++++
 .../ReadingJudgeTaskService.cs                |  3 +++
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 24 +++++++++++++++++++
 .../ReadingQuestionSystem.cs                  |  5 ++++
 .../ReadingQuestionTrial.cs                   |  5 ++++
 5 files changed, 59 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index c357a9a35..8d30e0a12 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -614,6 +614,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string GroupName { get; set; }
 
+
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 问题类型
 		/// </summary>
@@ -777,6 +783,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public TableQuestionType? QuestionGenre { get; set; }
 
+
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 字典code
 		/// </summary>
@@ -1089,6 +1101,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public ValueUnit? Unit { get; set; }
 
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 分组
 		/// </summary>
@@ -1223,6 +1240,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid TrialId { get; set; }
 
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 系统标准Id
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index 4810774c5..8759156da 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -602,6 +602,9 @@ namespace IRaCIS.Application.Services
                                     }
                                 });
                                 break;
+                            case JudgeTypeEnum.NotCalculate:
+                                noteEqual = false;
+                                break;
                         }
                     }
                 }
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 76d017d88..10eb98c9d 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -630,7 +630,27 @@ namespace IRaCIS.Core.Domain.Share
         Site = 1,
     }
 
+    /// <summary>
+    /// 全局阅片展示类型
+    /// </summary>
+    public enum GlobalReadingShowType
+    {
 
+        /// <summary>
+        /// 全都显示
+        /// </summary>
+        AllShow = 0,
+
+        /// <summary>
+        /// 基线显示
+        /// </summary>
+        BaseLineShow = 1,
+
+        /// <summary>
+        /// 随访显示
+        /// </summary>
+        FollowVisitShow = 2
+    }
 
 
 
@@ -1012,6 +1032,10 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         AnswerCombination = 3,
 
+        /// <summary>
+        /// 不计算
+        /// </summary>
+        NotCalculate=4,
 
     }
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
index d2b32e44b..a3c61b0df 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
@@ -140,6 +140,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public TableQuestionType? QuestionGenre { get; set; }
 
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 数值类型
 		/// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
index 67ae122f6..4f94ca1ff 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
@@ -77,6 +77,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public QuestionType? QuestionType { get; set; }
 
+		/// <summary>
+		/// 全局阅片显示类型
+		/// </summary>
+		public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.AllShow;
+
 		/// <summary>
 		/// 备注
 		/// </summary>