diff --git a/lib/core/viewModel/profile/intervention_medication_view_model.dart b/lib/core/viewModel/profile/intervention_medication_view_model.dart
index 1caa36a9..9c456a2a 100644
--- a/lib/core/viewModel/profile/intervention_medication_view_model.dart
+++ b/lib/core/viewModel/profile/intervention_medication_view_model.dart
@@ -22,8 +22,8 @@ class InterventionMedicationViewModel extends BaseViewModel {
 
   List<PatiantInformtion> filterData = [];
 
-  DateTime selectedFromDate;
-  DateTime selectedToDate;
+  DateTime selectedFromDate = DateTime.now();
+  DateTime selectedToDate = DateTime.now().add(Duration(days: 1));
 
   PatiantInformtion patient;
   bool hasError = false;
diff --git a/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart b/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart
index 2ce150d8..f7e2d7ba 100644
--- a/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart
+++ b/lib/screens/patients/profile/pharmacy-intervention/pharmacy_intervention_screen.dart
@@ -85,9 +85,8 @@ class _PharmacyInterventionScreenState
                                   child: TextField(
                                     decoration: textFieldSelectorDecoration(
                                         TranslationBase.of(context).fromDate,
-                                        model.selectedFromDate != null
-                                            ? "${AppDateUtils.convertStringToDateFormat(model.selectedFromDate.toString(), "yyyy-MM-dd")}"
-                                            : "${AppDateUtils.convertStringToDateFormat(DateTime.now().toString(), "yyyy-MM-dd")}",
+                                        "${AppDateUtils.convertStringToDateFormat(model.selectedFromDate.toString(), "yyyy-MM-dd")}"
+                                            ,
                                         true,
                                         suffixIcon: Icon(
                                           Icons.calendar_today,
@@ -122,9 +121,8 @@ class _PharmacyInterventionScreenState
                                   child: TextField(
                                     decoration: textFieldSelectorDecoration(
                                         TranslationBase.of(context).toDate,
-                                        model.selectedToDate != null
-                                            ? "${AppDateUtils.convertStringToDateFormat(model.selectedToDate.toString(), "yyyy-MM-dd")}"
-                                            : "${AppDateUtils.convertStringToDateFormat(DateTime.now().add(Duration(days: 1)).toString(), "yyyy-MM-dd")}",
+                                         "${AppDateUtils.convertStringToDateFormat(model.selectedToDate.toString(), "yyyy-MM-dd")}"
+                                            ,
                                         true,
                                         suffixIcon: Icon(
                                           Icons.calendar_today,