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 @@
问题标识
+
+
+ 分组ID
+
+
系统标准Id
@@ -13451,6 +13456,13 @@
+
+
+ 获取既往病灶的OtherPicture
+
+
+
+
提交自定义标记
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
{
///
/// 任务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 _readingQuestionCriterionSystemRepository;
private readonly IRepository _readingQuestionSystem;
private readonly IRepository _noneDicomStudyFileSystem;
- private readonly IRepository _readingQuestionTrialRepository;
+ private readonly IGeneralCalculateService _generalCalculateService;
+ private readonly IRepository _readingQuestionTrialRepository;
private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
@@ -107,7 +108,9 @@ namespace IRaCIS.Application.Services
IRepository ReadingQuestionSystem,
ITrialEmailNoticeConfigService trialEmailNoticeConfigService,
IRepository noneDicomStudyFileSystem,
- IRepository readingQuestionTrialRepository
+
+ IGeneralCalculateService generalCalculateService,
+ IRepository 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
+
+ ///
+ /// 获取既往病灶的OtherPicture
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task> 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 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;
+ }
///
/// 提交自定义标记