From 7649e60d28bb26345b9043c78dda7c060ffee575 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 8 May 2023 09:23:23 +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     | 4 +++-
 .../Reading/ReadingImageTask/ReadingGlobalTaskService.cs | 9 +++++++--
 .../ReadingCalculate/RECIST1Point1CalculateService.cs    | 8 ++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index fd7ba9523..8429775bc 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1181,7 +1181,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public List<GlobalQuestionInfo> AgreeOrNot { get; set; }
 
         public List<GlobalQuestionInfo> AfterQuestionList { get; set; }
-    }
+
+		public List<LesionDto> LesionCountList { get; set; } = new List<LesionDto>();
+	}
 
     public class GetGlobalQuestionType
     {
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index e5fd804f4..659f916cf 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -230,8 +230,13 @@ namespace IRaCIS.Application.Services
                     VisitNum = x.SourceSubjectVisit.VisitNum,
                     IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
                     VisitId = x.SourceSubjectVisitId.Value,
-                    //CrterionDictionaryGroup=  x.CrterionDictionaryGroup,
-                    BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
+					LesionCountList=x.LesionList.GroupBy(y=>y.ReadingQuestionTrial.LesionType).Select(x => new LesionDto
+					{
+						LesionType = x.Key.Value,
+						Count = x.ToList().Count()
+					}).ToList(),
+			   //CrterionDictionaryGroup=  x.CrterionDictionaryGroup,
+		         	BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
                   .Select(y => new GlobalQuestionInfo()
                   {
                      
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index c5fb7d69c..a17147ac7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -110,8 +110,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId && x.ShowQuestion != ShowQuestion.Hide).ToListAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
             var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
-
-            var answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
+			result.LesionCountList = tableAnsweRowInfos.GroupBy(x => x.LesionType).Select(x => new LesionDto
+			{
+				LesionType = x.Key.Value,
+				Count = x.ToList().Count()
+			}).ToList();
+			var answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
             var tableAnswers = await _readingTableQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
 
             var alltableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();