diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 0f972cc0b..5607ec6b0 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -17492,17 +17492,17 @@ - 质疑 + ���� - 一致性核查 + һ���Ժ˲� - 复制 + ���� diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index c52a60dcd..cb1f35c6b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -452,6 +452,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public List AnswerList { get; set; } = new List(); } + public class GetMarkListInDto + { + /// + /// 任务Id + /// + public Guid VisitTaskId { get; set; } + } + + public class MarkListInfo + { + public string MeasureData { get; set; } = string.Empty; + + public string PicturePath { get; set; } = string.Empty; + + public Guid? InstanceId { get; set; } + + public Guid? SeriesId { get; set; } + public Guid? StudyId { get; set; } + + public string StudyInstanceUid { get; set; } + } + public class GetCustomTagInDto { /// diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 8de7798b2..20e5b109f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -440,6 +440,48 @@ namespace IRaCIS.Core.Application.Service return result; } + + /// + /// 获取标记信息 + /// + /// + /// + [HttpPost] + public async Task> GetMarkList(GetMarkListInDto inDto) + { + var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId&&x.InstanceId!=null) + .Select(x => new MarkListInfo() { + + MeasureData = x.MeasureData, + PicturePath = x.PicturePath, + InstanceId = x.InstanceId, + SeriesId = x.SeriesId, + StudyId = x.StudyId, + StudyInstanceUid = x.Instance.StudyInstanceUid, + + }).ToListAsync(); + + + var rowMarkList=await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.InstanceId != null) + .Select(x => new MarkListInfo() + { + + MeasureData = x.MeasureData, + PicturePath = x.PicturePath, + InstanceId = x.InstanceId, + SeriesId = x.SeriesId, + StudyId = x.StudyId, + StudyInstanceUid = x.Instance.StudyInstanceUid, + + }).ToListAsync(); + + + return questionMarkList.Union(rowMarkList).ToList(); + + + + } + /// /// 获取手册 /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index e58fbf74a..b8325420e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -10,6 +10,10 @@ public class ReadingTaskQuestionMark : BaseAddAuditEntity [ForeignKey("QuestionId")] public ReadingQuestionTrial? ReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("InstanceId")] + public DicomInstance Instance { get; set; } + [JsonIgnore] [ForeignKey("VisitTaskId")] public VisitTask VisitTask { get; set; }