From cb2d6e9bdf38036c333948d62cf29d04206c849e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 29 Mar 2023 17:31:37 +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

---
 .../Allocation/VisitTaskHelpeService.cs       | 30 +++++++++---------
 IRaCIS.Core.Domain/Allocation/VisitTask.cs    | 31 ++++++++++---------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 356d0c5b3..c1ce5ec0e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -119,22 +119,22 @@ namespace IRaCIS.Core.Application.Service
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync();
             taskInfo.ReadingTaskState = ReadingTaskState.Reading;
-            taskInfo.IsConvertedTask = true;
+            //taskInfo.IsConvertedTask = true;
             taskInfo.BeforeConvertedTaskId = taskId;
             taskInfo.Id = NewId.NextGuid();
 
-            await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>
-                x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
-               && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
-               && x.VisitTaskNum > taskInfo.VisitTaskNum
-               && x.DoctorUserId == taskInfo.DoctorUserId
-               && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
-               && x.SubjectId == taskInfo.SubjectId
-                && x.ArmEnum == taskInfo.ArmEnum &&
-                x.TaskState == TaskState.Effect, x => new VisitTask()
-                {
-                    IsConvertedTask = true
-                });
+            //await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>
+            //    x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
+            //   && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
+            //   && x.VisitTaskNum > taskInfo.VisitTaskNum
+            //   && x.DoctorUserId == taskInfo.DoctorUserId
+            //   && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
+            //   && x.SubjectId == taskInfo.SubjectId
+            //    && x.ArmEnum == taskInfo.ArmEnum &&
+            //    x.TaskState == TaskState.Effect, x => new VisitTask()
+            //    {
+            //        IsConvertedTask = true
+            //    });
 
             await _visitTaskRepository.AddAsync(taskInfo);
 
@@ -1682,7 +1682,7 @@ namespace IRaCIS.Core.Application.Service
                             var task1 = await _visitTaskRepository.AddAsync(new VisitTask()
                             {
                                 TrialId = trialId,
-                                IsConvertedTask = originalTaskInfo.IsConvertedTask,
+                                //IsConvertedTask = originalTaskInfo.IsConvertedTask,
                                 SubjectId = item.SubjectId,
                                 IsUrgent = originalTaskInfo.IsUrgent,
                                 VisitTaskNum = item.VisitNum + ReadingCommon.TaskNumDic[ReadingCategory.Global],
@@ -1734,7 +1734,7 @@ namespace IRaCIS.Core.Application.Service
                             SubjectId = item.SubjectId,
                             IsUrgent = originalTaskInfo.IsUrgent,
                             TaskName = item.ReadingName,
-                            IsConvertedTask = originalTaskInfo.IsConvertedTask,
+                            //IsConvertedTask = originalTaskInfo.IsConvertedTask,
                             // 原任务是全局任务  加0.03 就好
                             VisitTaskNum = originalTaskInfo.VisitTaskNum + 0.03m,
                             ArmEnum = Arm.TumorArm, //特殊
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index d23b1fd75..65d1a82ec 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -293,16 +293,27 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsAnalysisCreate { get; set; }
 
 
-        /// <summary>
-        /// 是否是转变的任务(转为IRECIST)
-        /// </summary>
-        public bool IsConvertedTask { get; set; } = false;
+        ///// <summary>
+        ///// 是否是转变的任务(转为IRECIST)
+        ///// </summary>
+        //public bool IsConvertedTask { get; set; } = false;
 
         /// <summary>
-        /// 转换之前的任务Id
+        /// 转换之前的任务Id(转化的任务才有该值)
         /// </summary>
         public Guid? BeforeConvertedTaskId { get; set; }
 
+
+        [Projectable]
+
+        public bool IsConvertedTask => Subject.SubjectVisitTaskList.Where(t => (t.TrialReadingCriterionId == TrialReadingCriterionId
+         && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId!=null
+         && t.TaskState == TaskState.Effect &&
+         t.VisitTaskNum < VisitTaskNum
+         && t.IsSelfAnalysis == IsSelfAnalysis
+         && t.ArmEnum == ArmEnum)|| BeforeConvertedTaskId!=null
+       ).Any();
+
         [NotMapped]
         public List<CrterionDictionaryGroup> CrterionDictionaryGroup
         {
@@ -361,15 +372,7 @@ namespace IRaCIS.Core.Domain.Models
         public Trial Trial { get; set; }
 
 
-        [Projectable]
-
-        public bool  IsAfterConvertedTask=>Subject.SubjectVisitTaskList.Where(t=>t.TrialReadingCriterionId == TrialReadingCriterionId
-        && t.DoctorUserId==DoctorUserId && t.IsConvertedTask 
-        && t.TaskState==TaskState.Effect && 
-        t.VisitTaskNum<VisitTaskNum
-        && t.IsSelfAnalysis==IsSelfAnalysis
-        && t.ArmEnum==ArmEnum
-        ).Any();
+       
 
 
         //影像质量  等等第一层级问题答案