修改数据表导出逻辑

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

@@ -836,6 +836,7 @@ namespace IRaCIS.Core.Application.Contracts
         public Arm ArmEnum { get; set; }
         public string UserName { get; set; }
 
+        public ReadingCategory ReadingCategory { get; set; }
 
         [DictionaryTranslateAttribute("ExistDisease", CriterionType.RECIST1Point1, nameof(OverallTumorEvaluationExport.IsBaseline), "true")]
         [DictionaryTranslateAttribute("OverallAssessment", CriterionType.RECIST1Point1, nameof(OverallTumorEvaluationExport.IsBaseline), "false")]
@@ -844,11 +845,22 @@ namespace IRaCIS.Core.Application.Contracts
         //整体肿瘤评估结果  需要翻译  
         public string OverallTumorEvaluationResult { get; set; }
 
-        public Guid? JudgeResultTaskId { get; set; }
 
+        #region old 废弃
+
+        //public Guid? JudgeResultTaskId { get; set; }
+
+        //[DictionaryTranslateAttribute("YesOrNo")]
+        //public bool IsGenerateJudge => JudgeResultTaskId != null;
+        #endregion
+
+
+        public Arm? JudgeArmEnum { get; set; }
+
+
+        //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
         [DictionaryTranslateAttribute("YesOrNo")]
-        public bool IsGenerateJudge => JudgeResultTaskId != null;
-
+        public bool IsGenerateJudge { get; set; }
 
 
     }

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

@@ -172,6 +172,8 @@ namespace IRaCIS.Core.Application.Service
                 // .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
                 .ForMember(o => o.IsBaseline, t => t.MapFrom(u => u.SourceSubjectVisit.IsBaseLine))
 
+                 .ForMember(o => o.JudgeArmEnum, t => t.MapFrom(u => u.JudgeResultTask.ArmEnum))
+
                 .ForMember(o => o.OverallTumorEvaluationResult, t => t.MapFrom(u =>
                criterionType == CriterionType.RECIST1Point1 ?( u.SourceSubjectVisit.IsBaseLine==true ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault().Answer:
                u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault().Answer)