diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
index bbf02e4a..b2daf45a 100644
--- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
+++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
@@ -100,9 +100,9 @@ class ScheduleCompleteVisitPageModel
     }
     if (val != '0') {
       try {
-        DateTime startDate = DateFormat('d/M/y H:mm:ss').parse(val);
+        DateTime startDate = DateFormat('dd/MM/yyyy HH:mm:ss').parse(val);
         DateTime endDate =
-            DateFormat('d/M/y H:mm:ss').parse(textController2!.text);
+            DateFormat('dd/MM/yyyy HH:mm:ss').parse(textController2!.text);
         if (startDate.isAfter(endDate)) {
           return FFLocalizations.of(context).getVariableText(
             ptText: 'A data de início deve ser anterior à data de término.',
@@ -136,7 +136,7 @@ class ScheduleCompleteVisitPageModel
         ptText: 'Este campo é obrigatório.',
       );
     }
-    if (val != null) {
+    if (val != '0') {
       try {
         DateTime endDate = DateFormat('dd/M/yyyy HH:mm:ss').parse(val);
         DateTime startDate =
diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart
index 521f3cc9..041c1362 100644
--- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart
+++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_widget.dart
@@ -522,7 +522,7 @@ Widget scheduleVisit(BuildContext context,
                                 }
                                 safeSetState(() {
                                   _model.textController1?.text = dateTimeFormat(
-                                    'd/M/y H:mm:ss',
+                                    'dd/MM/yyyy HH:mm:ss',
                                     _model.datePicked1,
                                     locale: FFLocalizations.of(context)
                                         .languageCode,
@@ -772,7 +772,7 @@ Widget scheduleVisit(BuildContext context,
                                 }
                                 safeSetState(() {
                                   _model.textController2?.text = dateTimeFormat(
-                                    'd/M/y H:mm:ss',
+                                    'dd/MM/yyyy HH:mm:ss',
                                     _model.datePicked2,
                                     locale: FFLocalizations.of(context)
                                         .languageCode,