From 57c4b198f76dd3c0737b31da98035f415303d936 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 9 May 2023 09:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  | 20 ++++++++++++++-----
 .../ReadingImageTaskService.cs                | 10 +++++++---
 .../ReadingTableAnswerRowInfo.cs              |  7 ++++++-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 3991b063b..157f5e8c6 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -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>
         /// 截图地址
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 542881506..1d344195d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -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;
diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
index 70b138918..9932ed4f8 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
@@ -173,8 +173,13 @@ namespace IRaCIS.Core.Domain.Models
 		//病灶编号
 		public string RowMark { get; set; } = string.Empty;
 
+		/// <summary>
+		/// 标记工具
+		/// </summary>
+		public string MarkTool { get; set; } = string.Empty;
 
-        [JsonIgnore]
+
+		[JsonIgnore]
         [ForeignKey("VisitTaskId")]
         public VisitTask VisitTask { get; set; }