From 331a3c4178e7e7c12cc75d51a90d22266447ac9e Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 29 Feb 2024 18:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingJudgeTaskService.cs      |  9 +++++----
 .../ReadingImageTask/ReadingOncologyTaskService.cs   | 12 +++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
index 44b414aa0..fceea7ca6 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
@@ -426,9 +426,10 @@ namespace IRaCIS.Application.Services
                 SignTime = DateTime.Now,
                 JudgeResultImagePath = string.Join(',', inDto.JudgeResultImagePathList),
             });
-            await _visitTaskRepository.SaveChangesAsync();
-            // 需要判断是否添加肿瘤学任务
-            var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
+			var result = await _visitTaskRepository.SaveChangesAsync();
+
+			// 需要判断是否添加肿瘤学任务
+			var taskInfo = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
 
             if (taskInfo.ReadingCategory == ReadingCategory.Visit)
             {
@@ -461,7 +462,7 @@ namespace IRaCIS.Application.Services
 			}
 
 
-            var result = await _visitTaskRepository.SaveChangesAsync();
+
 
 
             // 创建任务关联关系
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index b4efec01f..594aa2137 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -432,13 +432,15 @@ namespace IRaCIS.Application.Services
 
                 else {
 
-					globalOrVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect
+                    var visitTask = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect
 							&& x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId
-							&& x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.Id).FirstOrDefaultAsync();
+                            && x.ReadingCategory==ReadingCategory.Visit
+							&& x.ReadingTaskState == ReadingTaskState.HaveSigned).FirstNotNullAsync();
+
+                    globalOrVisitTaskId = visitTask.Id;
+
+                    var judgeVisitTaskId = visitTask.JudgeVisitTaskId;
 
-					var judgeVisitTaskId = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == readModuleInfo.SubjectVisitId && x.TaskState == TaskState.Effect
-                            &&x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId
-							&& x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.JudgeVisitTaskId).FirstOrDefaultAsync();
 					// 要判断是否为老裁判任务的Id
 					if (judgeVisitTaskId != null)
 					{