From a8965f5231e1d94c8d688c652cc2b31468bc3aae Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 1 Dec 2022 18:09:15 +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/ReadingMedicalReviewDto.cs        | 2 ++
 .../Reading/MedicalAudit/ReadingMedicalReviewService.cs   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
index 3ce4b7eb8..146fe3c43 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
@@ -591,6 +591,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? OtherTaskId { get; set; }
 
+        public Arm OtherArmEnum { get; set; }
+
         public Guid? JudgeVisitTaskId { get; set; }
 
         public Guid? JudgeResultTaskId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
index dcf5307d8..d9fa3aecc 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
@@ -280,7 +280,13 @@ namespace IRaCIS.Core.Application.Service
 
                     medicalReviewInfo.TaskList.ForEach(x =>
                     {
-                        x.OtherTaskId = otherTask.Where(y => y.SouceReadModuleId == x.SouceReadModuleId && y.SourceSubjectVisitId == x.SourceSubjectVisitId).Select(y => y.TaskId).FirstOrDefault();
+                        var otherTaskInfo = otherTask.Where(y => y.SouceReadModuleId == x.SouceReadModuleId && y.SourceSubjectVisitId == x.SourceSubjectVisitId).FirstOrDefault();
+                        if(otherTaskInfo!=null)
+                        {
+                            x.OtherTaskId = otherTaskInfo.TaskId;
+                            x.OtherArmEnum = otherTaskInfo.ArmEnum;
+                        }
+
                     });
                 }