既往图片

2024-03-13 13:45:19 +08:00
parent 5d4668eaee
commit fa64b42a84
3 changed files with 58 additions and 5 deletions
@@ -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
@@ -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>
 		/// 提交自定义标记