阅片跟踪列表

IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs

@@ -24,34 +24,49 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
 
-        //总任务数
-        public int? TotalTaskCount { get; set; }
-
-        //已经应用的任务总数
-        public int? ApplyedTotalTaskCount { get; set; }
 
 
-        //该医生未应用的任务数
-        public int? WaitApplySelfTaskCount { get; set; }
 
+
+
+        //该医生已经应用的 Subject数量
+        public int? SelfApplyedSubjectCount { get; set; }
+
+        //该医生已经分配Subject数量
+        public int? SelfSubjectCount { get; set; }
+
+
+        //该医生未应用Subject 数量    不是两者相减  跟批量勾选有关系
         public int? WaitApplySelfSubjectCount { get; set; }
 
+
+
+
         //该医生已应用的任务数
         public int? SelfTaskCount { get; set; }
 
-        //已经分配该医生Subject数量
-        public int? SelfSubjectCount { get; set; }
+        //已分配但是未读片签名的数量
+        public int? SelfUndoTaskCount { get; set; }
 
-        public int? SelfApplyedSubjectCount { get; set; }
+        //该医生未应用的任务数
+        public int? WaitApplySelfTaskCount { get; set; }
 
-        //已应用 的Subject 数
+
+
+        //总共已应用 的Subject 数
         public int? ApplyedTotalSubjectCount { get; set; }
 
         //系统  Subject数
         public int? TotalSubjectCount { get; set; }
 
-        //已分配但是未处理的任务量
-        public int? SelfUndoTaskCount { get; set; }
+        //总任务数
+        public int? TotalTaskCount { get; set; }
+
+        //总共 已经应用的任务总数
+        public int? ApplyedTotalTaskCount { get; set; }
+
+
+
 
     }
 

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -73,14 +73,18 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public ReadingTaskState ReadingTaskState { get; set; }
 
-        //建议完成时间
-        public int SuggesteDays { get; set; }
 
         public DateTime? SignTime { get; set; }
 
         //是否回退过
         public bool IsReturned { get; set; }
 
+
+
+        //是否 重阅
+        public bool IsReReading { get; set; }
+        public DateTime? SuggesteFinishedTime { get; set; }
+
     }
 
     public class ReReadingTaskView : VisitTaskView

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -150,6 +150,7 @@ namespace IRaCIS.Core.Domain.Models
 
         //是否 重阅
         public bool IsReReading { get; set; }
+        public DateTime? SuggesteFinishedTime { get; set; }
 
         //重阅原始任务Id  重阅会产生新的任务 
         public Guid? OriginalReReadingId { get; set; }
@@ -164,7 +165,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public string RequestReReadingReason { get; set; } = string.Empty;
 
-        public DateTime? SuggesteFinishedTime { get; set; }
+
 
         public RequestReReadingResult RequestReReadingResultEnum { get; set; }