From c7eb7ea0bae98146b421a6697e9b105d1354ec37 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 20 Jul 2022 16:44:13 +0800
Subject: [PATCH] x

---
 .../IRaCIS.Core.Application.xml               | 78 ++++++++++---------
 .../Service/Allocation/VisitTaskService.cs    |  1 +
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a3711fc73..be3fa7010 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -176,6 +176,12 @@
             访视读片任务
             </summary>	
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectAssignAndTaskStatList(IRaCIS.Core.Application.ViewModel.SubjectAssignStatQuery)">
+            <summary>
+            Subject 任务类型  统计 +分配情况
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetSubjectAssignList(IRaCIS.Core.Application.ViewModel.SubjectAssignQuery)">
             <summary>
             获取手动分配  未分配的Subject列表(IsHaveAssigned 传递false)
@@ -184,7 +190,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)">
             <summary>
-            获取随访  阅片期 全局  任务列表
+            访视任务
             </summary>
             <param name="queryVisitTask"></param>
             <param name="_visitTaskCommonService"></param>
@@ -192,41 +198,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetJudgeVisitTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
             <summary>
-            获取裁判访视任务列表
-            </summary>
-            <param name="queryVisitTask"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
-            <summary>
-            获取影像阅片列表  相比而言多了几个字段 和配置信息
-            </summary>
-            <param name="queryVisitTask"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
-            <summary>
-            PM 重阅追踪 
-            </summary>
-            <param name="queryVisitTask"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
-            <summary>
-            获取IR 重阅影像阅片列表 
-            </summary>
-            <param name="queryVisitTask"></param>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRUnReadSubjectTaskList(IRaCIS.Core.Application.ViewModel.IRUnReadSubjectQuery)">
-            <summary>
-            IR  待阅片任务列表
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
-            <summary>
-            IR  已阅片任务
+            裁判任务
             </summary>
             <param name="queryVisitTask"></param>
             <returns></returns>
@@ -265,6 +237,40 @@
             <param name="assignSubjectTaskToDoctorCommand"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
+            <summary>
+            PM阅片跟踪
+            </summary>
+            <param name="queryVisitTask"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
+            <summary>
+            PM 重阅追踪 
+            </summary>
+            <param name="queryVisitTask"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRReReadingTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
+            <summary>
+            获取IR 重阅影像阅片列表 
+            </summary>
+            <param name="queryVisitTask"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRUnReadSubjectTaskList(IRaCIS.Core.Application.ViewModel.IRUnReadSubjectQuery)">
+            <summary>
+            IR  待阅片任务列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.GetIRHaveReadTaskList(IRaCIS.Core.Application.ViewModel.VisitTaskQuery)">
+            <summary>
+            IR  已阅片任务
+            </summary>
+            <param name="queryVisitTask"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.ApplyReReading(IRaCIS.Core.Application.ViewModel.ApplyReReadingCommand)">
             <summary>
             申请重阅  1:IR  2:PM
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 89589f92d..123e2b6e0 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -980,6 +980,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
                 .WhereIf(queryVisitTask.ReadingCategory != null, t => t.ReadingCategory == queryVisitTask.ReadingCategory)
                 .WhereIf(queryVisitTask.TaskAllocationState != null, t => t.TaskAllocationState == queryVisitTask.TaskAllocationState)
+                .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.TaskName), t => t.TaskName.Contains(queryVisitTask.TaskName) || t.TaskBlindName.Contains(queryVisitTask.TaskName))
                 .WhereIf(!string.IsNullOrEmpty(queryVisitTask.SubjectCode), t => t.Subject.Code.Contains(queryVisitTask.SubjectCode))
                 .WhereIf(queryVisitTask.BeginAllocateDate != null, t => t.AllocateTime > queryVisitTask.BeginAllocateDate)