From bb95a50abc2a1e2a50c8665a4d0006b94e665898 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 16 Dec 2022 10:10:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingCalculateViewModel.cs            | 2 ++
 .../Service/ReadingCalculate/GeneralCalculateService.cs         | 1 +
 .../Service/ReadingCalculate/RECIST1Point1CalculateService.cs   | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
index 770d30256..8e854dd3f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
@@ -113,6 +113,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid SubjectId { get; set; }
 
+        public string TaskBlindName { get; set; } = string.Empty;
+
         public bool IsAnalysisCreate { get; set; }
 
         public bool? IsSelfAnalysis { get; set; }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
index a112a90e5..489563161 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
@@ -118,6 +118,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             ReadingCalculateDto readingData = new ReadingCalculateDto()
             {
                 SubjectId = visitTask.SubjectId,
+                TaskBlindName=  visitTask.TaskBlindName,
                 VisitTaskId = visitTaskId,
                 SubjectVisitId = visitTask.SourceSubjectVisitId!.Value,
                 QuestionInfo = questionInfos,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 3929b08fd..7fd4edf83 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -1185,6 +1185,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 visitTaskAnswerList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId != inDto.VisitTaskId && x.VisitTask.ReadingCategory == ReadingCategory.Visit
                 && x.VisitTask.IsAnalysisCreate == inDto.IsAnalysisCreate
                 && x.VisitTask.IsSelfAnalysis == inDto.IsSelfAnalysis
+                &&x.VisitTask.VisitTaskNum<inDto.VisitTaskNum
                 && x.SubjectId == inDto.SubjectId && x.VisitTask.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTask.ArmEnum == inDto.ArmEnum && x.VisitTask.TaskState == TaskState.Effect && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD)
                 .Select(x => new VisitTaskAnswerInfo
                 {
@@ -1202,6 +1203,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     visitTaskAnswerList.Add(new VisitTaskAnswerInfo()
                     {
                         VisitTaskId = inDto.VisitTaskId,
+                        BlindName=inDto.TaskBlindName,
                         QuestionId = visitTaskAnswerList[0].QuestionId,
                         VisitName = inDto.VisitName,
                         SOD = (await GetSODData(inDto)).ToString().IsNullOrEmptyReturn0(),