From fa64b42a8401a8bc30a095fc5a384c18270b6630 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 13 Mar 2024 13:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A2=E5=BE=80=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               | 12 +++++++
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 18 +++++++++-
 .../ReadingImageTaskService.cs                | 33 ++++++++++++++++---
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index bd3ee9667..01aa79d6c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -5856,6 +5856,11 @@
             问题标识
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemReadingQuestionOutDto.GroupId">
+            <summary>
+            分组ID
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetSystemReadingQuestionOutDto.ReadingQuestionCriterionSystemId">
             <summary>
             系统标准Id
@@ -13451,6 +13456,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.GetPreviousOtherPicturePath(IRaCIS.Core.Application.Service.Reading.Dto.GetPreviousOtherPicturePathInDto)">
+            <summary>
+            获取既往病灶的OtherPicture
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingImageTaskService.SubmitCustomTag(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCustomTagDto)">
             <summary>
             提交自定义标记
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 3d781e084..67b56b21e 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -434,7 +434,23 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
     }
 
-    public class GetReadingCalculationDataInDto
+    public class GetPreviousOtherPicturePathOutDto
+    {
+		public Guid VisitTaskId { get; set; }
+
+        public string? OtherPicturePath { get; set; }
+
+		public string TaskBlindName { get; set; } = string.Empty;
+
+	}
+
+
+	public class GetPreviousOtherPicturePathInDto
+    {
+		public Guid RowId { get; set; }
+	}
+
+	public class GetReadingCalculationDataInDto
     {
 		/// <summary>
 		/// 任务Id
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 6b4640d40..603f1c566 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -65,7 +65,8 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository;
         private readonly IRepository<ReadingQuestionSystem> _readingQuestionSystem;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileSystem;
-        private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
+		private readonly IGeneralCalculateService _generalCalculateService;
+		private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
 
         private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
 
@@ -107,7 +108,9 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadingQuestionSystem> ReadingQuestionSystem,
                   ITrialEmailNoticeConfigService trialEmailNoticeConfigService,
                   IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem,
-                  IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
+
+				 IGeneralCalculateService generalCalculateService,
+	  	IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
           )
         {
             this._noneDicomStudyRepository = noneDicomStudyRepository;
@@ -146,7 +149,8 @@ namespace IRaCIS.Application.Services
 
             this._readingQuestionSystem = ReadingQuestionSystem;
             this._noneDicomStudyFileSystem = noneDicomStudyFileSystem;
-            this._readingQuestionTrialRepository = readingQuestionTrialRepository;
+			this._generalCalculateService = generalCalculateService;
+			this._readingQuestionTrialRepository = readingQuestionTrialRepository;
             this._trialEmailNoticeConfigService = trialEmailNoticeConfigService;
         }
 
@@ -163,7 +167,28 @@ namespace IRaCIS.Application.Services
             return await _readingCalculateService.GetReadingCalculationData(inDto);
 
 		}
-		#endregion
+        #endregion
+
+        /// <summary>
+        /// 获取既往病灶的OtherPicture
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+		public async Task<List<GetPreviousOtherPicturePathOutDto>> GetPreviousOtherPicturePath(GetPreviousOtherPicturePathInDto inDto)
+        {
+            var rowinfo = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId).FirstNotNullAsync();
+			var taskInfoList = await _generalCalculateService.GetReadingReportTaskList(rowinfo.VisitTaskId);
+            var visitTaskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
+            List<GetPreviousOtherPicturePathOutDto> result = await _readingTableAnswerRowInfoRepository.Where(x => x.QuestionId == rowinfo.QuestionId && x.RowIndex == rowinfo.RowIndex && visitTaskIds.Contains(x.VisitTaskId))
+                .OrderBy(x => x.VisitTask.VisitTaskNum).Select(x => new GetPreviousOtherPicturePathOutDto()
+                {
+                    VisitTaskId = x.VisitTaskId,
+                    OtherPicturePath = x.OtherPicturePath,
+                    TaskBlindName = x.VisitTask.TaskBlindName
+                }).ToListAsync();
+             return result;
+		}
 
 		/// <summary>
 		/// 提交自定义标记