diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index 7e464e1..f6c97de 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -201,8 +201,13 @@ class HomeFragment : Fragment() {
             ) it.titlecase(Locale.getDefault()) else it.toString()
 
         }
-        val query = Firebase.firestore.collection("patientData").orderBy(field).startAt(search)
-            .endAt(search + "\uf8ff")
+        val currentDate = Date()
+        val dateFormat = SimpleDateFormat("yyyyMMdd")
+        val partition = dateFormat.format(currentDate)
+        val searchTerm = partition + search
+        val searchField = field + "Search"
+        val query = Firebase.firestore.collection("patientData").orderBy(searchField).startAt(searchTerm)
+            .endAt(searchTerm + "\uf8ff")
         val recyclerViewOptions =
             FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                 .build()