diff --git a/app/src/main/java/app/intelehealth/client/activities/activePatientsActivity/ActivePatientActivity.java b/app/src/main/java/app/intelehealth/client/activities/activePatientsActivity/ActivePatientActivity.java index 456f78e350..e8d3805e6b 100644 --- a/app/src/main/java/app/intelehealth/client/activities/activePatientsActivity/ActivePatientActivity.java +++ b/app/src/main/java/app/intelehealth/client/activities/activePatientsActivity/ActivePatientActivity.java @@ -108,10 +108,10 @@ private void getVisits() { EncounterDAO encounterDAO = new EncounterDAO(); List encounterDTOList = encounterDAO.getAllEncounters(); - //Get Visit Note Encounters only, visit note encounter id - d7151f82-c1f3-4152-a605-2f9ea7414a79 + //Get Visit Complete Encounters only, visit complete encounter id - bd1fbfaa-f5fb-4ebd-b75c-564506fc309e if (encounterDTOList.size() > 0) { for (int i = 0; i < encounterDTOList.size(); i++) { - if (encounterDTOList.get(i).getEncounterTypeUuid().equalsIgnoreCase("d7151f82-c1f3-4152-a605-2f9ea7414a79")) { + if (encounterDTOList.get(i).getEncounterTypeUuid().equalsIgnoreCase("bd1fbfaa-f5fb-4ebd-b75c-564506fc309e")) { encounterVisitUUID.add(encounterDTOList.get(i).getVisituuid()); } } diff --git a/app/src/main/java/app/intelehealth/client/activities/todayPatientActivity/TodayPatientActivity.java b/app/src/main/java/app/intelehealth/client/activities/todayPatientActivity/TodayPatientActivity.java index bb8edcf3df..253eb4e890 100644 --- a/app/src/main/java/app/intelehealth/client/activities/todayPatientActivity/TodayPatientActivity.java +++ b/app/src/main/java/app/intelehealth/client/activities/todayPatientActivity/TodayPatientActivity.java @@ -100,10 +100,10 @@ private void getVisits() { EncounterDAO encounterDAO = new EncounterDAO(); List encounterDTOList = encounterDAO.getAllEncounters(); - //Get Visit Note Encounters only, visit note encounter id - d7151f82-c1f3-4152-a605-2f9ea7414a79 + //Get Visit Complete Encounters only, visit complete encounter id - bd1fbfaa-f5fb-4ebd-b75c-564506fc309e if (encounterDTOList.size() > 0) { for (int i = 0; i < encounterDTOList.size(); i++) { - if (encounterDTOList.get(i).getEncounterTypeUuid().equalsIgnoreCase("d7151f82-c1f3-4152-a605-2f9ea7414a79")) { + if (encounterDTOList.get(i).getEncounterTypeUuid().equalsIgnoreCase("bd1fbfaa-f5fb-4ebd-b75c-564506fc309e")) { encounterVisitUUID.add(encounterDTOList.get(i).getVisituuid()); } } diff --git a/app/src/main/java/app/intelehealth/client/database/dao/SyncDAO.java b/app/src/main/java/app/intelehealth/client/database/dao/SyncDAO.java index 06a0ea486e..1f2d0a57d6 100644 --- a/app/src/main/java/app/intelehealth/client/database/dao/SyncDAO.java +++ b/app/src/main/java/app/intelehealth/client/database/dao/SyncDAO.java @@ -133,7 +133,7 @@ public void onResponse(Call call, Response response) { ArrayList encounterVisitUUID = new ArrayList(); for (int i = 0; i < response.body().getData().getEncounterDTO().size(); i++) { if (response.body().getData().getEncounterDTO().get(i) - .getEncounterTypeUuid().equalsIgnoreCase("d7151f82-c1f3-4152-a605-2f9ea7414a79")) { + .getEncounterTypeUuid().equalsIgnoreCase("bd1fbfaa-f5fb-4ebd-b75c-564506fc309e")) { encounterVisitUUID.add(response.body().getData().getEncounterDTO().get(i).getVisituuid()); } } @@ -243,7 +243,7 @@ public void onResponse(Call call, Response response) { ArrayList encounterVisitUUID = new ArrayList(); for (int i = 0; i < response.body().getData().getEncounterDTO().size(); i++) { if (response.body().getData().getEncounterDTO().get(i) - .getEncounterTypeUuid().equalsIgnoreCase("d7151f82-c1f3-4152-a605-2f9ea7414a79")) { + .getEncounterTypeUuid().equalsIgnoreCase("bd1fbfaa-f5fb-4ebd-b75c-564506fc309e")) { encounterVisitUUID.add(response.body().getData().getEncounterDTO().get(i).getVisituuid()); } } diff --git a/app/src/main/java/app/intelehealth/client/utilities/UuidDictionary.java b/app/src/main/java/app/intelehealth/client/utilities/UuidDictionary.java index 70348501e1..9cba85687c 100644 --- a/app/src/main/java/app/intelehealth/client/utilities/UuidDictionary.java +++ b/app/src/main/java/app/intelehealth/client/utilities/UuidDictionary.java @@ -41,6 +41,7 @@ public class UuidDictionary { public static final String ENCOUNTER_ADULTINITIAL = "8d5b27bc-c2cc-11de-8d13-0010c6dffd0f"; public static final String ENCOUNTER_VITALS = "67a71486-1a54-468f-ac3e-7091a9a79584"; public static final String ENCOUNTER_VISIT_NOTE = "d7151f82-c1f3-4152-a605-2f9ea7414a79"; + public static final String ENCOUNTER_VISIT_COMPLETE = "bd1fbfaa-f5fb-4ebd-b75c-564506fc309e"; public static final String ENCOUNTER_PATIENT_EXIT_SURVEY = "629a9d0b-48eb-405e-953d-a5964c88dc30"; public static final String EMERGENCY_OBS = "ca5f5dc3-4f0b-4097-9cae-5cf2eb44a09c";