diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 6fb1dca6e..74b2d2297 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -137,7 +137,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal FristAddTaskNum { get; set; }
public ReportLayType ReportLayType { get; set; } = ReportLayType.Group;
-
+
+ public string ReportMark { get; set; } = string.Empty;
+
///
/// 问题英文分组
@@ -574,6 +576,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public Guid CreateUserId { get; set; }
+
public int? NumberOfFrames { get; set; }
@@ -596,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string FromMark { get; set; } = string.Empty;
+ public string ReportMark { get; set; } = string.Empty;
+
public string RowMark { get; set; } = string.Empty;
}
@@ -1741,10 +1746,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string FromMark { get; set; } = string.Empty;
- ///
- /// 标记工具
- ///
- public string MarkTool { get; set; } = string.Empty;
+ public string ReportMark { get; set; } = string.Empty;
+
+ ///
+ /// 标记工具
+ ///
+ public string MarkTool { get; set; } = string.Empty;
public decimal RowIndex { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 868d95cf3..100081bf1 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1914,7 +1914,9 @@ namespace IRaCIS.Application.Services
rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
rowInfo.NumberOfFrames = inDto.NumberOfFrames;
rowInfo.MarkTool = inDto.MarkTool;
- rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
+ rowInfo.ReportMark = inDto.ReportMark;
+
+ rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum;
rowInfo.FristAddTaskId = inDto.VisitTaskId;
rowInfo.PicturePath = inDto.PicturePath;
rowInfo.RowIndex = inDto.RowIndex;
@@ -1975,6 +1977,7 @@ namespace IRaCIS.Application.Services
VisitTaskId = rowInfo.VisitTaskId,
StudyId = rowInfo.StudyId,
IsCanEditPosition = rowInfo.IsCanEditPosition,
+ ReportMark = rowInfo.ReportMark
}) ;
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index b04fb04c3..ee4ded7a7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -246,8 +246,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
x.FristAddTaskId = x.FristAddTaskId==beforeConvertedTaskId? visitTaskId: x.FristAddTaskId;
x.QuestionId = otherLesionQuestion.Id;
+
x.OrderMark = otherLesionQuestion.OrderMark;
- x.FromMark = x.RowMark;
+ x.FromMark = "";
+ x.ReportMark = x.RowMark;
x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
}
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 8ac190e94..2a9a06526 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -251,7 +251,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
RowIndex = rowoindex,
BlindName = rowinfo != null ? rowinfo.BlindName : string.Empty,
ReportLayType = ReportLayType.Lesions,
- });
+ ReportMark = rowinfo.ReportMark
+ }) ;
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
index 9932ed4f8..5cd76574d 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
@@ -153,7 +153,12 @@ namespace IRaCIS.Core.Domain.Models
///
public string FromMark { get; set; } = string.Empty;
- public bool IsDeleted { get; set; }
+ ///
+ /// 报告页面显示来自于哪个标记
+ ///
+ public string ReportMark { get; set; } = string.Empty;
+
+ public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }