From 67614b4441527fb7e98c691505734d2015f00e51 Mon Sep 17 00:00:00 2001 From: Alpho Junior Date: Fri, 16 Aug 2024 15:34:14 +0200 Subject: [PATCH 1/2] FIX PRIMARY CONTACT - PERSON ATTRIBUTE TYPE ID VALUE --- .../api/db/hibernate/HibernateAppointmentSyncServiceDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/appointmentsync/api/db/hibernate/HibernateAppointmentSyncServiceDAO.java b/api/src/main/java/org/openmrs/module/appointmentsync/api/db/hibernate/HibernateAppointmentSyncServiceDAO.java index c8a868e..8d8a381 100755 --- a/api/src/main/java/org/openmrs/module/appointmentsync/api/db/hibernate/HibernateAppointmentSyncServiceDAO.java +++ b/api/src/main/java/org/openmrs/module/appointmentsync/api/db/hibernate/HibernateAppointmentSyncServiceDAO.java @@ -72,7 +72,7 @@ public List getAllAppointments() { "left join location l1 on l.parent_location = l1.location_id " + "left join person c on a.patient_id = c.person_id " + "left join person_attribute pa1 on a.patient_id = pa1.person_id and pa1.person_attribute_type_id = 15 " + - "left join person_attribute pa2 on a.patient_id = pa2.person_id and pa2.person_attribute_type_id = 27 " + + "left join person_attribute pa2 on a.patient_id = pa2.person_id and pa2.person_attribute_type_id = 26 " + "where pit.patient_identifier_type_id = 3 " + "and DATEDIFF(start_date_time, now()) = 3 group by a.patient_id;"); @@ -128,7 +128,7 @@ public List getMissedAppointments() { "left join location l1 on l.parent_location = l1.location_id " + "left join person c on a.patient_id = c.person_id " + "left join person_attribute pa1 on a.patient_id = pa1.person_id and pa1.person_attribute_type_id = 15 " + - "left join person_attribute pa2 on a.patient_id = pa2.person_id and pa2.person_attribute_type_id = 27 " + + "left join person_attribute pa2 on a.patient_id = pa2.person_id and pa2.person_attribute_type_id = 26 " + "where pit.patient_identifier_type_id = 3 " + "and DATEDIFF(start_date_time, now()) = 6 " + "and a.status = 'Missed' group by a.patient_id;"); From 3d7b6fb65c45941001deffc29041e9c0d98178d2 Mon Sep 17 00:00:00 2001 From: Alpho Junior Date: Fri, 16 Aug 2024 16:04:34 +0200 Subject: [PATCH 2/2] PUBLISH ONLY APPOINTMENTS WITH PHONE NUMBER --- .../openmrs/module/appointmentsync/AppointmentSyncTask.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/appointmentsync/AppointmentSyncTask.java b/api/src/main/java/org/openmrs/module/appointmentsync/AppointmentSyncTask.java index 785312a..9439214 100644 --- a/api/src/main/java/org/openmrs/module/appointmentsync/AppointmentSyncTask.java +++ b/api/src/main/java/org/openmrs/module/appointmentsync/AppointmentSyncTask.java @@ -25,8 +25,10 @@ public void execute() { List dueAppointments = service.getAllAppointments(); // Only those due in 3 days for (PatientAppointment pa : dueAppointments) { - if (!published(pa.getPatientAppointmentId(), url,username,password)) { - Util.postAppointmentApi(url, username,password,Util.convertObjectToJson(pa), "POST"); + if(!"".equals(pa.getPhone())) { //Publish only appointments that have phone number + if (!published(pa.getPatientAppointmentId(), url, username, password)) { + Util.postAppointmentApi(url, username, password, Util.convertObjectToJson(pa), "POST"); + } } }