diff --git a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
index d5c81151..9c342c0c 100644
--- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
+++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
@@ -57,10 +57,11 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                 'Authorization': 'Bearer $token',
               },
             );
-            final diary = jsonDecode(response.body);
+            final diary = jsonDecode(response.body)['diary'];
             if (diary is Map<String, dynamic>) {
+              print(diary);
               final String diaryDate =
-                  diary['diary']['date'] ?? DateTime.now().toString();
+                  diary['date'] ?? DateTime.now().toString();
               // Продолжайте обработку данных дневника
               if (state is DiaryEditLoadedState) {
                 // Если текущее состояние уже загружено, обновляем его
@@ -86,13 +87,14 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
                 emit(DiaryEditLoadedState(
                   wakeupExpanded: true,
                   moodExpanded: true,
-                  wakeupController: TimeOfDay.now(),
-                  retireController: TimeOfDay.now(),
+                  wakeupController: toTime(diary['wakeup']),
+                  retireController: toTime(diary['retire']),
                   mealTimeController: TimeOfDay.now(),
                   selectedSatiety: 3,
                   selectedMood: 3,
                   mealNameController: TextEditingController(),
-                  commentController: TextEditingController(),
+                  commentController:
+                      TextEditingController(text: diary['comment']),
                   productNameController: TextEditingController(),
                   productQuantityController: TextEditingController(),
                   diaryId: diaryId,
@@ -230,3 +232,12 @@ Future<String> uploadImageToServer(String imagePath) async {
     throw Exception('Ошибка при загрузке изображения');
   }
 }
+
+TimeOfDay toTime(String timeStr) {
+  List<String> timeParts = timeStr.split(":");
+  int hour = int.parse(timeParts[0]);
+  int minute = int.parse(timeParts[1]);
+
+  TimeOfDay timeOfDay = TimeOfDay(hour: hour, minute: minute);
+  return timeOfDay;
+}