Merge pull request #371 from FEMR/development

Development
FEMR · Feb 1, 2015 · 0ca6a4e · 0ca6a4e
2 parents 704e9c4 + 1368d5a
commit 0ca6a4e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/femr/ui/controllers/PharmaciesController.java b/app/femr/ui/controllers/PharmaciesController.java
@@ -1,5 +1,6 @@
 package femr.ui.controllers;
 
+import com.google.gson.Gson;
 import com.google.inject.Inject;
 import femr.business.services.core.IEncounterService;
 import femr.business.services.core.IMedicationService;
@@ -273,11 +274,11 @@ public Result editPost(int id) {
      */
     public Result typeaheadJSONGet() {
 
-        ServiceResponse<String> medicationServiceResponse = medicationService.getMedicationNames();
+        ServiceResponse<List<String>> medicationServiceResponse = medicationService.findAllMedications();
         if (medicationServiceResponse.hasErrors()) {
             return ok("");
         }
 
-        return ok(medicationServiceResponse.getResponseObject());
+        return ok(new Gson().toJson(medicationServiceResponse.getResponseObject()));
     }
 }