From 3470f26521d018989e8f544890c709e23e074d64 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 18 Nov 2022 09:41:03 +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/Reading/ReadingImageTask/ReadingImageTaskService.cs  | 1 +
 .../Service/ReadingCalculate/GeneralCalculateService.cs          | 1 +
 IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 773eb35a..c0975c9d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -192,6 +192,7 @@ namespace IRaCIS.Application.Services
             x.ReadingTaskState == ReadingTaskState.HaveSigned &&
             x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
             x.TaskState == TaskState.Effect &&
+            x.VisitTaskNum<= taskInfo.VisitTaskNum&&
             x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
             x.ReadingCategory == ReadingCategory.Visit) || x.Id == inDto.VisitTaskId)
                 .Select(x => new GetRelatedVisitTaskOutDto()
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
index 19f95cef..b0e9dc9f 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
                 .Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
                 && x.IsAnalysisCreate == visitTaskInfo.IsAnalysisCreate
                 && x.IsSelfAnalysis == visitTaskInfo.IsSelfAnalysis
+             && x.VisitTaskNum<= visitTaskInfo.VisitTaskNum
               && x.ArmEnum == visitTaskInfo.ArmEnum
               && x.TrialReadingCriterionId == visitTaskInfo.TrialReadingCriterionId
               && x.ReadingCategory == ReadingCategory.Visit && x.ReadingTaskState == ReadingTaskState.HaveSigned) || x.Id == visitTaskId
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index fd72bfbf..1e0df2ad 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -274,6 +274,7 @@ namespace IRaCIS.Core.Application.Services
 
                     if (thisVisitTaskStudy != null)
                     {
+                        thisVisitTaskStudy.StudyId = default(Guid);
                         var item = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
                             ThenBy(s => s.SeriesTime)
                             .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();