From 721a7d23412e88e7ebd122c181999758c9d95c4d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 27 Feb 2024 17:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskHelpeService.cs   |  4 ++--
 .../ReadingOncologyTaskService.cs                 | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 8315655ae..1a820291e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -1619,8 +1619,8 @@ namespace IRaCIS.Core.Application.Service
                             IsUrgent = originalTaskInfo.IsUrgent,
                             TaskName = item.ReadingName,
                             //IsConvertedTask = originalTaskInfo.IsConvertedTask,
-                            // 原任务是全局任务  加0.03 就好
-                            VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
+                            // 这里可能是
+                            VisitTaskNum = originalTaskInfo.VisitTaskNum - ReadingCommon.TaskNumDic[originalTaskInfo.ReadingCategory] + ReadingCommon.TaskNumDic[ReadingCategory.Oncology],
                             ArmEnum = Arm.TumorArm, //特殊
                             Code = currentMaxCodeInt + 1,
                             SouceReadModuleId = item.ReadModuleId,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index a24eac673..fb58ba383 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -376,6 +376,8 @@ namespace IRaCIS.Application.Services
             if (readModuleInfo != null)
             {
                 // 先找到对应的全局阅片模块Id
+
+                var globalOrVisitTaskId = default(Guid);
                 var globalreadModule = await _readModuleRepository.Where(x => x.SubjectVisitId == readModuleInfo.SubjectVisitId &&
                 x.TrialReadingCriterionId== readModuleInfo.TrialReadingCriterionId&&
                 x.ModuleType == ModuleTypeEnum.Global).Include(x=>x.SubjectVisit).FirstOrDefaultAsync();
@@ -385,7 +387,11 @@ namespace IRaCIS.Application.Services
                 {
                     // 找到一个全局阅片任务是否有裁判任务
 
-                    var judgeVisitTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModule.Id && x.TaskState == TaskState.Effect
+                    globalOrVisitTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModule.Id && x.TaskState == TaskState.Effect
+					&& x.ReadingCategory == ReadingCategory.Global
+							 && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.Id).FirstOrDefaultAsync();
+
+					var judgeVisitTaskId = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModule.Id && x.TaskState == TaskState.Effect
                     && x.ReadingCategory == ReadingCategory.Global
                              && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.JudgeVisitTaskId).FirstOrDefaultAsync();
 
@@ -417,6 +423,10 @@ namespace IRaCIS.Application.Services
 
                 else {
 
+					globalOrVisitTaskId = 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();
+
 					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();
@@ -474,8 +484,7 @@ namespace IRaCIS.Application.Services
                             ReadingCategory = ReadingCategory.Oncology,
                         });
 
-                        var originalVisit = await _visitTaskRepository.Where(x => x.SouceReadModuleId == globalreadModuleId && x.TaskState == TaskState.Effect && x.ReadingCategory == ReadingCategory.Global
-                           && x.ReadingTaskState == ReadingTaskState.HaveSigned && !x.IsAnalysisCreate && x.TrialReadingCriterionId == readModuleInfo.TrialReadingCriterionId
+                        var originalVisit = await _visitTaskRepository.Where(x =>x.Id==globalOrVisitTaskId
                            ).OrderByDescending(x => x.VisitTaskNum).ThenBy(x => x.ArmEnum).FirstNotNullAsync();
 
                         var originalVisitId = default(Guid);