IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1476,29 +1476,19 @@ namespace IRaCIS.Core.Application.Service.Common
                    ).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault()?.JudgeArmEnum == item.ArmEnum ? true : false;
 
                 }
-               
-                //访视、全局列表中过滤出访视进行处理
+                //全局裁判了，选择了那个全局，那么对应全局下面的访视 设置裁判标记
                 foreach (var item in resultList.Where(t => t.ReadingCategory == ReadingCategory.Visit))
                 {
-                    //全局裁判了，选择了那个全局，那么对应全局下面的访视 设置裁判标记
 
                     var selectJudegeGlobalList = resultList.Where(t => t.ReadingCategory == ReadingCategory.Global && t.IsGenerateJudge == true).ToList();
 
-                    if (selectJudegeGlobalList.Count == 0)
-                    {
-                        //生成了裁判，但是裁判没有做
+                    //全局修改了答案，那么给访视上赋值全局的结果  并且取的是最后的全局
+                    var existGlobalAnswer = selectJudegeGlobalList.Where(t => t.SubjectCode == item.SubjectCode).SelectMany(t => t.GlobalTaskAnswerList).Where(t => t.VisitTaskId == item.Id)
+                        .OrderByDescending(t => t.GlobalTaskVisitNum).FirstOrDefault()?.Answer;
 
-                        item.IsGenerateJudge = null;
-                    }
-                    else
-                    {
+                    item.OverallTumorEvaluationResult = string.IsNullOrEmpty(existGlobalAnswer) ? item.OverallTumorEvaluationResult : existGlobalAnswer;
 
-                        if(selectJudegeGlobalList.Where(t => t.SubjectCode == item.SubjectCode).SelectMany(t => t.GlobalTaskAnswerList).Any(t => t.VisitTaskId == item.Id))
-                        {
-                            item.IsGenerateJudge = true;
-                        }
-
-                    }                  
+                    item.IsGenerateJudge = true;
                 }
 
 

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

@@ -935,9 +935,6 @@ namespace IRaCIS.Core.Application.Contracts
         public string SubjectCode { get; set; } = String.Empty;
 
         public Guid Id { get; set; }
-
-        public Guid DoctorUserId { get; set; }
-
         public string TaskName { get; set; }
         public string TaskBlindName { get; set; }
 
@@ -967,7 +964,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
         [DictionaryTranslateAttribute("YesOrNo")]
-        public bool? IsGenerateJudge { get; set; }
+        public bool IsGenerateJudge { get; set; }
 
 
         [JsonIgnore]

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

@@ -192,7 +192,7 @@ namespace IRaCIS.Core.Application.Service
 
                 .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).Select(t=>t.IsGlobalChange?t.GlobalChangeAnswer:t.Answer).FirstOrDefault())
+               u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault()!.Answer)
                 : criterionType == CriterionType.PCWG3 ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstOrDefault()!.Answer : String.Empty
                 ))