修改查询

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -293,10 +293,10 @@ 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(转化的任务才有该值)
@@ -304,15 +304,15 @@ namespace IRaCIS.Core.Domain.Models
         public Guid? BeforeConvertedTaskId { get; set; }
 
 
-       // [Projectable]
+        [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();
+        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