Skip to content

Fix: primary contact - change primary attribute type id value and allow to post to cloud only appointments with phone number #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Raseabi wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix: primary contact - change primary attribute type id value and allow to post to cloud only appointments with phone number #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67614b4
FIX PRIMARY CONTACT - PERSON ATTRIBUTE TYPE ID VALUE
Raseabi Aug 16, 2024
2f96612
Merge pull request #1 from Raseabi/FIX_PRIMARY_CONTACT
Raseabi Aug 16, 2024
3d7b6fb
PUBLISH ONLY APPOINTMENTS WITH PHONE NUMBER
Raseabi Aug 16, 2024
6b933f6
Merge pull request #2 from Raseabi/FIX_PRIMARY_CONTACT
Raseabi Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions api/src/main/java/org/openmrs/module/appointmentsync/AppointmentSyncTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ public void execute() {
List<PatientAppointment> 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");
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...g/openmrs/module/appointmentsync/api/db/hibernate/HibernateAppointmentSyncServiceDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public List<PatientAppointment> 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;");

Expand Down Expand Up @@ -128,7 +128,7 @@ public List<PatientAppointment> 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;");
Expand Down