diff --git a/pkg/clinical/presentation/graph/clinical.graphql b/pkg/clinical/presentation/graph/clinical.graphql
index c52fd388..76a94d68 100644
--- a/pkg/clinical/presentation/graph/clinical.graphql
+++ b/pkg/clinical/presentation/graph/clinical.graphql
@@ -28,78 +28,91 @@ extend type Query {
   getPatientTemperatureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBloodPressureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientHeightEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientRespiratoryRateEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientPulseRateEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBMIEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientWeightEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientMuacEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientOxygenSaturationEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientViralLoad(
     patientID: ID!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBloodSugarEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientLastMenstrualPeriodEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientDiastolicBloodPressureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
diff --git a/pkg/clinical/presentation/graph/clinical.resolvers.go b/pkg/clinical/presentation/graph/clinical.resolvers.go
index 05302966..93d3c981 100644
--- a/pkg/clinical/presentation/graph/clinical.resolvers.go
+++ b/pkg/clinical/presentation/graph/clinical.resolvers.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/savannahghi/clinical/pkg/clinical/application/dto"
 	"github.com/savannahghi/clinical/pkg/clinical/presentation/graph/generated"
+	"github.com/savannahghi/scalarutils"
 )
 
 // CreateEpisodeOfCare is the resolver for the createEpisodeOfCare field.
@@ -201,79 +202,79 @@ func (r *queryResolver) ListPatientEncounters(ctx context.Context, patientID str
 }
 
 // GetPatientTemperatureEntries is the resolver for the getPatientTemperatureEntries field.
-func (r *queryResolver) GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientTemperatureEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientTemperatureEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientBloodPressureEntries is the resolver for the getPatientBloodPressureEntries field.
-func (r *queryResolver) GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientBloodPressureEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientBloodPressureEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientHeightEntries is the resolver for the getPatientHeightEntries field.
-func (r *queryResolver) GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
-	return r.usecases.Clinical.GetPatientHeightEntries(ctx, patientID, encounterID, &pagination)
+func (r *queryResolver) GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+	return r.usecases.Clinical.GetPatientHeightEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientRespiratoryRateEntries is the resolver for the getPatientRespiratoryRateEntries field.
-func (r *queryResolver) GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientRespiratoryRateEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientRespiratoryRateEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientPulseRateEntries is the resolver for the GetPatientPulseRateEntries field.
-func (r *queryResolver) GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
-	return r.usecases.Clinical.GetPatientPulseRateEntries(ctx, patientID, encounterID, &pagination)
+func (r *queryResolver) GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+	return r.usecases.Clinical.GetPatientPulseRateEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientBMIEntries is the resolver for the getPatientBMIEntries field.
-func (r *queryResolver) GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientBMIEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientBMIEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientWeightEntries is the resolver for the getPatientWeightEntries field.
-func (r *queryResolver) GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
-	return r.usecases.Clinical.GetPatientWeightEntries(ctx, patientID, encounterID, &pagination)
+func (r *queryResolver) GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+	return r.usecases.Clinical.GetPatientWeightEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientMuacEntries is the resolver for the getPatientMuacEntries field.
-func (r *queryResolver) GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientMuacEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientMuacEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientOxygenSaturationEntries is the resolver for the getPatientOxygenSaturationEntries field.
-func (r *queryResolver) GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientOxygenSaturationEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientOxygenSaturationEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientViralLoad is the resolver for the getPatientViralLoad field.
-func (r *queryResolver) GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
 
-	return r.usecases.Clinical.GetPatientViralLoad(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientViralLoad(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientBloodSugarEntries is the resolver for the getPatientBloodSugarEntries field.
-func (r *queryResolver) GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientBloodSugarEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientBloodSugarEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientLastMenstrualPeriodEntries is the resolver for the GetPatientLastMenstrualPeriodEntries field.
-func (r *queryResolver) GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientLastMenstrualPeriodEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientLastMenstrualPeriodEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // GetPatientDiastolicBloodPressureEntries is the resolver for the getPatientDiastolicBloodPressureEntries field.
-func (r *queryResolver) GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error) {
+func (r *queryResolver) GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error) {
 	r.CheckDependencies()
-	return r.usecases.Clinical.GetPatientDiastolicBloodPressureEntries(ctx, patientID, encounterID, &pagination)
+	return r.usecases.Clinical.GetPatientDiastolicBloodPressureEntries(ctx, patientID, encounterID, date, &pagination)
 }
 
 // SearchAllergy is the resolver for the searchAllergy field.
diff --git a/pkg/clinical/presentation/graph/generated/generated.go b/pkg/clinical/presentation/graph/generated/generated.go
index 7caea10a..354df6e3 100644
--- a/pkg/clinical/presentation/graph/generated/generated.go
+++ b/pkg/clinical/presentation/graph/generated/generated.go
@@ -253,19 +253,19 @@ type ComplexityRoot struct {
 		GetAllergy                              func(childComplexity int, id string) int
 		GetEpisodeOfCare                        func(childComplexity int, id string) int
 		GetMedicalData                          func(childComplexity int, patientID string) int
-		GetPatientBMIEntries                    func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientBloodPressureEntries          func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientBloodSugarEntries             func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientDiastolicBloodPressureEntries func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientHeightEntries                 func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientLastMenstrualPeriodEntries    func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientMuacEntries                   func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientOxygenSaturationEntries       func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientPulseRateEntries              func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientRespiratoryRateEntries        func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientTemperatureEntries            func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientViralLoad                     func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
-		GetPatientWeightEntries                 func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
+		GetPatientBMIEntries                    func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientBloodPressureEntries          func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientBloodSugarEntries             func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientDiastolicBloodPressureEntries func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientHeightEntries                 func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientLastMenstrualPeriodEntries    func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientMuacEntries                   func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientOxygenSaturationEntries       func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientPulseRateEntries              func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientRespiratoryRateEntries        func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientTemperatureEntries            func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientViralLoad                     func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
+		GetPatientWeightEntries                 func(childComplexity int, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) int
 		ListPatientAllergies                    func(childComplexity int, patientID string, pagination dto.Pagination) int
 		ListPatientCompositions                 func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
 		ListPatientConditions                   func(childComplexity int, patientID string, encounterID *string, pagination dto.Pagination) int
@@ -349,19 +349,19 @@ type QueryResolver interface {
 	ListPatientConditions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ConditionConnection, error)
 	ListPatientCompositions(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.CompositionConnection, error)
 	ListPatientEncounters(ctx context.Context, patientID string, pagination dto.Pagination) (*dto.EncounterConnection, error)
-	GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination dto.Pagination) (*dto.ObservationConnection, error)
 	SearchAllergy(ctx context.Context, name string, pagination dto.Pagination) (*dto.TerminologyConnection, error)
 	GetAllergy(ctx context.Context, id string) (*dto.Allergy, error)
 	ListPatientAllergies(ctx context.Context, patientID string, pagination dto.Pagination) (*dto.AllergyConnection, error)
@@ -1422,7 +1422,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientBMIEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientBMIEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientBloodPressureEntries":
 		if e.complexity.Query.GetPatientBloodPressureEntries == nil {
@@ -1434,7 +1434,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientBloodPressureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientBloodPressureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientBloodSugarEntries":
 		if e.complexity.Query.GetPatientBloodSugarEntries == nil {
@@ -1446,7 +1446,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientBloodSugarEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientBloodSugarEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientDiastolicBloodPressureEntries":
 		if e.complexity.Query.GetPatientDiastolicBloodPressureEntries == nil {
@@ -1458,7 +1458,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientDiastolicBloodPressureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientDiastolicBloodPressureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientHeightEntries":
 		if e.complexity.Query.GetPatientHeightEntries == nil {
@@ -1470,7 +1470,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientHeightEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientHeightEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientLastMenstrualPeriodEntries":
 		if e.complexity.Query.GetPatientLastMenstrualPeriodEntries == nil {
@@ -1482,7 +1482,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientLastMenstrualPeriodEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientLastMenstrualPeriodEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientMuacEntries":
 		if e.complexity.Query.GetPatientMuacEntries == nil {
@@ -1494,7 +1494,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientMuacEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientMuacEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientOxygenSaturationEntries":
 		if e.complexity.Query.GetPatientOxygenSaturationEntries == nil {
@@ -1506,7 +1506,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientOxygenSaturationEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientOxygenSaturationEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientPulseRateEntries":
 		if e.complexity.Query.GetPatientPulseRateEntries == nil {
@@ -1518,7 +1518,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientPulseRateEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientPulseRateEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientRespiratoryRateEntries":
 		if e.complexity.Query.GetPatientRespiratoryRateEntries == nil {
@@ -1530,7 +1530,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientRespiratoryRateEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientRespiratoryRateEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientTemperatureEntries":
 		if e.complexity.Query.GetPatientTemperatureEntries == nil {
@@ -1542,7 +1542,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientTemperatureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientTemperatureEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientViralLoad":
 		if e.complexity.Query.GetPatientViralLoad == nil {
@@ -1554,7 +1554,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientViralLoad(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientViralLoad(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.getPatientWeightEntries":
 		if e.complexity.Query.GetPatientWeightEntries == nil {
@@ -1566,7 +1566,7 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 			return 0, false
 		}
 
-		return e.complexity.Query.GetPatientWeightEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["pagination"].(dto.Pagination)), true
+		return e.complexity.Query.GetPatientWeightEntries(childComplexity, args["patientID"].(string), args["encounterID"].(*string), args["date"].(*scalarutils.Date), args["pagination"].(dto.Pagination)), true
 
 	case "Query.listPatientAllergies":
 		if e.complexity.Query.ListPatientAllergies == nil {
@@ -1947,78 +1947,91 @@ var sources = []*ast.Source{
   getPatientTemperatureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBloodPressureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientHeightEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientRespiratoryRateEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientPulseRateEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBMIEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientWeightEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientMuacEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientOxygenSaturationEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientViralLoad(
     patientID: ID!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientBloodSugarEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientLastMenstrualPeriodEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
   getPatientDiastolicBloodPressureEntries(
     patientID: String!
     encounterID: String
+    date: Date
     pagination: Pagination!
   ): ObservationConnection
 
@@ -3010,15 +3023,24 @@ func (ec *executionContext) field_Query_getPatientBMIEntries_args(ctx context.Co
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3043,15 +3065,24 @@ func (ec *executionContext) field_Query_getPatientBloodPressureEntries_args(ctx
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3076,15 +3107,24 @@ func (ec *executionContext) field_Query_getPatientBloodSugarEntries_args(ctx con
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3109,15 +3149,24 @@ func (ec *executionContext) field_Query_getPatientDiastolicBloodPressureEntries_
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3142,15 +3191,24 @@ func (ec *executionContext) field_Query_getPatientHeightEntries_args(ctx context
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3175,15 +3233,24 @@ func (ec *executionContext) field_Query_getPatientLastMenstrualPeriodEntries_arg
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3208,15 +3275,24 @@ func (ec *executionContext) field_Query_getPatientMuacEntries_args(ctx context.C
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3241,15 +3317,24 @@ func (ec *executionContext) field_Query_getPatientOxygenSaturationEntries_args(c
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3274,15 +3359,24 @@ func (ec *executionContext) field_Query_getPatientPulseRateEntries_args(ctx cont
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3307,15 +3401,24 @@ func (ec *executionContext) field_Query_getPatientRespiratoryRateEntries_args(ct
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3340,15 +3443,24 @@ func (ec *executionContext) field_Query_getPatientTemperatureEntries_args(ctx co
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3373,15 +3485,24 @@ func (ec *executionContext) field_Query_getPatientViralLoad_args(ctx context.Con
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -3406,15 +3527,24 @@ func (ec *executionContext) field_Query_getPatientWeightEntries_args(ctx context
 		}
 	}
 	args["encounterID"] = arg1
-	var arg2 dto.Pagination
+	var arg2 *scalarutils.Date
+	if tmp, ok := rawArgs["date"]; ok {
+		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("date"))
+		arg2, err = ec.unmarshalODate2ᚖgithubᚗcomᚋsavannahghiᚋscalarutilsᚐDate(ctx, tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+	args["date"] = arg2
+	var arg3 dto.Pagination
 	if tmp, ok := rawArgs["pagination"]; ok {
 		ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("pagination"))
-		arg2, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
+		arg3, err = ec.unmarshalNPagination2githubᚗcomᚋsavannahghiᚋclinicalᚋpkgᚋclinicalᚋapplicationᚋdtoᚐPagination(ctx, tmp)
 		if err != nil {
 			return nil, err
 		}
 	}
-	args["pagination"] = arg2
+	args["pagination"] = arg3
 	return args, nil
 }
 
@@ -10185,7 +10315,7 @@ func (ec *executionContext) _Query_getPatientTemperatureEntries(ctx context.Cont
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientTemperatureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientTemperatureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10245,7 +10375,7 @@ func (ec *executionContext) _Query_getPatientBloodPressureEntries(ctx context.Co
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientBloodPressureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientBloodPressureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10305,7 +10435,7 @@ func (ec *executionContext) _Query_getPatientHeightEntries(ctx context.Context,
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientHeightEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientHeightEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10365,7 +10495,7 @@ func (ec *executionContext) _Query_getPatientRespiratoryRateEntries(ctx context.
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientRespiratoryRateEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientRespiratoryRateEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10425,7 +10555,7 @@ func (ec *executionContext) _Query_getPatientPulseRateEntries(ctx context.Contex
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientPulseRateEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientPulseRateEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10485,7 +10615,7 @@ func (ec *executionContext) _Query_getPatientBMIEntries(ctx context.Context, fie
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientBMIEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientBMIEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10545,7 +10675,7 @@ func (ec *executionContext) _Query_getPatientWeightEntries(ctx context.Context,
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientWeightEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientWeightEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10605,7 +10735,7 @@ func (ec *executionContext) _Query_getPatientMuacEntries(ctx context.Context, fi
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientMuacEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientMuacEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10665,7 +10795,7 @@ func (ec *executionContext) _Query_getPatientOxygenSaturationEntries(ctx context
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientOxygenSaturationEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientOxygenSaturationEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10725,7 +10855,7 @@ func (ec *executionContext) _Query_getPatientViralLoad(ctx context.Context, fiel
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientViralLoad(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientViralLoad(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10785,7 +10915,7 @@ func (ec *executionContext) _Query_getPatientBloodSugarEntries(ctx context.Conte
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientBloodSugarEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientBloodSugarEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10845,7 +10975,7 @@ func (ec *executionContext) _Query_getPatientLastMenstrualPeriodEntries(ctx cont
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientLastMenstrualPeriodEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientLastMenstrualPeriodEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
@@ -10905,7 +11035,7 @@ func (ec *executionContext) _Query_getPatientDiastolicBloodPressureEntries(ctx c
 	}()
 	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
 		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Query().GetPatientDiastolicBloodPressureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["pagination"].(dto.Pagination))
+		return ec.resolvers.Query().GetPatientDiastolicBloodPressureEntries(rctx, fc.Args["patientID"].(string), fc.Args["encounterID"].(*string), fc.Args["date"].(*scalarutils.Date), fc.Args["pagination"].(dto.Pagination))
 	})
 	if err != nil {
 		ec.Error(ctx, err)
diff --git a/pkg/clinical/usecases/clinical/episode_of_care.go b/pkg/clinical/usecases/clinical/episode_of_care.go
index c5441791..a34aef86 100644
--- a/pkg/clinical/usecases/clinical/episode_of_care.go
+++ b/pkg/clinical/usecases/clinical/episode_of_care.go
@@ -17,6 +17,7 @@ import (
 // constants and defaults
 const (
 	timeFormatStr = "2006-01-02T15:04:05+03:00"
+	dateFormatStr = "2006-01-02"
 )
 
 // CreateEpisodeOfCare creates an episode of care. An Episode of Care represents a period of time during which a patient is under the care of a particular provider/facility.
diff --git a/pkg/clinical/usecases/clinical/observation.go b/pkg/clinical/usecases/clinical/observation.go
index d308b03d..14a25332 100644
--- a/pkg/clinical/usecases/clinical/observation.go
+++ b/pkg/clinical/usecases/clinical/observation.go
@@ -43,8 +43,8 @@ func (c *UseCasesClinicalImpl) RecordOxygenSaturation(ctx context.Context, input
 }
 
 // GetPatientTemperatureEntries returns all the temperature entries for a patient, they are automatically sorted in chronological order
-func (c *UseCasesClinicalImpl) GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.TemperatureCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.TemperatureCIELTerminologyCode, pagination)
 }
 
 // RecordHeight records a patient's height and saves it to fhir
@@ -58,8 +58,8 @@ func (c *UseCasesClinicalImpl) RecordHeight(ctx context.Context, input dto.Obser
 }
 
 // GetPatientHeightEntries gets the height records of a patient
-func (c *UseCasesClinicalImpl) GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.HeightCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.HeightCIELTerminologyCode, pagination)
 }
 
 // RecordWeight records a patient's weight
@@ -83,23 +83,23 @@ func (c *UseCasesClinicalImpl) RecordViralLoad(ctx context.Context, input dto.Ob
 }
 
 // GetPatientWeightEntries gets the weight records of a patient
-func (c *UseCasesClinicalImpl) GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.WeightCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.WeightCIELTerminologyCode, pagination)
 }
 
 // GetPatientMuacEntries gets the patient's muac
-func (c *UseCasesClinicalImpl) GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.MuacCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.MuacCIELTerminologyCode, pagination)
 }
 
 // GetPatientOxygenSaturationEntries gets the patient's oxygen saturation
-func (c *UseCasesClinicalImpl) GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.OxygenSaturationCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.OxygenSaturationCIELTerminologyCode, pagination)
 }
 
 // GetPatientViralLoad gets the patient's viral load
-func (c *UseCasesClinicalImpl) GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.ViralLoadCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.ViralLoadCIELTerminologyCode, pagination)
 }
 
 // RecordRespiratoryRate records a patient's respiratory rate
@@ -113,8 +113,8 @@ func (c *UseCasesClinicalImpl) RecordRespiratoryRate(ctx context.Context, input
 }
 
 // GetPatientRespiratoryRateEntries gets a patient's respiratory rate entries
-func (c *UseCasesClinicalImpl) GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.RespiratoryRateCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.RespiratoryRateCIELTerminologyCode, pagination)
 }
 
 // RecordPulseRate records a patient's pulse rate
@@ -128,8 +128,8 @@ func (c *UseCasesClinicalImpl) RecordPulseRate(ctx context.Context, input dto.Ob
 }
 
 // GetPatientPulseRateEntries gets the pulse rate records of a patient
-func (c *UseCasesClinicalImpl) GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.PulseCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.PulseCIELTerminologyCode, pagination)
 }
 
 // RecordBloodPressure records a patient's blood pressure
@@ -143,8 +143,8 @@ func (c *UseCasesClinicalImpl) RecordBloodPressure(ctx context.Context, input dt
 }
 
 // GetPatientBloodPressureEntries retrieves all blood pressure entries for a patient
-func (c *UseCasesClinicalImpl) GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.BloodPressureCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.BloodPressureCIELTerminologyCode, pagination)
 }
 
 // RecordBMI records a patient's BMI
@@ -158,8 +158,8 @@ func (c *UseCasesClinicalImpl) RecordBMI(ctx context.Context, input dto.Observat
 }
 
 // GetPatientBMIEntries retrieves all BMI entries for a patient
-func (c *UseCasesClinicalImpl) GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.BMICIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.BMICIELTerminologyCode, pagination)
 }
 
 // RecordBloodSugar records a patient's blood sugar level (Serum glucose)
@@ -168,8 +168,8 @@ func (c *UseCasesClinicalImpl) RecordBloodSugar(ctx context.Context, input dto.O
 }
 
 // GetPatientBloodSugarEntries retrieves all blood sugar entries for a patient
-func (c *UseCasesClinicalImpl) GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.BloodSugarCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.BloodSugarCIELTerminologyCode, pagination)
 }
 
 // RecordLastMenstrualPeriod records last menstrual period
@@ -178,8 +178,8 @@ func (c *UseCasesClinicalImpl) RecordLastMenstrualPeriod(ctx context.Context, in
 }
 
 // GetPatientLastMenstrualPeriodEntries retrieves all blood sugar entries for a patient
-func (c *UseCasesClinicalImpl) GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.LastMenstrualPeriodCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.LastMenstrualPeriodCIELTerminologyCode, pagination)
 }
 
 // RecordDiastolicBloodPressure records diastolic blood pressure
@@ -188,8 +188,8 @@ func (c *UseCasesClinicalImpl) RecordDiastolicBloodPressure(ctx context.Context,
 }
 
 // GetPatientDiastolicBloodPressureEntries retrieves all diastolic blood pressure entries for a patient
-func (c *UseCasesClinicalImpl) GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
-	return c.GetPatientObservations(ctx, patientID, encounterID, common.DiastolicBloodPressureCIELTerminologyCode, pagination)
+func (c *UseCasesClinicalImpl) GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+	return c.GetPatientObservations(ctx, patientID, encounterID, date, common.DiastolicBloodPressureCIELTerminologyCode, pagination)
 }
 
 // RecordObservation is an extracted function that takes any observation input and saves it to FHIR.
@@ -277,7 +277,7 @@ func (c *UseCasesClinicalImpl) RecordObservation(ctx context.Context, input dto.
 
 // GetPatientObservations is a helper function used to fetch patient's observations based on the passed CIEL
 // terminology code. The observations will be sorted in a chronological order
-func (c *UseCasesClinicalImpl) GetPatientObservations(ctx context.Context, patientID string, encounterID *string, observationCode string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
+func (c *UseCasesClinicalImpl) GetPatientObservations(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, observationCode string, pagination *dto.Pagination) (*dto.ObservationConnection, error) {
 	_, err := uuid.Parse(patientID)
 	if err != nil {
 		return nil, fmt.Errorf("invalid patient id: %s", patientID)
@@ -306,6 +306,10 @@ func (c *UseCasesClinicalImpl) GetPatientObservations(ctx context.Context, patie
 		searchParams["encounter"] = encounterReference
 	}
 
+	if date != nil {
+		searchParams["date"] = date.AsTime().Format(dateFormatStr)
+	}
+
 	patientObs, err := c.infrastructure.FHIR.SearchPatientObservations(ctx, searchParams, *identifiers, *pagination)
 	if err != nil {
 		return nil, err
diff --git a/pkg/clinical/usecases/clinical/observation_test.go b/pkg/clinical/usecases/clinical/observation_test.go
index 02bb309b..c7c8fc26 100644
--- a/pkg/clinical/usecases/clinical/observation_test.go
+++ b/pkg/clinical/usecases/clinical/observation_test.go
@@ -1616,6 +1616,7 @@ func TestUseCasesClinicalImpl_GetPatientDiastolicBloodPressureEntries(t *testing
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -1629,6 +1630,11 @@ func TestUseCasesClinicalImpl_GetPatientDiastolicBloodPressureEntries(t *testing
 				ctx:         ctx,
 				patientID:   uuid.New().String(),
 				encounterID: &encounterId,
+				date: &scalarutils.Date{
+					Year:  1997,
+					Month: 12,
+					Day:   12,
+				},
 				pagination: &dto.Pagination{
 					First: &first,
 				},
@@ -1720,7 +1726,7 @@ func TestUseCasesClinicalImpl_GetPatientDiastolicBloodPressureEntries(t *testing
 				}
 			}
 
-			got, err := u.GetPatientDiastolicBloodPressureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := u.GetPatientDiastolicBloodPressureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientDiastolicBloodPressureEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -1899,6 +1905,7 @@ func TestUseCasesClinicalImpl_GetPatientObservations(t *testing.T) {
 		ctx             context.Context
 		patientID       string
 		encounterID     *string
+		date            *scalarutils.Date
 		observationCode string
 		pagination      *dto.Pagination
 	}
@@ -2327,7 +2334,7 @@ func TestUseCasesClinicalImpl_GetPatientObservations(t *testing.T) {
 				}
 			}
 
-			got, err := u.GetPatientObservations(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.observationCode, tt.args.pagination)
+			got, err := u.GetPatientObservations(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.observationCode, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientObservations() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2357,6 +2364,7 @@ func TestUseCasesClinicalImpl_GetPatientTemperatureEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -2461,7 +2469,7 @@ func TestUseCasesClinicalImpl_GetPatientTemperatureEntries(t *testing.T) {
 				}
 			}
 
-			got, err := u.GetPatientTemperatureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := u.GetPatientTemperatureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientTemperatureEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2484,6 +2492,7 @@ func TestUseCasesClinicalImpl_GetPatientBloodPressureEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -2588,7 +2597,7 @@ func TestUseCasesClinicalImpl_GetPatientBloodPressureEntries(t *testing.T) {
 				}
 			}
 
-			got, err := u.GetPatientBloodPressureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := u.GetPatientBloodPressureEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientBloodPressureEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2611,6 +2620,7 @@ func TestUseCasesClinicalImpl_GetHeight(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -2715,7 +2725,7 @@ func TestUseCasesClinicalImpl_GetHeight(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientHeightEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientHeightEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientHeightEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2731,6 +2741,7 @@ func TestUseCasesClinicalImpl_GetPatientPulseRateEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -2830,7 +2841,7 @@ func TestUseCasesClinicalImpl_GetPatientPulseRateEntries(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientPulseRateEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientPulseRateEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientPulseRateEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2846,6 +2857,7 @@ func TestUseCasesClinicalImpl_GetPatientRespiratoryRateEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -2945,7 +2957,7 @@ func TestUseCasesClinicalImpl_GetPatientRespiratoryRateEntries(t *testing.T) {
 				}
 			}
 
-			got, err := u.GetPatientRespiratoryRateEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := u.GetPatientRespiratoryRateEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientRespiratoryRateEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -2967,6 +2979,7 @@ func TestUseCasesClinicalImpl_GetPatientBMIEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3066,7 +3079,7 @@ func TestUseCasesClinicalImpl_GetPatientBMIEntries(t *testing.T) {
 				}
 			}
 
-			got, err := u.GetPatientBMIEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			got, err := u.GetPatientBMIEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientBMIEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -3089,6 +3102,7 @@ func TestUseCasesClinicalImpl_GetPatientWeightEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3188,7 +3202,7 @@ func TestUseCasesClinicalImpl_GetPatientWeightEntries(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientWeightEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientWeightEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientWeightEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -3204,6 +3218,7 @@ func TestUseCasesClinicalImpl_GetPatientMuacEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3303,7 +3318,7 @@ func TestUseCasesClinicalImpl_GetPatientMuacEntries(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientMuacEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientMuacEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientMuacEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -3319,6 +3334,7 @@ func TestUseCasesClinicalImpl_GetPatientOxygenSaturationEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3418,7 +3434,7 @@ func TestUseCasesClinicalImpl_GetPatientOxygenSaturationEntries(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientOxygenSaturationEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientOxygenSaturationEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientOxygenSaturationEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -3434,6 +3450,7 @@ func TestUseCasesClinicalImpl_GetPatientViralLoad(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3545,7 +3562,7 @@ func TestUseCasesClinicalImpl_GetPatientViralLoad(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientViralLoad(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientViralLoad(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientViralLoad() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -3867,6 +3884,7 @@ func TestUseCasesClinicalImpl_GetPatientBloodSugarEntries(t *testing.T) {
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -3967,7 +3985,7 @@ func TestUseCasesClinicalImpl_GetPatientBloodSugarEntries(t *testing.T) {
 				}
 			}
 
-			_, err := c.GetPatientBloodSugarEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientBloodSugarEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientBloodSugarEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -4139,6 +4157,7 @@ func TestUseCasesClinicalImpl_GetPatientLastMenstrualPeriodEntries(t *testing.T)
 		ctx         context.Context
 		patientID   string
 		encounterID *string
+		date        *scalarutils.Date
 		pagination  *dto.Pagination
 	}
 	tests := []struct {
@@ -4239,7 +4258,7 @@ func TestUseCasesClinicalImpl_GetPatientLastMenstrualPeriodEntries(t *testing.T)
 				}
 			}
 
-			_, err := c.GetPatientLastMenstrualPeriodEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.pagination)
+			_, err := c.GetPatientLastMenstrualPeriodEntries(tt.args.ctx, tt.args.patientID, tt.args.encounterID, tt.args.date, tt.args.pagination)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("UseCasesClinicalImpl.GetPatientLastMenstrualPeriodEntries() error = %v, wantErr %v", err, tt.wantErr)
 				return
diff --git a/pkg/clinical/usecases/usecases.go b/pkg/clinical/usecases/usecases.go
index 3fee94db..3a169bf4 100644
--- a/pkg/clinical/usecases/usecases.go
+++ b/pkg/clinical/usecases/usecases.go
@@ -7,6 +7,7 @@ import (
 	"github.com/savannahghi/clinical/pkg/clinical/application/dto"
 	"github.com/savannahghi/clinical/pkg/clinical/infrastructure"
 	clinicalUsecase "github.com/savannahghi/clinical/pkg/clinical/usecases/clinical"
+	"github.com/savannahghi/scalarutils"
 )
 
 // Clinical represents all the patient business logic
@@ -57,20 +58,20 @@ type Clinical interface {
 	RecordDiastolicBloodPressure(ctx context.Context, input dto.ObservationInput) (*dto.Observation, error)
 	RecordObservation(ctx context.Context, input dto.ObservationInput, vitalSignConceptID string) (*dto.Observation, error)
 
-	GetPatientObservations(ctx context.Context, patientID string, encounterID *string, observationCode string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
-	GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientObservations(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, observationCode string, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientTemperatureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientHeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientRespiratoryRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientPulseRateEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBMIEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientWeightEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientMuacEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientOxygenSaturationEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientViralLoad(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientBloodSugarEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientLastMenstrualPeriodEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
+	GetPatientDiastolicBloodPressureEntries(ctx context.Context, patientID string, encounterID *string, date *scalarutils.Date, pagination *dto.Pagination) (*dto.ObservationConnection, error)
 
 	CreateAllergyIntolerance(ctx context.Context, input dto.AllergyInput) (*dto.Allergy, error)
 	SearchAllergy(ctx context.Context, name string, pagination dto.Pagination) (*dto.TerminologyConnection, error)