Test.EIImageViewer
he 2023-02-07 13:48:15 +08:00
parent 707e55fe31
commit 9b1b42f42d
3 changed files with 58 additions and 6 deletions

View File

@ -385,6 +385,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary>
/// 首次添加任务ID
/// </summary>
public Guid FristAddTaskId { get; set; }
/// <summary>
/// 窗宽WW
/// </summary>
public decimal? WW { get; set; }
/// <summary>
/// 窗位WL
/// </summary>
public decimal? WL { get; set; }
/// <summary> /// <summary>
/// InstanceId /// InstanceId
@ -728,6 +743,22 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string BlindName { get; set; } = string.Empty; public string BlindName { get; set; } = string.Empty;
/// <summary>
/// 首次添加任务ID
/// </summary>
public Guid FristAddTaskId { get; set; }
/// <summary>
/// 窗宽WW
/// </summary>
public decimal? WW { get; set; }
/// <summary>
/// 窗位WL
/// </summary>
public decimal? WL { get; set; }
/// <summary> /// <summary>
/// MeasureData /// MeasureData
/// </summary> /// </summary>
@ -1553,6 +1584,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal FristAddTaskNum { get; set; } = 0; public decimal FristAddTaskNum { get; set; } = 0;
public decimal? WW { get; set; }
public decimal? WL { get; set; }
public string BlindName { get; set; } = string.Empty; public string BlindName { get; set; } = string.Empty;
public bool IsDicomReading { get; set; } = true; public bool IsDicomReading { get; set; } = true;

View File

@ -1489,6 +1489,7 @@ namespace IRaCIS.Application.Services
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd; rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.NumberOfFrames = inDto.NumberOfFrames; rowInfo.NumberOfFrames = inDto.NumberOfFrames;
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum; rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
rowInfo.FristAddTaskId = rowInfo.Id;
rowInfo.PicturePath = inDto.PicturePath; rowInfo.PicturePath = inDto.PicturePath;
rowInfo.RowIndex = inDto.RowIndex; rowInfo.RowIndex = inDto.RowIndex;
rowInfo.OrganInfoId = inDto.OrganInfoId; rowInfo.OrganInfoId = inDto.OrganInfoId;
@ -1498,8 +1499,10 @@ namespace IRaCIS.Application.Services
rowInfo.OrderMark = questionInfo.OrderMark; rowInfo.OrderMark = questionInfo.OrderMark;
rowInfo.StudyId = inDto.StudyId; rowInfo.StudyId = inDto.StudyId;
rowInfo.IsCanEditPosition = inDto.IsCanEditPosition; rowInfo.IsCanEditPosition = inDto.IsCanEditPosition;
result.RowId = rowInfo.Id; rowInfo.WL = inDto.WL;
rowInfo.WW = inDto.WW;
result.RowId = rowInfo.Id;
if (inDto.RowId == null) if (inDto.RowId == null)
{ {
List<ReadingTableQuestionAnswer> answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer() List<ReadingTableQuestionAnswer> answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer()
@ -1530,17 +1533,18 @@ namespace IRaCIS.Application.Services
BlindName = rowInfo.BlindName, BlindName = rowInfo.BlindName,
IsDicomReading = rowInfo.IsDicomReading, IsDicomReading = rowInfo.IsDicomReading,
IsCurrentTaskAdd = isCurrentTaskAdd, IsCurrentTaskAdd = isCurrentTaskAdd,
WL = rowInfo.WL,
OrganInfoId=rowInfo.OrganInfoId, WW = rowInfo.WW,
OrganInfoId = rowInfo.OrganInfoId,
PicturePath = rowInfo.PicturePath, PicturePath = rowInfo.PicturePath,
NumberOfFrames=rowInfo.NumberOfFrames, NumberOfFrames = rowInfo.NumberOfFrames,
RowIndex = rowInfo.RowIndex, RowIndex = rowInfo.RowIndex,
InstanceId = rowInfo.InstanceId, InstanceId = rowInfo.InstanceId,
SeriesId = rowInfo.SeriesId, SeriesId = rowInfo.SeriesId,
VisitTaskId = rowInfo.VisitTaskId, VisitTaskId = rowInfo.VisitTaskId,
StudyId = rowInfo.StudyId, StudyId = rowInfo.StudyId,
IsCanEditPosition = rowInfo.IsCanEditPosition, IsCanEditPosition = rowInfo.IsCanEditPosition,
}); }) ;
foreach (var item in inDto.AnswerList) foreach (var item in inDto.AnswerList)

View File

@ -109,6 +109,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public decimal FristAddTaskNum { get; set; } = 0; public decimal FristAddTaskNum { get; set; } = 0;
/// <summary>
/// 首次添加任务ID
/// </summary>
public Guid FristAddTaskId { get; set; }
public SplitOrMergeType? SplitOrMergeType { get; set; } public SplitOrMergeType? SplitOrMergeType { get; set; }
@ -129,7 +134,15 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid? OrganInfoId { get; set; } public Guid? OrganInfoId { get; set; }
/// <summary>
/// 窗宽WW
/// </summary>
public decimal? WW { get; set; }
/// <summary>
/// 窗位WL
/// </summary>
public decimal? WL { get; set; }
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }