修改

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -138,6 +138,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public ReportLayType ReportLayType { get; set; } = ReportLayType.Group;
 
+        public string ReportMark { get; set; } = string.Empty;
+
 
         /// <summary>
         /// 问题英文分组
@@ -575,6 +577,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid CreateUserId { get; set; }
 
       
+
         public int? NumberOfFrames { get; set; }
 
         public Guid UpdateUserId { get; set; }
@@ -596,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		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;
 
-		/// <summary>
-		/// 标记工具
-		/// </summary>
-		public string MarkTool { get; set; } = string.Empty;
+        public string ReportMark { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 标记工具
+        /// </summary>
+        public string MarkTool { get; set; } = string.Empty;
 
 		public decimal RowIndex { get; set; }
 

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
                 }) ;
 
 

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();
                             }
 

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
+                        }) ;
                     }
 
 

IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs

@@ -153,7 +153,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string FromMark { get; set; } = string.Empty;
 
-		public bool IsDeleted { get; set; }
+		/// <summary>
+		/// 报告页面显示来自于哪个标记
+		/// </summary>
+        public string ReportMark { get; set; } = string.Empty;
+
+        public bool IsDeleted { get; set; }
 
 		public DateTime? DeletedTime { get; set; }