From 19dd6e109bde2c92b598b77949f06672a6240170 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 30 Nov 2022 17:00:54 +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    |  2 ++
 .../ReadingMedicalReviewService.cs            | 22 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 67766fe86..354f82fa5 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -382,6 +382,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsClosedDialog { get; set; }
 
+        public List<CriterionDictionaryInfo> OncologyAssessTypeList { get; set; }
+
         public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
 
  
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index 852d50fd8..f579ad232 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
         private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
         private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository;
+        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
         private readonly IRepository<User> _userTaskRepository;
         private readonly IVisitTaskService _visitTaskService;
         private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
@@ -42,6 +43,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
              IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
                IRepository<ReadingOncologyTaskInfo> readingOncologyTaskInfoRepository,
+              IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
             IRepository<User> userTaskRepository,
             IVisitTaskService visitTaskService,
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,
@@ -57,6 +59,7 @@ namespace IRaCIS.Core.Application.Service
             this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
             this._readingGlobalTaskInfoRepository = readingGlobalTaskInfoRepository;
             this._readingOncologyTaskInfoRepository = readingOncologyTaskInfoRepository;
+            this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._userTaskRepository = userTaskRepository;
             this._visitTaskService = visitTaskService;
             this._taskMedicalReviewRepository = taskMedicalReviewRepository;
@@ -133,7 +136,7 @@ namespace IRaCIS.Core.Application.Service
 
                 medicalReviewInfo.TaskList.ForEach(x =>
                 {
-                    var oncologyInfo = oncologyList.Where(y => y.OncologyTaskId == x.TaskId).FirstOrDefault();
+                    var oncologyInfo = oncologyList.Where(y => y.VisitTaskId == x.TaskId).FirstOrDefault();
                     if (oncologyInfo != null)
                     {
                         x.OncologyEvaluationResult = oncologyInfo.EvaluationResult;
@@ -142,6 +145,23 @@ namespace IRaCIS.Core.Application.Service
                   
                 });
 
+
+                medicalReviewInfo.OncologyAssessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
+                   && x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess
+                  )
+                  .Select(x => new CriterionDictionaryInfo()
+                  {
+                      Id = x.Id,
+                      DictionaryId = x.DictionaryId,
+                      ChildGroup = x.Dictionary.ChildGroup,
+                      Code = x.Dictionary.Code,
+                      Description = x.Dictionary.Description,
+                      ShowOrder = x.Dictionary.ShowOrder,
+                      ParentCode = x.Dictionary.Parent.Code,
+                      Value = x.Dictionary.Value,
+                      ValueCN = x.Dictionary.ValueCN
+                  }).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
+
             }
             else
             {