From 2f7ba345d9cde62ff0be0de9dbd0eb5d58e1c248 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 30 Sep 2022 14:03:38 +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/ReadingImageTaskService.cs        | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index 048eef3d8..65a8e536d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -129,6 +129,7 @@ namespace IRaCIS.Application.Services
             rowAnswer.Id = NewId.NextGuid();
             rowAnswer.InstanceId = null;
             rowAnswer.SeriesId = null;
+            rowAnswer.IsCurrentTaskAdd = true;
             rowAnswer.MeasureData = string.Empty;
 
             List<QuestionMark?> needRemoveMark = new List<QuestionMark?>()
@@ -2197,24 +2198,22 @@ namespace IRaCIS.Application.Services
             }
 
 
+            ReadingTableAnswerRowInfo rowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.TrialId == inDto.TrialId && x.RowIndex == inDto.RowIndex).AsNoTracking().FirstOrDefaultAsync();
+
+            rowInfo = rowInfo == null ? new ReadingTableAnswerRowInfo() : rowInfo;
+
             await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.TrialId == inDto.TrialId && x.RowIndex == inDto.RowIndex);
             await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.QuestionId == inDto.QuestionId && x.TrialId == inDto.TrialId && x.RowIndex == inDto.RowIndex);
 
-            ReadingTableAnswerRowInfo rowInfo = new ReadingTableAnswerRowInfo()
-            {
-                Id = NewId.NextGuid(),
-                TrialId = inDto.TrialId,
-                QuestionId = inDto.QuestionId,
-                MeasureData = inDto.MeasureData,
-                IsCurrentTaskAdd = isCurrentTaskAdd,
-                RowIndex = inDto.RowIndex,
-                InstanceId = inDto.InstanceId,
-                SeriesId = inDto.SeriesId,
-                VisitTaskId = inDto.VisitTaskId,
-
-
-            };
-
+            rowInfo.Id = NewId.NextGuid();
+            rowInfo.TrialId = inDto.TrialId;
+            rowInfo.QuestionId = inDto.QuestionId;
+            rowInfo.MeasureData = inDto.MeasureData;
+            rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd;
+            rowInfo.RowIndex = inDto.RowIndex;
+            rowInfo.InstanceId = inDto.InstanceId;
+            rowInfo.SeriesId = inDto.SeriesId;
+            rowInfo.VisitTaskId = inDto.VisitTaskId;
 
             List<ReadingTableQuestionAnswer> answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer()
             {