From 4f1fb691f2df17b93673ac9ede428268d429437b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 27 Dec 2022 15:57:34 +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/PCWG3CalculateService.cs           | 2 ++
 .../Service/ReadingCalculate/RECIST1Point1CalculateService.cs   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 43cbd54d8..36a2452c1 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -298,6 +298,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                      x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
+                     x.DoctorUser==taskinfo.DoctorUser&&
+                        x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 0ee8fabcc..d66c49a72 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -603,6 +603,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
                     x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
                     x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
+                     x.DoctorUser == taskinfo.DoctorUser &&
+                     x.IsSelfAnalysis== taskinfo.IsSelfAnalysis &&
                     x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();