From 7cd476028a7b716ff2f0b7f2b1e21a371a64b169 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 7 Jul 2026 09:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs    |  1 +
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  2 ++
 .../General/ReadingCalculateService.cs        | 22 +++++++++++++++++++
 .../WorkLoad/DTO/DoctorWorkLoadViewModel.cs   |  1 +
 4 files changed, 26 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index ca5e3c1e1..4c235030e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -91,6 +91,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             {
                 TrialReadingCriterionId = t.Id,
                 IsAutoCreate = t.IsAutoCreate,
+                ReadingTool = t.ReadingTool,
                 IsAdditionalAssessment = t.IsAdditionalAssessment,
                 TrialReadingCriterionName = t.CriterionName,
                 CriterionType = t.CriterionType,
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 5d724ee0d..0fd9ed8b9 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -599,6 +599,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string DictionaryCode { get; set; }
 
         public bool IsHighlight { get; set; } = false;
+
+        public Guid VisitTaskId { get; set; }
     }
 
     public class ChartItem
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index cc20f70a7..bf829f71d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -590,6 +590,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }
 
 
+                void SetVisitTaskId(List<EvaluationValue> data, List<VisitTaskInfo> VisitTaskList)
+                {
+                    for (var index = 0; index < data.Count; index++)
+                    {
+                        try
+                        {
+                            data[index].VisitTaskId = VisitTaskList[index].VisitTaskId;
+                        }
+                        catch (Exception)
+                        {
+
+                           
+                        }
+                   
+                    }
+                }
+
+
+
+
                 result.Evaluation.Add(visitTaskName.Select(x => new EvaluationValue()
                 {
                     Value = x
@@ -622,6 +642,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                           .Take(length)
                           .ToList();
                 SetHighlight(r1data, Arm.DoubleReadingArm1);
+                SetVisitTaskId(r1data, r1.VisitTaskList);
                 result.Evaluation.Add(r1data);
 
 
@@ -654,6 +675,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                               .Take(length)
                               .ToList();
                     SetHighlight(r2data, Arm.DoubleReadingArm2);
+                    SetVisitTaskId(r2data, r2.VisitTaskList);
                     result.Evaluation.Add(r2data);
                 }
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
index 710cd6362..605419ac0 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
@@ -396,6 +396,7 @@ namespace IRaCIS.Application.Contracts
         //是否附加评估
         public bool IsAdditionalAssessment { get; set; }
 
+        public ReadingTool? ReadingTool { get; set; }
 
         //自动  手动生成任务
         public bool IsAutoCreate { get; set; }