From 6578b610c9ebcaf8183e95167065d922aa643ce8 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 15 Mar 2023 15:32:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs      |  8 --------
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs | 12 ++++++++++++
 .../Service/TrialSiteUser/TrialConfigService.cs |  3 ++-
 .../ReadingQuestionCriterionTrial.cs            | 17 ++++++++++++-----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 65d277c49..1b7a9f847 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -614,9 +614,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
 
-
-
-
         /// <summary>
         /// 访视任务
         /// </summary>
@@ -704,9 +701,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         }
 
 
-
-
-
         /// <summary>
         /// PM阅片跟踪
         /// </summary>
@@ -749,8 +743,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         }
 
 
-
-
         /// <summary>
         /// PM 重阅追踪 
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index db323d43f..d38885b24 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -466,8 +466,13 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
+        //是否附加评估
+        public bool IsAdditionalAssessment { get; set; }
 
 
+        //自动  手动生成任务
+        public bool IsAutoCreate { get; set; }
+
 
 
     }
@@ -804,6 +809,13 @@ namespace IRaCIS.Core.Application.Contracts
     public class SetCriterionReadingInfoInDto
     {
 
+        //是否附加评估
+        public bool IsAdditionalAssessment { get; set; }
+
+
+        //自动  手动生成任务
+        public bool IsAutoCreate { get; set; }
+
         /// <summary>
         /// 项目标准ID
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 79a502e59..8e95155c4 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -552,7 +552,8 @@ namespace IRaCIS.Core.Application
                 IsGlobalReading = inDto.IsGlobalReading,
                 IsArbitrationReading = inDto.IsArbitrationReading,
                 IsOncologyReading = inDto.IsOncologyReading,
-
+                IsAdditionalAssessment=inDto.IsAdditionalAssessment,
+                IsAutoCreate=inDto.IsAutoCreate
 
             });
 
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
index f867001cf..4d5ad5f3a 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
@@ -233,12 +233,19 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsMustGlobalReading { get; set; } = false;
 
-		#endregion
 
-		/// <summary>
-		/// 项目
-		/// </summary>
-		[ForeignKey("TrialId")]
+		//是否附加评估
+		public bool IsAdditionalAssessment { get; set; }
+
+
+		//自动  手动生成任务
+        public bool IsAutoCreate { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 项目
+        /// </summary>
+        [ForeignKey("TrialId")]
         [JsonIgnore]
 		public Trial Trial { get; set; }
 

From 631c0c4327eb555a433f35e400d2d1a86f0339c0 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 15 Mar 2023 15:33:05 +0800
Subject: [PATCH 2/2] x

---
 IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 1b7a9f847..47ae89828 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -37,7 +37,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<SubjectUser> _subjectUserRepository;
-
         private readonly IRepository<ReadModule> _readModuleRepository;
 
         private readonly IRepository<VisitTaskReReading> _visitTaskReReadingRepository;