diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 5a5d4dd47..39989beb9 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1865,6 +1865,28 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsDicomReading { get; set; } = true; + /// + /// InstanceId + /// + public Guid? OtherInstanceId { get; set; } + + /// + /// SeriesId + /// + public Guid? OtherSeriesId { get; set; } + + + /// + /// StudyId + /// + public Guid? OtherStudyId { get; set; } + + public string? OtherMarkTool { get; set; } + + public string? OtherPicturePath { get; set; } + + public int? OtherNumberOfFrames { get; set; } + public List AnswerList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index fc7de77ad..1a08b575e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1285,6 +1285,12 @@ namespace IRaCIS.Application.Services answers.Add("IsDicomReading", rowInfo.IsDicomReading.ToString()); answers.Add("MeasureData", rowInfo == null ? string.Empty : rowInfo.MeasureData); answers.Add("OtherMeasureData", rowInfo == null|| rowInfo.OtherMeasureData==null ? string.Empty : rowInfo.OtherMeasureData.ToString()); + answers.Add("OtherStudyId", rowInfo == null || rowInfo.OtherStudyId == null ? string.Empty : rowInfo.OtherStudyId.ToString()); + answers.Add("OtherSeriesId", rowInfo == null || rowInfo.OtherSeriesId == null ? string.Empty : rowInfo.OtherSeriesId.ToString()); + answers.Add("OtherInstanceId", rowInfo == null || rowInfo.OtherInstanceId == null ? string.Empty : rowInfo.OtherInstanceId.ToString()); + answers.Add("OtherPicturePath", rowInfo == null || rowInfo.OtherPicturePath == null ? string.Empty : rowInfo.OtherPicturePath.ToString()); + answers.Add("OtherNumberOfFrames", rowInfo == null || rowInfo.OtherNumberOfFrames == null ? string.Empty : rowInfo.OtherNumberOfFrames.ToString()); + answers.Add("OtherMarkTool", rowInfo == null || rowInfo.OtherMarkTool == null ? string.Empty : rowInfo.OtherMarkTool.ToString()); answers.Add("RowIndex", x.ToString()); answers.Add("RowId", rowInfo.Id.ToString()); answers.Add("MarkTool", rowInfo.MarkTool); diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 3bef86ea8..4670ad302 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -56,7 +56,29 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? StudyId { get; set; } - public bool IsCanEditPosition { get; set; } = false; + /// + /// InstanceId + /// + public Guid? OtherInstanceId { get; set; } + + /// + /// SeriesId + /// + public Guid? OtherSeriesId { get; set; } + + + /// + /// StudyId + /// + public Guid? OtherStudyId { get; set; } + + public string? OtherMarkTool { get; set; } + + public string? OtherPicturePath { get; set; } + + public int? OtherNumberOfFrames { get; set; } + + public bool IsCanEditPosition { get; set; } = false; ///