From aa7eac50a56bf045bd58640a2a75baf4491118bb Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 30 Dec 2025 17:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=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       | 7 +++++++
 .../ReadingCalculate/General/GeneralCalculateService.cs    | 2 +-
 .../ReadingCalculate/General/ReadingCalculateService.cs    | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index da8a2ab9e..d705e22a8 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -522,6 +522,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string DictionaryCode { get; set; }
     }
 
+    public class EvaluationValue
+    {
+        public string Value { get; set; }
+
+        public string DictionaryCode { get; set; }
+    }
+
     public class ChartItem
     {
         public Arm Arm { get; set; }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index aa8bd2cda..4364366a5 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -531,7 +531,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<ReadingCalculateDto> GetReadingCalculateDto(Guid visitTaskId)
         {
-            var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+            var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x=>x.SourceSubjectVisit).FirstNotNullAsync();
 
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTask.TrialReadingCriterionId).FirstNotNullAsync();
             var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == (visitTask.SourceSubjectVisitId ?? default(Guid))).FirstOrDefaultAsync();
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 23b808366..15af84298 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -450,6 +450,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 var task = await _visitTaskRepository.Where(x =>
                 x.SubjectId == inDto.SubjectId
                 && arms.Contains(x.ArmEnum)
+                && x.ReadingCategory== ReadingCategory.Visit
                 && x.ReadingTaskState == ReadingTaskState.HaveSigned
                 && x.TaskState == TaskState.Effect
                 && x.TrialReadingCriterion.CriterionType == inDto.CriterionType