Merge pull request Bahmni#52 from Bahmni/BAH-1136

Bindu | BAH-1136 | Change query to get provider from patient appointment provider table
vishalreddysarasani · Jan 28, 2021 · 1bdd81c · 1bdd81c
2 parents c5c09c2 + 0db5762
commit 1bdd81c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/src/main/resources/patientPastAppointments.sql b/api/src/main/resources/patientPastAppointments.sql
@@ -12,7 +12,8 @@ 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 provider prov ON prov.provider_id = pa.provider_id AND prov.retired 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

diff --git a/api/src/main/resources/patientUpcomingAppointments.sql b/api/src/main/resources/patientUpcomingAppointments.sql
@@ -12,7 +12,8 @@ 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 provider prov ON prov.provider_id = pa.provider_id AND prov.retired 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