diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 331ce3e57..72055aea4 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -385,6 +385,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid TrialId { get; set; } + /// + /// 首次添加任务ID + /// + public Guid FristAddTaskId { get; set; } + + /// + /// 窗宽WW + /// + public decimal? WW { get; set; } + + /// + /// 窗位WL + /// + public decimal? WL { get; set; } + /// /// InstanceId @@ -728,6 +743,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string BlindName { get; set; } = string.Empty; + + /// + /// 首次添加任务ID + /// + public Guid FristAddTaskId { get; set; } + + /// + /// 窗宽WW + /// + public decimal? WW { get; set; } + + /// + /// 窗位WL + /// + public decimal? WL { get; set; } + /// /// MeasureData /// @@ -1553,6 +1584,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public decimal FristAddTaskNum { get; set; } = 0; + public decimal? WW { get; set; } + + public decimal? WL { get; set; } + public string BlindName { get; set; } = string.Empty; public bool IsDicomReading { get; set; } = true; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index acb3374fc..dbbe2862c 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1489,6 +1489,7 @@ namespace IRaCIS.Application.Services rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd; rowInfo.NumberOfFrames = inDto.NumberOfFrames; rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum; + rowInfo.FristAddTaskId = rowInfo.Id; rowInfo.PicturePath = inDto.PicturePath; rowInfo.RowIndex = inDto.RowIndex; rowInfo.OrganInfoId = inDto.OrganInfoId; @@ -1498,8 +1499,10 @@ namespace IRaCIS.Application.Services rowInfo.OrderMark = questionInfo.OrderMark; rowInfo.StudyId = inDto.StudyId; rowInfo.IsCanEditPosition = inDto.IsCanEditPosition; - result.RowId = rowInfo.Id; - + rowInfo.WL = inDto.WL; + rowInfo.WW = inDto.WW; + result.RowId = rowInfo.Id; + if (inDto.RowId == null) { List answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer() @@ -1530,17 +1533,18 @@ namespace IRaCIS.Application.Services BlindName = rowInfo.BlindName, IsDicomReading = rowInfo.IsDicomReading, IsCurrentTaskAdd = isCurrentTaskAdd, - - OrganInfoId=rowInfo.OrganInfoId, + WL = rowInfo.WL, + WW = rowInfo.WW, + OrganInfoId = rowInfo.OrganInfoId, PicturePath = rowInfo.PicturePath, - NumberOfFrames=rowInfo.NumberOfFrames, + NumberOfFrames = rowInfo.NumberOfFrames, RowIndex = rowInfo.RowIndex, InstanceId = rowInfo.InstanceId, SeriesId = rowInfo.SeriesId, VisitTaskId = rowInfo.VisitTaskId, StudyId = rowInfo.StudyId, IsCanEditPosition = rowInfo.IsCanEditPosition, - }); + }) ; foreach (var item in inDto.AnswerList) diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 3fa463897..d4e835fde 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -109,6 +109,11 @@ namespace IRaCIS.Core.Domain.Models /// public decimal FristAddTaskNum { get; set; } = 0; + /// + /// 首次添加任务ID + /// + public Guid FristAddTaskId { get; set; } + public SplitOrMergeType? SplitOrMergeType { get; set; } @@ -129,7 +134,15 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? OrganInfoId { get; set; } + /// + /// 窗宽WW + /// + public decimal? WW { get; set; } + /// + /// 窗位WL + /// + public decimal? WL { get; set; } public bool IsDeleted { get; set; }