From cfd5387b770eabd343d624406ccff1f6f04e20aa Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 30 Nov 2022 15:55:52 +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

---
 .../Reading/Dto/ReadingMedicalReviewDto.cs    | 10 ++++++++++
 .../ReadingMedicalReviewService.cs            | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index ad18b3319..67766fe86 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -593,6 +593,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid SubjectId { get; set; }
 
+        /// <summary>
+        /// 肿瘤学结果
+        /// </summary>
+        public string OncologyEvaluationResult { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 肿瘤学原因
+        /// </summary>
+        public string OncologyEvaluationReason { get; set; } = string.Empty;
+
         public List<JudgeQuestionAnswerInfo> JudgeQuestionAnswerInfoList { get; set; }
 
     }
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index 3d7cd12ef..8749a8744 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -171,18 +171,19 @@ namespace IRaCIS.Core.Application.Service
                     }).ToListAsync());
 
                     // 肿瘤学没有问题
-                    //visitTaskAnswer.AddRange(await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).Select(x => new JudgeQuestionAnswerInfo
-                    //{
-                    //    Answer = x.SubjectId,
-                    //    VisitTaskId = x.OncologyTaskId,
-                    //    DictionaryCode = x.TrialReadingQuestion.DictionaryCode,
-                    //    ShowOrder = x.TrialReadingQuestion.ShowOrder,
-                    //    QuestionGenre = x.TrialReadingQuestion.QuestionGenre,
-                    //    QuestionName = x.TrialReadingQuestion.QuestionName
-                    //}).ToListAsync());
+                   var oncologyInfoList= await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).ToListAsync();
+
+
+
 
                     medicalReviewInfo.TaskList.ForEach(x =>
                     {
+                        var oncologyInfo = oncologyInfoList.Where(y => y.OncologyTaskId == x.TaskId).FirstOrDefault();
+                        if (oncologyInfo != null)
+                        {
+                            x.OncologyEvaluationResult = oncologyInfo.EvaluationResult;
+                            x.OncologyEvaluationReason = oncologyInfo.EvaluationResult;
+                        }
                         x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList();
                     });
                 }