Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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; }

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();

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