From 0a142d5c769e6020ff841fcaa7b67ec01ae4c6d8 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 20 Oct 2022 09:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs  | 11 +++++++++++
 .../ReadingImageTask/ReadingOncologyTaskService.cs    |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index aab646816..3a534527d 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/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
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index 68b321bdc..c725ca83b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/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;
 
             });