x

IRaCIS.Core.API/Startup.cs

@@ -164,6 +164,7 @@ namespace IRaCIS.Core.API
 
             app.UseForwardedHeaders();
 
+            app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 
             //不需要 token 访问的静态文件  wwwroot css, JavaScript, and images don't require authentication.
             app.UseStaticFiles();
@@ -209,7 +210,7 @@ namespace IRaCIS.Core.API
 
             app.UseRouting();
 
-            app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
+            //app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader());
 
 
             app.UseAuthentication();

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

@@ -3065,6 +3065,26 @@
             无效的 为True无效
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.ReadingTool">
+            <summary>
+            阅片工具
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.IsReadingTaskViewInOrder">
+            <summary>
+            任务展示访视 读片任务显示是否顺序
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.IsReadingShowSubjectInfo">
+            <summary>
+            阅片是否显示受试者信息
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetIRMedicalFeedbackListOutDto.IsReadingShowPreviousResults">
+            <summary>
+            IR阅片页面是否可以查看既往任务结果
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewDialogOutDto.Content">
             <summary>
             对话内容

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

@@ -201,6 +201,14 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TaskMedicalReview, TaskMedicalReviewView>().IncludeMembers(t => t.VisitTask)
 
                  .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionName))
+                  .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.ReadingTool))
+                  .ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder))
+                  .ForMember(o => o.IsReadingShowSubjectInfo, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingShowSubjectInfo))
+                  .ForMember(o => o.IsReadingShowPreviousResults, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingShowPreviousResults))
+                  .ForMember(o => o.DigitPlaces, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.DigitPlaces))
+                  .ForMember(o => o.IseCRFShowInDicomReading, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IseCRFShowInDicomReading))
+                  .ForMember(o => o.CriterionType, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionType))
+
                  .ForMember(o => o.Id, t => t.MapFrom(u => u.Id))
                  .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.VisitTask.Subject.MedicalNo))
                  .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser))

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -308,17 +308,21 @@ namespace IRaCIS.Core.Application.Contracts
         public string TrialSiteCode { get; set; } = string.Empty;
 
 
-        
+        public CriterionType CriterionType { get; set; }
-
+
+        public ReadingMethod ReadingType { get; set; }
 
 
+        ///// <summary>
+        ///// 任务展示访视 读片任务显示是否顺序
+        ///// </summary>
+        //public bool IsReadingTaskViewInOrder { get; set; } = true;
     }
 
     public class ReadingPeriodOrVisitInfo
     {
 
 
-
         public Guid SubjectVisitId { get; set; }
 
         //核查状态
@@ -351,6 +355,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("Subject_Visit_Status")]
         public SubjectStatus SubjectStatus { get; set; }
+       public string TrialReadingCriterionName { get; set; }
 
 
         public DateTime? FirstGiveMedicineTime { get; set; }
@@ -358,10 +363,6 @@ namespace IRaCIS.Core.Application.Contracts
         public string ModuleName { get; set; }
 
 
-
-
-        public string TrialReadingCriterionName { get; set; }
-
         public string DeadlineVisitName { get; set; }
 
 
@@ -369,6 +370,9 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? LatestScanDate { get; set; }
 
 
+
+
+
     }
 
     public class UnionStudyExportDTO

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

@@ -147,6 +147,33 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public TaskState TaskState { get; set; }
 
         public string TrialReadingCriterionName { get; set; }
+
+        /// <summary>
+        /// 阅片工具
+        /// </summary>
+        public ReadingTool? ReadingTool { get; set; }
+
+        /// <summary>
+        /// 任务展示访视 读片任务显示是否顺序
+        /// </summary>
+        public bool IsReadingTaskViewInOrder { get; set; } = true;
+
+
+        /// <summary>
+        /// 阅片是否显示受试者信息
+        /// </summary>
+        public bool IsReadingShowSubjectInfo { get; set; } = false;
+
+        /// <summary>
+        /// IR阅片页面是否可以查看既往任务结果
+        /// </summary>
+        public bool IsReadingShowPreviousResults { get; set; } = false;
+
+        public int? DigitPlaces { get; set; } = 2;
+
+        public bool IseCRFShowInDicomReading { get; set; } = false;
+
+        public CriterionType CriterionType { get; set; }
     }
 
     public class FinishMedicalReviewInDto

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -622,7 +622,15 @@ namespace IRaCIS.Core.Application.Service
                     MedicalDialogCloseEnum=x.MedicalDialogCloseEnum,
                     IsInvalid=x.IsInvalid,
 
-                    TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName
+                    TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName,
+                    ReadingTool= x.VisitTask.TrialReadingCriterion.ReadingTool,
+
+                    IsReadingTaskViewInOrder = x.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder,
+                    IsReadingShowSubjectInfo = x.VisitTask.TrialReadingCriterion.IsReadingShowSubjectInfo,
+                    IsReadingShowPreviousResults = x.VisitTask.TrialReadingCriterion.IsReadingShowPreviousResults,
+                    DigitPlaces = x.VisitTask.TrialReadingCriterion.DigitPlaces,
+                    IseCRFShowInDicomReading = x.VisitTask.TrialReadingCriterion.IseCRFShowInDicomReading,
+                    CriterionType = x.VisitTask.TrialReadingCriterion.CriterionType,
 
                 }).WhereIf(!inDto.SubjectCode.IsNullOrEmpty(), x => x.SubjectCode == inDto.SubjectCode);