修改

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

@@ -547,6 +547,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string Answer { get; set; }
 
 
+        /// <summary>
+        /// 问题类型
+        /// </summary>
+        public TableQuestionType? QuestionGenre { get; set; }
+
+
+        /// <summary>
+        /// 字典code
+        /// </summary>
+        public string DictionaryCode { get; set; }
+
     }
 
     public class OncologyVisitTaskInfo

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -120,15 +120,17 @@ namespace IRaCIS.Application.Services
                     x.EvaluationResult = oncologyData.EvaluationResult;
                     x.EvaluationReason = oncologyData.EvaluationReason;
                 }
-                x.QuestionList = globalTaskReadingInfo.TaskList.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Where(x => x.QuestionId != null)
+                x.QuestionList = globalTaskReadingInfo.TaskList.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Where(x => x.GlobalAnswerType == GlobalAnswerType.Question)
                 .Select(y => new OncologyQuestion
                 {
                     QuestionId = y.QuestionId ?? default(Guid),
                     QuestionName = y.QuestionName,
+                    QuestionGenre=y.QuestionGenre,
+                    DictionaryCode=y.DictionaryCode,
                     Answer = y.Answer
                 }).ToList();
                 x.IsHaveChange = globalTaskReadingInfo.TaskList.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Any(y => y.IsHaveChange);
-                x.VisitRemark = globalTaskReadingInfo.TaskList.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Where(y => y.QuestionId == null).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
+                x.VisitRemark = globalTaskReadingInfo.TaskList.Where(y => x.VisitTaskId == y.VisitTaskId).SelectMany(y => y.AfterQuestionList).Where(y => y.GlobalAnswerType == GlobalAnswerType.Reason).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
 
             });