From 432a2bca2167cc1c510c8d143447860066093153 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Mar 2023 13:08:54 +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

---
 IRaCIS.Core.Domain/Allocation/VisitTask.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index b899b9a48..55f7ac0a8 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -314,7 +314,7 @@ namespace IRaCIS.Core.Domain.Models
          && t.ArmEnum == ArmEnum) || BeforeConvertedTaskId != null
       ).Any();
 
-        [NotMapped]
+        //[NotMapped]
         public List<CrterionDictionaryGroup> CrterionDictionaryGroup
         {
             get
@@ -322,7 +322,16 @@ namespace IRaCIS.Core.Domain.Models
 
                 try
                 {
-                    if (this.IsConvertedTask)
+
+                    var isConverted= 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();
+
+                    if (isConverted)
                     {
                         return new List<CrterionDictionaryGroup>() { Share.CrterionDictionaryGroup.General, Share.CrterionDictionaryGroup.Converted };
                     }