IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -108,24 +108,21 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int AttachmentCount { get; set; }
 
-        public DateTime? SuggestFinishTime
-        {
-            get
-            {
+        public DateTime? SuggestFinishTime { get {
 
                 if (this.CreateTime > this.UserCreateTime && this.CurrentStaffTrainDays != null)
                 {
-                    return  DateTime.Parse(this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value).ToString("yyyy-MM-dd")+" 22:00:00");
+                    return this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value);
                 }
 
                 if (this.CreateTime < this.UserCreateTime && this.NewStaffTrainDays != null)
                 {
-                    return DateTime.Parse(this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value).ToString("yyyy-MM-dd") + " 22:00:00");
+                    return this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value);
                 }
-                return null;
 
-            }
-        }
+                return null;
+            
+            } }
 
         public string DocTypeCode { get; set; }