search refactoring

HL7-DaVinci · Sep 12, 2019 · 2eafd0a · 2eafd0a
1 parent 511e137
commit 2eafd0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/controllers/formularies_controller.rb b/app/controllers/formularies_controller.rb
@@ -21,11 +21,11 @@ def index
 			@@bundle = update_page(params[:page], @@bundle)
 		else
 			profile = "http://hl7.org/fhir/us/Davinci-drug-formulary/StructureDefinition/usdf-FormularyDrug"
-			parameters = {_profile: profile}
-			parameters[:DrugTier] = params[:drug_tier] if params[:drug_tier].present?
-			parameters[:DrugPlan] = params[:coverage] if params[:coverage].present?
-			parameters[:code] = params[:code] if params[:code].present?
-			reply = @client.search(FHIR::MedicationKnowledge, search: { parameters: parameters } )
+			search = { parameters: { _profile: profile } }
+			search[:parameters][:DrugTier] = params[:drug_tier] if params[:drug_tier].present?
+			search[:parameters][:DrugPlan] = params[:coverage] if params[:coverage].present?
+			search[:parameters][:code] = params[:code] if params[:code].present?
+			reply = @client.search(FHIR::MedicationKnowledge, search: search )
 			@@bundle = reply.resource
 		end
 

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
@@ -56,8 +56,8 @@ def coverage_plans
 	def formulary_count
 		begin
 			profile = "http://hl7.org/fhir/us/Davinci-drug-formulary/StructureDefinition/usdf-FormularyDrug"
-			parameters = { parameters: { _profile: profile, _summary: "count" } }
-			count = @client.search(FHIR::MedicationKnowledge, search: parameters ).resource.total
+			search = { parameters: { _profile: profile, _summary: "count" } }
+			count = @client.search(FHIR::MedicationKnowledge, search: search ).resource.total
 		rescue => exception
 			count = 0
 		end

diff --git a/app/models/client_connections.rb b/app/models/client_connections.rb
@@ -8,8 +8,8 @@ def self.set(id, url)
             client.use_r4
             FHIR::Model.client = client
             profile = "http://hl7.org/fhir/us/Davinci-drug-formulary/StructureDefinition/usdf-FormularyDrug"
-            parameters = { parameters: { _profile: profile, _summary: "count" } }
-            count = client.search(FHIR::MedicationKnowledge, search: parameters ).resource.total
+            search = { parameters: { _profile: profile, _summary: "count" } }
+            count = client.search(FHIR::MedicationKnowledge, search: search ).resource.total
             raise "No Formularies in server" unless count > 0
         rescue
             return nil