自身和组件一致性分析修改

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

@@ -995,6 +995,9 @@ namespace IRaCIS.Core.Application.Contracts
         public string ImageSizeStr => (FileSize / Math.Pow(1024, 2)).ToString("F3") + 'M';
     }
 
+
+
+
     public class AnalysisExortCommon
     {
         public Guid Id { get; set; }
@@ -1062,6 +1065,68 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class AnalysisDynamicCommonExport
+    {
+        public Guid Id { get; set; }
+        public string TaskName { get; set; }
+        public string TaskBlindName { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
+        public bool? IsSelfAnalysis { get; set; }
+
+        public string TrialReadingCriterionName { get; set; }
+
+        public CriterionType CriterionType { get; set; }
+
+        public String TrialSiteCode { get; set; } = String.Empty;
+        public string SubjectCode { get; set; } = String.Empty;
+
+        [DictionaryTranslateAttribute("ArmEnum")]
+        public Arm ArmEnum { get; set; }
+        public string UserName { get; set; }
+        public bool? IsBaseline { get; set; }
+
+
+        /// <summary>
+        /// 自身一致性分析任务上会有这个值
+        /// </summary>
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool? IsAnalysisDiffToOriginalData { get; set; }
+
+
+        public List<CommonQuesionInfo> QuestionAnswerList { get; set; }
+
+        #region 组件一致性额外加的
+        public bool? IsGroupAnalysisDiffToOriginalData { get; set; }
+
+        /// <summary>
+        /// 组件一致性和原Arm1是否有差异
+        /// </summary>
+        public bool? IsGroupDiffArm1 { get; set; }
+
+        /// <summary>
+        /// 组件一致性和原Arm2是否有差异
+        /// </summary>
+        public bool? IsGroupDiffArm2 { get; set; }
+        #endregion
+    }
+
+
+    //public class GroupAnalysisDynamicCommonExport: AnalysisDynamicCommonExport
+    //{
+    //    public bool? IsGroupAnalysisDiffToOriginalData { get; set; }
+
+    //    /// <summary>
+    //    /// 组件一致性和原Arm1是否有差异
+    //    /// </summary>
+    //    public bool? IsGroupDiffArm1 { get; set; }
+
+    //    /// <summary>
+    //    /// 组件一致性和原Arm2是否有差异
+    //    /// </summary>
+    //    public bool? IsGroupDiffArm2 { get; set; }
+
+    //}
     public class DymamicQuestionInfo
     {
         public QuestionMark? QuestionMark { get; set; }

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

@@ -227,6 +227,23 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName));
 
+            CreateMap<VisitTask, AnalysisDynamicCommonExport>()
+               .ForMember(o => o.IsBaseline, t => t.MapFrom(u => u.SourceSubjectVisit.IsBaseLine))
+               .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
+               .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
+               .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
+               .ForMember(o => o.QuestionAnswerList, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList
+                   .Where(c => c.ReadingQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))
+                   .OrderBy(k => k.ReadingQuestionTrial.ShowOrder)
+                .Select(c => new CommonQuesionInfo()
+                {
+                    QuestionType = c.ReadingQuestionTrial.QuestionType,
+                    QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
+                    QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
+                    TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
+                })))
+               ;
+
 
 
             CreateMap<VisitTask, CommonEvaluationExport>()