From 14b892889bc006c79dbb5b0c70d12c0f537990a4 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 30 Nov 2022 09:57:07 +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/IRaCIS.Core.Application.xml   |  4 ++--
 .../Service/Allocation/DTO/VisitTaskViewModel.cs      | 11 +----------
 .../Service/Allocation/VisitTaskService.cs            |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index aa0e76004..f445c6975 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -358,11 +358,11 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetOrderReadingIQueryable(System.Guid,System.Nullable{System.Guid},System.String)">
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetOrderReadingIQueryable(IRaCIS.Core.Application.ViewModel.GetOrderReadingIQueryableInDto)">
             <summary>
             获取有序阅片IQuery对象
             </summary>
-            <param name="trialId"></param>
+            <param name="inDto"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 34428631c..752ca4329 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -234,16 +234,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent);
 
-        public int UnReadTaskCount
-        {
-            get
-            {
-
-                return this.UnReadTaskList.Count();
-
-
-            }
-        }
+        public int UnReadTaskCount { get; set; }
 
         public bool ExistReadingApply { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index aafd60ec0..5ac504f84 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -979,7 +979,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             {
                 SubjectId = x.Key.SubjectId,
                 SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
-               
+                UnReadTaskCount = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned).Count(),
                 ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed),
                 UnReadTaskList = x.Where(y => y.ReadingTaskState != ReadingTaskState.HaveSigned).OrderBy(x => x.VisitTaskNum)
                 .Select(u => new IRUnreadTaskView()