From 4fc35893f963536731e922ae1f1157dcd058b87b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 28 Oct 2022 09:50:34 +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

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs          | 2 +-
 .../Service/ReadingCalculate/PCWG3CalculateService.cs         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 700f0b7c..df347960 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -69,7 +69,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string BlindName { get; set; } = string.Empty;
 
-
+        public Guid RowId { get; set; }
 
         public string SplitOrMergeLesionName { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index df2c62e1..c07f1cdb 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -196,6 +196,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         IsCanEditPosition = x.IsCanEditPosition,
                         RowIndex = x.RowIndex,
                         BlindName = x.BlindName,
+                        RowId =x.Id,
                         ReportLayType = ReportLayType.Lesions,
                         FristAddTaskNum=  x.FristAddTaskNum,
                     }).ToList();
@@ -218,6 +219,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             RowIndex = row.RowIndex,
                             ShowOrder = x.ShowOrder,
                             ValueType = x.ValueType,
+                            RowId=row.RowId,
                             Unit = x.Unit,
                             ReportLayType = ReportLayType.TableQuestion,
                             FristAddTaskNum= row.FristAddTaskNum,
@@ -231,7 +233,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                                 tableQuestion.Answer.Add(new TaskQuestionAnswer()
                                 {
-                                    Answer = tableAnswers.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowIndex == tableQuestion.RowIndex && x.TableQuestionId == tableQuestion.TableQuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
+                                    Answer = tableAnswers.Where(x => x.VisitTaskId == task.VisitTaskId && x.QuestionId == tableQuestion.QuestionId && x.RowId == tableQuestion.RowId && x.TableQuestionId == tableQuestion.TableQuestionId).Select(x => x.Answer).FirstIsNullReturnEmpty(),
                                     TaskName = task.TaskName,
                                     VisitTaskId = task.VisitTaskId,
                                 });