From f612060fd26a4b2c93f4fc0b1cfa5e85f32eb687 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 12 Oct 2022 13:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 10 ++++++++++
 .../Service/Reading/ReadingImageTaskService.cs       |  5 ++++-
 .../Reading/ReadingTableAnswerRowInfo.cs             | 12 ++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 36951357..1f86d06b 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -425,6 +425,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? SeriesId { get; set; }
 
+
+        /// <summary>
+        /// StudyId
+        /// </summary>
+        public Guid? StudyId { get; set; }
+
+        public bool  IsCanEditPosition { get; set; }
+
         /// <summary>
         /// RowIndex
         /// </summary>
@@ -1078,7 +1086,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? InstanceId { get; set; }
 
+        public Guid? StudyId { get; set; }
 
+        public bool IsCanEditPosition { get; set; }
 
         public List<SubmitTableQuestionInfo> AnswerList { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index c7f38746..4182c668 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -841,6 +841,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("IsCanEditPosition", rowInfo.IsCanEditPosition.ToString());
                 answers.Add("InstanceId", rowInfo == null ? string.Empty : rowInfo.InstanceId.ToString());
                 answers.Add("SeriesId", rowInfo == null ? string.Empty : rowInfo.SeriesId.ToString());
                 answers.Add("IsCurrentTaskAdd", rowInfo == null ? false.ToString() : rowInfo.IsCurrentTaskAdd.ToString());
@@ -2272,7 +2274,8 @@ namespace IRaCIS.Application.Services
             rowInfo.InstanceId = inDto.InstanceId;
             rowInfo.SeriesId = inDto.SeriesId;
             rowInfo.VisitTaskId = inDto.VisitTaskId;
-
+            rowInfo.StudyId = inDto.StudyId;
+            rowInfo.IsCanEditPosition = inDto.IsCanEditPosition;
             result.RowId = rowInfo.Id;
 
             List<ReadingTableQuestionAnswer> answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer()
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs
index 95706408..1aff84b4 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs
@@ -41,6 +41,14 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? SeriesId { get; set; }
 
+
+		/// <summary>
+		/// StudyId
+		/// </summary>
+		public Guid? StudyId { get; set; }
+
+		public bool IsCanEditPosition { get; set; } = false;
+
 		/// <summary>
 		/// RowIndex
 		/// </summary>
@@ -72,6 +80,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? MergeRowId { get; set; }
 
+		
+
+
+
 
 		public SplitOrMergeType? SplitOrMergeType { get; set; }