XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
he
2023-05-09 09:33:42 +08:00
parent 127b643e44
commit 57c4b198f7
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+15 -5
View File
@@ -447,10 +447,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid VisitTaskId { get; set; }
/// <summary>
/// TrialId
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 标记工具
/// </summary>
public string MarkTool { get; set; } = string.Empty;
/// <summary>
/// TrialId
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 首次添加任务ID
@@ -1697,7 +1702,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string FromMark { get; set; } = string.Empty;
public decimal RowIndex { get; set; }
/// <summary>
/// 标记工具
/// </summary>
public string MarkTool { get; set; } = string.Empty;
public decimal RowIndex { get; set; }
/// <summary>
/// 截图地址
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+7 -3
View File
@@ -1196,7 +1196,8 @@ namespace IRaCIS.Application.Services
answers.Add("MeasureData", rowInfo == null ? string.Empty : rowInfo.MeasureData);
answers.Add("RowIndex", x.ToString());
answers.Add("RowId", rowInfo.Id.ToString());
answers.Add("StudyId", rowInfo.StudyId.ToString());
answers.Add("MarkTool", rowInfo.MarkTool);
answers.Add("StudyId", rowInfo.StudyId.ToString());
answers.Add("OrganInfoId", rowInfo.OrganInfoId.ToString());
answers.Add("IsFristAdd", (rowInfo.FristAddTaskId== TaskId).ToString());
answers.Add("IsCanEditPosition", rowInfo.IsCanEditPosition.ToString());
@@ -1206,7 +1207,9 @@ namespace IRaCIS.Application.Services
answers.Add("SplitOrMergeLesionName", rowInfo.SplitName.IsNullOrEmpty() ? rowInfo.MergeName : rowInfo.SplitName);
answers.Add("SplitOrMergeType", rowInfo.SplitOrMergeType == null ? string.Empty : ((int)rowInfo.SplitOrMergeType).ToString());
answers.Add("LastTaskState", lastTaskTableAnswer.Where(n=>n.QuestionId== item.Id&&n.ReadingTableQuestionTrial.QuestionMark==QuestionMark.State&&n.RowIndex==x).Select(n=>n.Answer).FirstOrDefault()??string.Empty);
if (rowInfo.LesionType == LesionType.BaselineLesions)
answers.Add("LastTaskMajorAxis", lastTaskTableAnswer.Where(n => n.QuestionId == item.Id && n.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis && n.RowIndex == x).Select(n => n.Answer).FirstOrDefault() ?? string.Empty);
answers.Add("LastTaskShortAxis", lastTaskTableAnswer.Where(n => n.QuestionId == item.Id && n.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis && n.RowIndex == x).Select(n => n.Answer).FirstOrDefault() ?? string.Empty);
if (rowInfo.LesionType == LesionType.BaselineLesions)
{
answers.Add("BaseLineLesionNumber", baseLineTableAnswer.Where(n => n.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && n.RowIndex == rowInfo.RowIndex).Select(x => x.Answer).FirstIsNullReturnEmpty());
}
@@ -1852,7 +1855,8 @@ namespace IRaCIS.Application.Services
rowInfo.IsDicomReading = inDto.IsDicomReading;
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.NumberOfFrames = inDto.NumberOfFrames;
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
rowInfo.MarkTool = inDto.MarkTool;
rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
rowInfo.FristAddTaskId = inDto.VisitTaskId;
rowInfo.PicturePath = inDto.PicturePath;
rowInfo.RowIndex = inDto.RowIndex;