Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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;
@@ -614,9 +613,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
 
 
-
-
-
         /// <summary>
         /// 访视任务
         /// </summary>
@@ -704,9 +700,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         }
 
 
-
-
-
         /// <summary>
         /// PM阅片跟踪
         /// </summary>
@@ -749,8 +742,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
         }
 
 
-
-
         /// <summary>
         /// PM 重阅追踪 
         /// </summary>

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>

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
 
             });
 

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; }