From 405b0c6e59ac063329b1d010039190ea3d5ff2c1 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 16 Sep 2022 14:51:55 +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/Allocation/VisitTaskService.cs             |  4 ++++
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs   |  1 +
 .../Reading/Interface/IReadingCalculateService.cs      |  2 ++
 .../Service/Reading/ReadingCalculateService.cs         | 10 ++++++++++
 .../Service/Reading/ReadingImageTaskService.cs         |  2 +-
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 894d7a979..0bd038827 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1026,6 +1026,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
             #endregion
 
 
+            var readingTool = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.ReadingTool).FirstNotNullAsync();
+
             #region 按照Subject 维度
             var isReadingTaskViewInOrder = await _trialRepository.Where(x => x.Id == iRUnReadSubjectQuery.TrialId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
             if (isReadingTaskViewInOrder)
@@ -1064,6 +1066,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 {
                     RandomReadInfo = new IRUnReadOutDto(),
                     IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
+                    ReadingTool = readingTool,
                 });
             }
             else
@@ -1086,6 +1089,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 {
                     IsReadingTaskViewInOrder = isReadingTaskViewInOrder,
                     RandomReadInfo = iRUnReadOut,
+                    ReadingTool= readingTool,
                 });
 
             }
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 84f5375b9..ace623c7f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -84,6 +84,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetReadingReportEvaluationOutDto
     {
+        public string TumorEvaluate { get; set; }
         public ReadingTaskState ReadingTaskState { get; set; }
 
         public List<VisitTaskInfo> VisitTaskList { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingCalculateService.cs
index 943302239..417d142fa 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingCalculateService.cs
@@ -17,5 +17,7 @@ namespace IRaCIS.Core.Application.Interfaces
 
 
 		Task<VerifyVisitTaskQuestionsOutDto> VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto);
+
+		Task<string> GetReportTumor(Guid visitTaskId);
 	}
 } 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
index 50e63ec3f..9e95f6048 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
@@ -212,6 +212,16 @@ namespace IRaCIS.Core.Application.Service
 		}
 
 
+		/// <summary>
+		/// 获取报告整体整体评估
+		/// </summary>
+		/// <param name="visitTaskId"></param>
+		/// <returns></returns>
+		public async Task<string> GetReportTumor(Guid visitTaskId)
+		{
+			return await GetTumor(await  GetReadingCalculateDto(visitTaskId));
+		}
+
 		/// <summary>
 		/// 验证访视提交
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 7dbc3c3a7..fecda9b19 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -305,7 +305,7 @@ namespace IRaCIS.Application.Services
         {
             GetReadingReportEvaluationOutDto result = new GetReadingReportEvaluationOutDto();
 
-
+            result.TumorEvaluate = await _readingCalculateService.GetReportTumor(indto.VisitTaskId);
             var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
             result.ReadingTaskState = visitTaskInfo.ReadingTaskState;
             var taskInfoList = await _visitTaskRepository.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect