From efc595c6153a67e1fb225b750cf90dc4dba20a3e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Sat, 8 Oct 2022 13:26:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTaskService.cs        |  3 +-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  | 15 +++++
 .../Reading/ReadingQuestionCriterionTrial.cs  | 63 +++++++++++++++++++
 .../Reading/View/ReadModuleView.cs            |  9 ++-
 4 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 1f002c5b8..a2d2cf745 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -2134,7 +2134,8 @@ namespace IRaCIS.Application.Services
                 .Select(x => new
                 {
                     QuestionMark = x.ReadingTableQuestionTrial.QuestionMark,
-                    Answer = x.Answer
+                    Answer = x.Answer,
+
                 }).ToListAsync();
 
             if (tableAnswerList.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.IsNullOrEmpty()))
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 373b4f570..1ad86e78b 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -17,6 +17,21 @@ namespace IRaCIS.Core.Domain.Share
     }
 
 
+    public enum ImagePlatform
+    {
+        None=0,
+
+
+        MINT=1,
+
+        Ambra=2,
+
+        /// <summary>
+        /// 展影
+        /// </summary>
+        PACS=3,
+    }
+
     /// <summary>
     /// 标准类型
     /// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
index 45718d768..b7e40fab1 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
@@ -114,6 +114,69 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public CriterionType? CriterionType { get; set; }
 
+		#region 阅片单元配置 新加
+
+		/// <summary>
+		/// 阅片平台 
+		/// </summary>
+		public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.MINT;
+
+		/// <summary>
+		/// 阅片工具
+		/// </summary>
+		public ReadingTool? ReadingTool { get; set; }
+
+		/// <summary>
+		/// 任务组织级别
+		/// </summary>
+		public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
+
+
+		/// <summary>
+		/// 阅片是否显示受试者信息
+		/// </summary>
+		public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+		/// <summary>
+		/// IR阅片页面是否可以查看既往任务结果
+		/// </summary>
+		public bool IsReadingShowPreviousResults { get; set; } = false;
+
+
+		/// <summary>
+		/// 仲裁对象
+		/// </summary>
+		public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
+
+
+		/// <summary>
+		/// 阅片模式
+		/// </summary>
+		public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
+
+		/// <summary>
+		/// 全局阅片
+		/// </summary>
+		public bool IsGlobalReading { get; set; } = true;
+
+		/// <summary>
+		/// 仲裁阅片
+		/// </summary>
+		public bool IsArbitrationReading { get; set; } = true;
+
+
+		/// <summary>
+		/// 肿瘤学阅片  原字段 IsClinicalReading
+		/// </summary>
+		public bool IsOncologyReading { get; set; }
+
+		/// <summary>
+		/// 任务展示访视
+		/// </summary>
+		public bool IsReadingTaskViewInOrder { get; set; } = true;
+
+		#endregion
+
 		/// <summary>
 		/// 项目
 		/// </summary>
diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
index 23c3c1545..5c9687998 100644
--- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
+++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs
@@ -147,8 +147,15 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsBaseLine { get; set; } = false;
 
 
+        /// <summary>
+        /// 标准Id
+        /// </summary>
+        public Guid? TrialReadingCriterionId { get; set; }
 
 
-        //public Guid? TrialReadingCriterionId { get; set; }
+        /// <summary>
+        /// 标准名称
+        /// </summary>
+        public string CriterionName { get; set; } 
     }
 }