diff --git a/PARR.EsppOrderLoader/Services/OrderItemService.cs b/PARR.EsppOrderLoader/Services/OrderItemService.cs
index 95349c54..149bef0b 100644
--- a/PARR.EsppOrderLoader/Services/OrderItemService.cs
+++ b/PARR.EsppOrderLoader/Services/OrderItemService.cs
@@ -53,8 +53,8 @@ namespace PARR.EsppOrderLoader.Services
                 StatusCode = (int)orderStatusService.GetOrderStatusByName(esppOrder.Status),
                 GenerateDate = template == null ?
                                                 null
-                                                : CalcGenerationDate(template.ApplicationsInWork!.NextRun),
-                                                //CalcGenerationDate(esppOrder.ExpirationDateUTC, template.ApplicationsInWork!.TemplateDurationTimeSpan),
+                                                : CalcGenerationDate(template.ApplicationsInWork!.NextRun, template.ApplicationsInWork!.LastRun),
+                //CalcGenerationDate(esppOrder.ExpirationDateUTC, template.ApplicationsInWork!.TemplateDurationTimeSpan),
                 ExpirationDate = esppOrder.ExpirationDateUTC
             };
 
@@ -100,24 +100,16 @@ namespace PARR.EsppOrderLoader.Services
         /// <summary>
         /// Рассчет GenerationDate относительно текущей даты и nextRun из ApplicationInWorks
         /// </summary>
-        /// <param name="expirationDateUTC"></param>
-        /// <param name="nextRun"></param>
         /// <returns></returns>
-        private DateTimeOffset? CalcGenerationDate(DateTimeOffset nextRun)
+        private DateTimeOffset? CalcGenerationDate(DateTimeOffset nextRun, DateTimeOffset? lastRun)
         {
-            var date = DateTimeOffset.UtcNow;
+            if (DateTimeOffset.UtcNow < nextRun)
+                return nextRun;
 
+            if (lastRun.HasValue)
+                return lastRun.Value;
 
-
-
-            // подумать о переходе суток.
-            // подумать о NextRun, если он уже пересчитался
-
-            //DateCreated = dtUtcNow
-
-            var generationDate = new DateTimeOffset(2024, 2, 26, 12, 36, 0, new TimeSpan(0));
-
-            return generationDate;
+            return null;
         }
 
     }