修改接口

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -5822,16 +5822,6 @@
             仲裁阅片
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
-            <summary>
-            阅片模式
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsGlobalReading">
-            <summary>
-            全局阅片
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsOncologyReading">
             <summary>
             肿瘤学阅片  原字段 IsClinicalReading

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -834,8 +834,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid TrialId { get; set; }
 
-        [NotDefault]
+
-        public Guid VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs

@@ -1466,12 +1466,13 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<GetTrialConfirmCriterionListOutDto>> GetTrialConfirmCriterionList(GetConfirmCriterionInDto inDto)
         {
-            var result = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterion.IsConfirm && x.Id==inDto.VisitTaskId)
+            var result = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterion.IsConfirm )
+                .WhereIf(inDto.VisitTaskId !=null ,t=>t.Id==inDto.VisitTaskId)
                .Select(x => new GetTrialConfirmCriterionListOutDto()
                {
                    ReadingQuestionCriterionTrialId = x.TrialReadingCriterion.Id,
                    ReadingQuestionCriterionTrialName = x.TrialReadingCriterion.CriterionName
-               }).ToListAsync();
+               }).Distinct().ToListAsync();
             return result;
         }
         #endregion

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -216,46 +216,20 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsSubjectSecondCodeView { get; set; }
 
 
-        ///// <summary>
-        ///// 1 Mint、2 PACS  
-        ///// </summary>
-
-        //public int ImagePlatform { get; set; } = 1;
 
         //阅片方式
         public int ReadingMode { get; set; } = 1;
 
-        ////阅片类型 
-        //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
-
-
-        //public bool IsGlobalReading { get; set; } = true;
-
-        ///// <summary>
-        ///// 仲裁阅片
-        ///// </summary>
-        //public bool? IsArbitrationReading { get; set; } = true;
-
-        //public bool IsClinicalReading { get; set; }
-
-
-        ///// <summary>
-        ///// 仲裁规则
-        ///// </summary>
-        //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
 
 
         public int ChangeDefalutDays { get; set; } = 5;
 
-
         /// <summary>
         /// 跨项目复制
         /// </summary>
         public bool IsImageReplicationAcrossTrial { get; set; } = false;
 
 
-
-
         public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他";
 
 
@@ -337,6 +311,44 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime? DeletedTime { get; set; }
         public Guid? DeleteUserId { get; set; }
 
+        /// <summary>
+        /// 同步临床数据时间
+        /// </summary>
+        public DateTime? SyncClinicalDataTime { get; set; }
+
+        ///// <summary>
+        ///// 图像是否有标注
+        ///// </summary>
+        //public bool IsImageIabeled { get; set; }
+
+
+
+        ////阅片类型 
+        //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double;
+
+
+        //public bool IsGlobalReading { get; set; } = true;
+
+        ///// <summary>
+        ///// 仲裁阅片
+        ///// </summary>
+        //public bool? IsArbitrationReading { get; set; } = true;
+
+        //public bool IsClinicalReading { get; set; }
+
+
+        ///// <summary>
+        ///// 1 Mint、2 PACS  
+        ///// </summary>
+
+        //public int ImagePlatform { get; set; } = 1;
+
+
+        ///// <summary>
+        ///// 仲裁规则
+        ///// </summary>
+        //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None;
+
         ////任务分配对象
         //public TaskAllocateObj TaskAllocateObjEnum { get; set; }
 
@@ -374,10 +386,7 @@ namespace IRaCIS.Core.Domain.Models
         //public bool IsReadingShowPreviousResults { get; set; } = false;
 
 
-        /// <summary>
+
-        /// 同步临床数据时间
-        /// </summary>
-        public DateTime? SyncClinicalDataTime { get; set; }
 
         ///// <summary>
         ///// 是确认医学审核问题
@@ -385,10 +394,7 @@ namespace IRaCIS.Core.Domain.Models
 
         //public bool IsConfirmMedicineQuestion { get; set; } = false;
 
-        /// <summary>
+
-        /// 图像是否有标注
-        /// </summary>
-        public bool IsImageIabeled { get; set; }
 
 
         ///// <summary>