整体肿瘤评估导表修改

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

@@ -865,13 +865,6 @@ namespace IRaCIS.Core.Application.Contracts
         public string OverallTumorEvaluationResult { get; set; }
 
 
-        #region old 废弃
-
-        //public Guid? JudgeResultTaskId { get; set; }
-
-        //[DictionaryTranslateAttribute("YesOrNo")]
-        //public bool IsGenerateJudge => JudgeResultTaskId != null;
-        #endregion
 
 
         public Arm? JudgeArmEnum { get; set; }
@@ -882,8 +875,20 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsGenerateJudge { get; set; }
 
 
+        [JsonIgnore]
+
+        public List<GlobalAnswerInfo> GlobalTaskAnswerList { get; set; }
+
     }
 
+    public class GlobalAnswerInfo
+    {
+        public decimal GlobalTaskVisitNum { get; set; }
+        public Guid VisitTaskId { get; set; }
+
+        public string Answer { get; set; }
+        
+    }
 
 
     public class RECIST1Point1EvaluationOfTumorEfficacyExport : OverallTumorEvaluationExport

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

@@ -182,7 +182,12 @@ namespace IRaCIS.Core.Application.Service
 
                 .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.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
+                 .ForMember(o => o.GlobalTaskAnswerList, t => t.MapFrom(u => u.GlobalVisitResultList.Where(t=>t.GlobalAnswerType== GlobalAnswerType.Question)
+                 .Select(c=>new GlobalAnswerInfo() { GlobalTaskVisitNum=c.VisitTask.VisitTaskNum,VisitTaskId=c.TaskId ,Answer=c.Answer})))
+
+
+                ;
 
             CreateMap<VisitTask, RECIST1Point1EvaluationOfTumorEfficacyExport>().IncludeBase<VisitTask, OverallTumorEvaluationExport>()
                  .ForMember(o => o.TargetlesionEvaluationResult, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.TargetLesion).FirstOrDefault()!.Answer))