修改任务字段

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

@@ -88,8 +88,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public ReadingTaskState ReadingTaskState { get; set; }
 
-        //建议完成时间
-        public int SuggesteDays { get; set; }
 
         public DateTime? SignTime { get; set; }
 
@@ -98,9 +96,16 @@ namespace IRaCIS.Core.Application.ViewModel
         public string ReReadingOriginalTaskCode { get; set; }
 
 
-        public RequestReturnType RequestReturnType { get; set; }
+        public RequestReReadingType RequestReReadingType { get; set; }
-        public DateTime? RequestReturnTime { get; set; }
+
-        public string RequestReturnReason { get; set; } = string.Empty;
+        public DateTime? RequestReReadingTime { get; set; }
+
+        public string RequestReReadingReason { get; set; } = string.Empty;
+
+        public DateTime? SuggesteFinishedTime { get; set; }
+
+        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
+
 
 
 

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -80,7 +80,7 @@ namespace IRaCIS.Core.Domain.Share
         HaveSigned=2
     }
 
-    public enum RequestReturnType
+    public enum RequestReReadingType
     {
         Default = 0,
 
@@ -89,6 +89,14 @@ namespace IRaCIS.Core.Domain.Share
         TrialGroupApply = 2
     }
 
+    public enum RequestReReadingResult
+    {
+        Default = 0,
+
+        Agree = 1,
+
+        Reject = 2
+    }
 
     
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -132,9 +132,6 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        //建议完成时间
-        public int SuggesteDays { get; set; }
-
         //任务阅片状态
         public ReadingTaskState ReadingTaskState { get; set; }
 
@@ -154,11 +151,21 @@ namespace IRaCIS.Core.Domain.Models
         public VisitTask OriginalReReadingTask { get; set; }
 
         //申请回退类型
-        public RequestReturnType RequestReturnType { get; set; } 
+        public RequestReReadingType RequestReReadingType { get; set; } 
 
-        public DateTime? RequestReturnTime { get; set; }
+        public DateTime? RequestReReadingTime { get; set; }
 
-        public string RequestReturnReason { get; set; } = string.Empty;
+        public string RequestReReadingReason { get; set; } = string.Empty;
+
+        public DateTime? SuggesteFinishedTime { get; set; }
+
+        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
+
+        
+
+
+        //建议完成时间
+        //public int SuggesteDays { get; set; }
     }
 
 }