From db63148ae04de80bb5f728fe67fd73271ea8a530 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 10 Oct 2022 17:10:39 +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

---
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       | 64 +++++++++++--------
 .../TrialSiteUser/TrialConfigService.cs       |  7 +-
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 444fa5a1..02295714 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -383,38 +383,28 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 仲裁阅片
         /// </summary>
-        public bool? IsArbitrationReading { get; set; } 
+        public bool? IsArbitrationReading { get; set; }
 
 
-        ///// <summary>
-        ///// 全局阅片
-        ///// </summary>
-        //public bool IsGlobalReading { get; set; } = true;
+        /// <summary>
+        /// 阅片模式
+        /// </summary>
+        public ReadingMethod ReadingType { get; set; } 
 
-        ///// <summary>
-        ///// 阅片方式
-        ///// </summary>
-        //public int ReadingMode { get; set; } = 1;
+        /// <summary>
+        /// 全局阅片
+        /// </summary>
+        public bool IsGlobalReading { get; set; }
 
-        ///// <summary>
-        ///// 阅片模式
-        ///// </summary>
-        //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
 
-        ///// <summary>
-        ///// 仲裁阅片
-        ///// </summary>
-        //public bool? IsArbitrationReading { get; set; } = true;
 
-        ///// <summary>
-        ///// 肿瘤学阅片
-        ///// </summary>
-        //public bool IsClinicalReading { get; set; }
 
-        ///// <summary>
-        ///// 读片任务显示是否顺序
-        ///// </summary>
-        //public bool IsReadingTaskViewInOrder { get; set; } = true;
+        /// <summary>
+        /// 肿瘤学阅片  原字段 IsClinicalReading
+        /// </summary>
+        public bool IsOncologyReading { get; set; }
+
+
 
 
 
@@ -825,6 +815,30 @@ namespace IRaCIS.Core.Application.Contracts
         /// 仲裁规则/对象
         /// </summary>
         public ArbitrationRule ArbitrationRule { get; set; }
+
+
+
+        /// <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; }
+
     }
 
     public class SignConfirmDTO
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index a92e4d59..eac57454 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -329,7 +329,12 @@ namespace IRaCIS.Core.Application
                 IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults,
                 ImagePlatform=inDto.ImagePlatform,
                 ArbitrationRule=inDto.ArbitrationRule,
-               
+                ReadingType = inDto.ReadingType,
+                IsGlobalReading = inDto.IsGlobalReading,
+                IsArbitrationReading = inDto.IsArbitrationReading,
+                IsOncologyReading = inDto.IsOncologyReading,
+              
+
             });
 
             var result = await _readingQuestionCriterionTrialRepository.SaveChangesAsync();