报告修改

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

@@ -83,6 +83,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string QuestionName { get; set; }
 
+        public string QuestionEnName { get; set; }
+
         public bool IsCanEditPosition { get; set; } = false;
 
         public string BlindName { get; set; }
@@ -136,6 +138,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string? ReportMark { get; set; }
 
+        /// <summary>
+        /// 显示图表类型
+        /// </summary>
+        public ShowChartType ShowChartTypeEnum { get; set; } = ShowChartType.NotShow;
+
         /// <summary>
         /// 高亮问题的答案
         /// </summary>
@@ -192,6 +199,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    public class Globalanswer
+    {
+        public Guid TaskId { get; set; }
+
+        public string Answer { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
+
+        public Guid? QuestionId { get; set; }
+    }
 
     public class LesionDto
     {

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

@@ -15,9 +15,13 @@ namespace IRaCIS.Core.Application.Service
             //是否英文环境
             var isEn_Us = false;
 
-            CreateMap<ReadingQuestionTrial, ReadingReportDto>();
+            CreateMap<ReadingQuestionTrial, ReadingReportDto>()
+                .ForMember(d => d.QuestionId, u => u.MapFrom(s => s.Id));
+
+            CreateMap<ReadingTableQuestionTrial, ReadingReportDto>()
+                   .ForMember(d => d.QuestionId, u => u.MapFrom(s => s.ReadingQuestionId))
+                    .ForMember(d => d.TableQuestionId, u => u.MapFrom(s => s.Id));
 
-            CreateMap<ReadingTableQuestionTrial, ReadingReportDto>();
 
 
             CreateMap<SystemCriterionKeyFile, SystemCriterionKeyFileView>();