Merge pull request #644 from PIH/UHM-9199

UHM-9199: Inpatient List should limit to patients at current facility

Author: mogoodrich

omod/src/main/java/org/openmrs/module/pihcore/page/controller/adt/InpatientListPageController.java

@@ -9,6 +9,7 @@
 import org.openmrs.PatientIdentifier;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.api.PatientService;
+import org.openmrs.module.appui.UiSessionContext;
 import org.openmrs.module.coreapps.CoreAppsProperties;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.emrapi.adt.AdtService;
@@ -37,7 +38,13 @@ public void get(PageModel model,
                     @SpringBean("coreAppsProperties") CoreAppsProperties coreAppsProperties,
                     @SpringBean("patientService") PatientService patientService,
                     @SpringBean("adtService") AdtService adtService,
-                    @SpringBean("emrApiProperties") EmrApiProperties emrApiProperties) throws EvaluationException {
+                    @SpringBean("emrApiProperties") EmrApiProperties emrApiProperties,
+                    UiSessionContext uiSessionContext) throws EvaluationException {
+
+        // use the closest visit location associated with the session location if the location param is not specified
+        if (visitLocation == null) {
+            visitLocation= adtService.getLocationThatSupportsVisits(uiSessionContext.getSessionLocation());
+        }
 
         InpatientAdmissionSearchCriteria criteria = new InpatientAdmissionSearchCriteria();
         criteria.setVisitLocation(visitLocation);

omod/src/main/webapp/pages/adt/inpatientList.gsp

@@ -52,11 +52,12 @@
 
 <h3 class="inpatient-count">${ ui.message("emr.inpatients.patientCount") }: <span id="listSize">${inpatientsNumber}</span></h3>
 <div class="inpatient-filter">
-    ${ ui.includeFragment("emr", "field/location", [
+    ${ ui.includeFragment("pihapps", "field/location", [
             "id": "inpatients-filterByLocation",
             "formFieldName": "filterByLocationId",
             "label": "emr.inpatients.filterByCurrentWard",
-            "withTag": "Admission Location;Transfer Location"
+            "withTag": "Admission Location;Transfer Location",
+            "restrictToVisitLocationAndDescendants": true
     ] ) }
 </div>