diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
index 124f94de2..7d368d2d0 100644
--- a/api/src/main/resources/liquibase.xml
+++ b/api/src/main/resources/liquibase.xml
@@ -347,7 +347,15 @@
-
+
+
+ select count(*) from global_property where property='bahmni.sqlGet.pastAppointments'
+
+ Updating query to fetch past appointments for patient
+
+
+
+
select count(*) from global_property where property='bahmni.sqlGet.upComingAppointments'
@@ -355,7 +363,7 @@
-
+
select count(*) from global_property where property='bahmni.sqlGet.upComingAppointments'
diff --git a/api/src/main/resources/patientPastAppointments.sql b/api/src/main/resources/patientPastAppointments.sql
index 341ade309..17019fba8 100644
--- a/api/src/main/resources/patientPastAppointments.sql
+++ b/api/src/main/resources/patientPastAppointments.sql
@@ -12,7 +12,6 @@ FROM
JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE
JOIN appointment_service app_service
ON app_service.appointment_service_id = pa.appointment_service_id AND app_service.voided IS FALSE
- LEFT JOIN patient_appointment_provider pap on pa.patient_appointment_id = pap.patient_appointment_id AND (pap.voided=0 OR pap.voided IS NULL)
LEFT JOIN provider prov ON prov.provider_id = pap.provider_id AND prov.retired IS FALSE
LEFT JOIN person_name pn ON pn.person_id = prov.person_id AND pn.voided IS FALSE
LEFT JOIN appointment_service_type app_service_type
diff --git a/api/src/main/resources/patientPastAppoitments_v2.sql b/api/src/main/resources/patientPastAppoitments_v2.sql
new file mode 100644
index 000000000..a3358a2af
--- /dev/null
+++ b/api/src/main/resources/patientPastAppoitments_v2.sql
@@ -0,0 +1,22 @@
+UPDATE global_property ('bahmni.sqlGet.pastAppointments',
+SET property_value= "SELECT
+ app_service.name AS `DASHBOARD_APPOINTMENTS_SERVICE_KEY`,
+ app_service_type.name AS `DASHBOARD_APPOINTMENTS_SERVICE_TYPE_KEY`,
+ DATE_FORMAT(start_date_time, \"%d/%m/%Y\") AS `DASHBOARD_APPOINTMENTS_DATE_KEY`,
+ CONCAT(DATE_FORMAT(start_date_time, \"%l:%i %p\"), \" - \", DATE_FORMAT(end_date_time, \"%l:%i %p\")) AS `DASHBOARD_APPOINTMENTS_SLOT_KEY`,
+ CONCAT(pn.given_name, ' ', pn.family_name) AS `DASHBOARD_APPOINTMENTS_PROVIDER_KEY`,
+ pa.status AS `DASHBOARD_APPOINTMENTS_STATUS_KEY`
+FROM
+ patient_appointment pa
+ JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE
+ JOIN appointment_service app_service
+ ON app_service.appointment_service_id = pa.appointment_service_id AND app_service.voided IS FALSE
+ LEFT JOIN patient_appointment_provider pap on pa.patient_appointment_id = pap.patient_appointment_id AND (pap.voided=0 OR pap.voided IS NULL)
+ LEFT JOIN provider prov ON prov.provider_id = pap.provider_id AND prov.retired IS FALSE
+ LEFT JOIN person_name pn ON pn.person_id = prov.person_id AND pn.voided IS FALSE
+ LEFT JOIN appointment_service_type app_service_type
+ ON app_service_type.appointment_service_type_id = pa.appointment_service_type_id
+ WHERE p.uuid = ${patientUuid} AND start_date_time < CURDATE() AND (app_service_type.voided IS FALSE OR app_service_type.voided IS NULL)
+ ORDER BY start_date_time DESC
+ LIMIT 5;"
+ WHERE property='bahmni.sqlGet.pastAppointments'
\ No newline at end of file
diff --git a/api/src/main/resources/patientUpcomingAppointments.sql b/api/src/main/resources/patientUpcomingAppointments.sql
index b81c56f56..c237a5876 100644
--- a/api/src/main/resources/patientUpcomingAppointments.sql
+++ b/api/src/main/resources/patientUpcomingAppointments.sql
@@ -12,7 +12,6 @@ FROM
JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE
JOIN appointment_service app_service
ON app_service.appointment_service_id = pa.appointment_service_id AND app_service.voided IS FALSE
- LEFT JOIN patient_appointment_provider pap on pa.patient_appointment_id = pap.patient_appointment_id AND (pap.voided=0 OR pap.voided IS NULL)
LEFT JOIN provider prov ON prov.provider_id = pap.provider_id AND prov.retired IS FALSE
LEFT JOIN person_name pn ON pn.person_id = prov.person_id AND pn.voided IS FALSE
LEFT JOIN appointment_service_type app_service_type
diff --git a/api/src/main/resources/patientUpcomingAppointments_v2.sql b/api/src/main/resources/patientUpcomingAppointments_v2.sql
index 579c7832e..d4fae53d9 100644
--- a/api/src/main/resources/patientUpcomingAppointments_v2.sql
+++ b/api/src/main/resources/patientUpcomingAppointments_v2.sql
@@ -6,12 +6,15 @@ SET property_value= "SELECT
DATE_FORMAT(start_date_time, \"%d/%m/%Y\") AS `DASHBOARD_APPOINTMENTS_DATE_KEY`,
CONCAT(DATE_FORMAT(start_date_time, \"%l:%i %p\"), \" - \", DATE_FORMAT(end_date_time, \"%l:%i %p\")) AS `DASHBOARD_APPOINTMENTS_SLOT_KEY`,
CONCAT(pn.given_name, ' ', pn.family_name) AS `DASHBOARD_APPOINTMENTS_PROVIDER_KEY`,
- pa.status AS `DASHBOARD_APPOINTMENTS_STATUS_KEY`
+ pa.status AS `DASHBOARD_APPOINTMENTS_STATUS_KEY`,
+ pa.teleconsultation AS `DASHBOARD_APPOINTMENTS_TELECONSULTATION`
+
FROM
patient_appointment pa
JOIN person p ON p.person_id = pa.patient_id AND pa.voided IS FALSE
JOIN appointment_service app_service
ON app_service.appointment_service_id = pa.appointment_service_id AND app_service.voided IS FALSE
+ LEFT JOIN patient_appointment_provider pap on pa.patient_appointment_id = pap.patient_appointment_id AND (pap.voided=0 OR pap.voided IS NULL)
LEFT JOIN provider prov ON prov.provider_id = pa.provider_id AND prov.retired IS FALSE
LEFT JOIN person_name pn ON pn.person_id = prov.person_id AND pn.voided IS FALSE
LEFT JOIN appointment_service_type app_service_type