From ad6419d07e27717c72b20ad8dd83dba18c10cd92 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 29 Sep 2022 16:30:57 +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.Application/Service/Allocation/VisitTaskService.cs | 2 +-
 IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 24d5f11cc..4f9545af0 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -2581,7 +2581,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                             }
                             else
                             {
-                                throw new BusinessValidationFailedException("IR 申请重阅，不会影响到后续未读的任务");
+                                throw new BusinessValidationFailedException("IR 申请重阅，不会影响到后续未读的任务,当前影响列表有未读的任务，请核查");
                             }
                         }
                         else
diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
index c8575d992..532b43cc9 100644
--- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
@@ -96,7 +96,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<SubjectUser, SubjectUserDTO>().IncludeBase<SubjectUser, SubjectUserView>()
-             /*.ForMember(o => o.IsHaveReading, t => t.MapFrom(u => u.SubjectArmVisitTaskList.Any(t => t.ReadingTaskState != ReadingTaskState.WaitReading)))*/;
+             .ForMember(o => o.IsHaveReading, t => t.MapFrom(u => u.Subject.SubjectVisitTaskList.Any(t => t.ReadingTaskState != ReadingTaskState.WaitReading && t.TrialReadingCriterionId==u.TrialReadingCriterionId)));
 
 
             CreateMap<SubjectVisit, VisitGenerataTaskDTO>();