修改一版

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -351,6 +351,10 @@ namespace IRaCIS.Core.Application.Service
                 .Where(t => t.UnReadTaskCount > 0);
 
 
+                //var visitQuery=_visitTaskRepository.Where(x=>x.TrialId==trialId&&x.DoctorUserId== _userInfo.Id)
+                //    .GroupBy(x=> new )
+
+
                 var result = await subjectQuery.ToPagedListAsync(iRUnReadSubjectQuery.PageIndex, iRUnReadSubjectQuery.PageSize, String.IsNullOrEmpty(iRUnReadSubjectQuery.SortField) ? nameof(IRUnReadSubjectView.SubjectId) : iRUnReadSubjectQuery.SortField, iRUnReadSubjectQuery.Asc);
                 return (result, new
                 {

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -123,7 +123,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsClinicalReading { get; set; }
 
 
-        public int ArbitrationRule { get; set; }
+      
 
         public int? DigitPlaces { get; set; }
 
@@ -133,6 +133,25 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsReadingTaskViewInOrder { get; set; }
 
 
+        /// <summary>
+        /// 仲裁规则
+        /// </summary>
+        public ArbitrationRule ArbitrationRule { get; set; }
+
+
+        /// <summary>
+        /// 阅片是否显示受试者信息
+        /// </summary>
+        public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+        /// <summary>
+        /// 阅片是否显示既往结果
+        /// </summary>
+        public bool IsReadingShowPreviousResults { get; set; } = false;
+
+        public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
+
+
     }
 
 
@@ -186,7 +205,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsClinicalReading { get; set; }
 
 
-        public int ArbitrationRule { get; set; }
+        public ArbitrationRule ArbitrationRule { get; set; }
 
      
     }
@@ -341,7 +360,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 仲裁规则/对象
         /// </summary>
-        public int ArbitrationRule { get; set; } = 2;
+        public ArbitrationRule ArbitrationRule { get; set; }
 
 
         /// <summary>
@@ -746,7 +765,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool? IsClinicalReading { get; set; }
 
 
-        public int ArbitrationRule { get; set; }
+        public ArbitrationRule ArbitrationRule { get; set; }
 
 
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -503,7 +503,17 @@ namespace IRaCIS.Core.Application
 
             var trialInfo = await _trialRepository.Where(t => t.Id == trialConfig.TrialId, true).Include(t => t.TrialDicList.Where(u => u.KeyName == StaticData.Criterion)).FirstOrDefaultAsync();
             if (trialInfo == null) return Null404NotFound(trialInfo);
-
+            if (trialConfig.IsReadingTaskViewInOrder)
+            {
+                trialConfig.ReadingTaskViewEnum = ReadingTaskViewMethod.ReadingPeriodOrVisit;
+            }
+            else
+            {
+                trialConfig.ReadingTaskViewEnum = ReadingTaskViewMethod.Subject;
+                trialConfig.IsReadingShowPreviousResults = false;
+                trialConfig.IsReadingShowSubjectInfo = false;
+                trialConfig.ArbitrationRule = ArbitrationRule.Visit;
+            }
             _mapper.Map(trialConfig, trialInfo);
 
             trialInfo.UpdateTime = DateTime.Now;