Cover edge case where multiple dispositions have the exact same datet…

…ime, favoring the one with the later obsId. Add same constraint to existing awaiting admission query.

api-reporting/src/test/java/org/openmrs/module/emrapi/adt/reporting/evaluator/AwaitingAdmissionVisitQueryEvaluatorTest.java

@@ -222,12 +222,6 @@ public void shouldFindVisitEvenIfPatientHasMoreRecentVisitNoteWithoutAdmissionDi
  .encounterType(emrApiProperties.getVisitNoteEncounterType())
  .visit(visit)
  .save();
- testDataManager.obs()
- .person(patient)
- .encounter(secondVisitNoteEncounter)
- .concept(dispositionDescriptor.getDispositionConcept())
- .value(emrConceptService.getConcept("org.openmrs.module.emrapi:Death"))
- .save();
 
  VisitQueryResult result = visitQueryService.evaluate(query, null);
  assertThat(result.getMemberIds().size(), is(1));

api/src/main/resources/hql/inpatient_request_dispositions.hql

@@ -26,7 +26,10 @@ where
  where laterDispoObs.encounter.visit = visit
  and laterDispoObs.voided = false
  and laterDispoObs.concept = :dispositionConcept
- and laterDispoObs.obsDatetime > dispo.obsDatetime
+ and (
+ laterDispoObs.obsDatetime > dispo.obsDatetime or
+ (laterDispoObs.obsDatetime = dispo.obsDatetime and laterDispoObs.obsId > dispo.obsId)
+ )
  ) = 0
  and (
  select count(*)

api/src/main/resources/hql/visits_awaiting_admission.hql

@@ -16,6 +16,17 @@ where
  and (:visitIds is null or visit.visitId in :visitIds)
  and person.dead = false
  and visit.stopDatetime is null
+ and (
+ select count(*)
+ from Obs as laterDispoObs
+ where laterDispoObs.encounter.visit = visit
+ and laterDispoObs.voided = false
+ and laterDispoObs.concept = :dispositionConcept
+ and (
+ laterDispoObs.obsDatetime > dispo.obsDatetime or
+ (laterDispoObs.obsDatetime = dispo.obsDatetime and laterDispoObs.obsId > dispo.obsId)
+ )
+ ) = 0
  and (
  select count(*)
  from Encounter as admission