From 81039b77786a646055a7b9d5aa3d3ae4b96a009f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 21 Dec 2022 15:35: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/ReadingCalculate/GeneralCalculateService.cs      | 1 +
 .../ReadingCalculate/RECIST1Point1CalculateService.cs        | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
index 489563161..3296f7e10 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
@@ -154,6 +154,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 .WhereIf(visitTaskInfo.TaskState != TaskState.Effect, x => x.Id == visitTaskId)
                 .Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
                 && x.IsAnalysisCreate == visitTaskInfo.IsAnalysisCreate
+                &&x.DoctorUserId==visitTaskInfo.DoctorUserId
                 && x.IsSelfAnalysis == visitTaskInfo.IsSelfAnalysis
              && x.VisitTaskNum<= visitTaskInfo.VisitTaskNum
               && x.ArmEnum == visitTaskInfo.ArmEnum
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 7fd4edf83..e2a04a88a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -1135,8 +1135,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             // 先找到基线的任务
             var baseLineTaskId = await _visitTaskRepository.Where(x => x.SubjectId == inDto.SubjectId && x.ReadingCategory == ReadingCategory.Visit
                                                                   && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId &&
+
                                                                   x.SourceSubjectVisit.IsBaseLine && x.TaskState == TaskState.Effect && 
-                                                                  x.IsAnalysisCreate == inDto.IsAnalysisCreate && x.ArmEnum == inDto.ArmEnum)
+                                                                  x.IsAnalysisCreate == inDto.IsAnalysisCreate
+                                                                  &&x.DoctorUserId==inDto.DoctorUserId
+                                                                  && x.IsSelfAnalysis == inDto.IsSelfAnalysis && x.ArmEnum == inDto.ArmEnum)
                                                                    .Select(x => x.Id).FirstOrDefaultAsync();