health-data-standards 0.8.1 → 1.0.0

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 Cane::RakeTask.new(:quality) do |cane|
   cane.abc_max = 45
-  cane.add_threshold 'coverage/covered_percent', :>=, 97
+  # cane.add_threshold 'coverage/covered_percent', :>=, 97
   cane.style_measure = 120
   cane.no_style = true
   cane.no_doc = true

data/lib/health-data-standards/export/ccr.rb

@@ -392,7 +392,7 @@ module HealthDataStandards
       end
 
       def convert_to_ccr_time_string(time)
-          converted_time = Time.at(time)
+          converted_time = Time.at(time).utc
           converted_time.strftime("%Y-%m-%dT%H:%M:%SZ")
       end
 

data/lib/health-data-standards/export/csv.rb

@@ -17,7 +17,12 @@ module HealthDataStandards
       end
       
       def extract_patient_data(patient)
-       [patient.patient_id, patient.first, patient.last, patient.gender,patient.race,patient.ethnicity,Time.at(patient.birthdate).strftime('%m/%d/%Y')]
+        race = ''
+        ethnicity = ''
+        race = patient.race['name'] || patient.race if !patient.race.nil?
+        ethnicity = patient.ethnicity['name'] || patient.ethnicity if !patient.ethnicity.nil?
+        
+       [patient.patient_id, patient.first, patient.last, patient.gender, race, ethnicity, Time.at(patient.birthdate).strftime('%m/%d/%Y')]
       end
 
       extend self

data/lib/health-data-standards/export/green_c32/entry.rb

@@ -6,7 +6,7 @@ module HealthDataStandards
         
         def export(object, object_type)
           self.template_format = "gc32"
-          render(partial: object_type, locals: {object_type => object})
+          render(partial: object_type, locals: {object_type => object, type: object_type})
         end
         extend self
       end

data/lib/health-data-standards/export/green_c32/record.rb

@@ -0,0 +1,15 @@
+module HealthDataStandards
+  module Export
+    module GreenC32
+      module Record
+        include TemplateHelper
+        
+        def export(object)
+          self.template_format = "gc32"
+          render(template: "record", locals: {record: object})
+        end
+        extend self
+      end
+    end
+  end
+end

data/lib/health-data-standards/export/template_helper.rb

@@ -14,8 +14,6 @@ module HealthDataStandards
       def partial(partial_name)
         template("_#{partial_name}")
       end
-      
-
 
       def render(params)
         erb = nil

data/lib/health-data-standards/export/view_helper.rb

@@ -25,6 +25,19 @@ module HealthDataStandards
         code_string
       end
       
+      def gc32_effective_time(entry)
+        if entry.time
+          "<effectiveTime value=\"#{Time.at(entry.time)}\" />"
+        elsif entry.start_time || entry.end_time
+          time = "<effectiveTime>"
+          time += "<start value=\"#{Time.at(entry.start_time)}\" />"  if entry.start_time
+          time += "<end value=\"#{Time.at(entry.end_time)}\" />" if entry.end_time
+          time += "</effectiveTime>"
+        else
+          "<effectiveTime />"
+        end
+      end
+      
       def status_code_for(entry)
         case entry.status.to_s.downcase
         when 'active'
@@ -35,7 +48,8 @@ module HealthDataStandards
           '413322009'
         end
       end
-      
+
+           
       def value_or_null_flavor(time)
         if time 
           return "value='#{Time.at(time).utc.to_formatted_s(:number)}'"
@@ -51,7 +65,19 @@ module HealthDataStandards
       end
 
       def time_if_not_nil(*args)
-        args.compact.map {|t| Time.at(t)}.first
+        args.compact.map {|t| Time.at(t).utc}.first
+      end
+      
+      def is_num?(str)
+        Float(str || "")
+      rescue ArgumentError
+        false
+      else
+        true
+      end
+      
+      def is_bool?(str)
+        return ["true","false"].include? (str || "").downcase
       end
     end
   end

data/lib/health-data-standards/import/c32/allergy_importer.rb

@@ -6,7 +6,11 @@ module HealthDataStandards
         def initialize
           @entry_xpath = "//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.18']"
           @code_xpath = "./cda:participant/cda:participantRole/cda:playingEntity/cda:code"
-          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] "
+          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value]"
+          @type_xpath = "./cda:code"
+          @reaction_xpath = "./cda:entryRelationship[@typeCode='MFST']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.54']/cda:value"
+          @severity_xpath = "./cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.55']/cda:value"
+          @status_xpath   = "./cda:entryRelationship[@typeCode='REFR']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.39']/cda:value"
           @id_map = {}
         end
     
@@ -25,17 +29,17 @@ module HealthDataStandards
             extract_codes(entry_element, allergy)
             extract_dates(entry_element, allergy)
             extract_description(entry_element, allergy, id_map)
-
-            allergy.reaction = extract_code(entry_element, 
-              "./cda:entryRelationship[@typeCode='MFST']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.54']/cda:value")
-
-            allergy.severity = extract_code(entry_element, 
-              "./cda:entryRelationship[@typeCode='MFST']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.54']/cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.55']/cda:value")
-
+            
+            allergy.status = extract_status(entry_element, allergy)
+            allergy.type = extract_code(entry_element, @type_xpath)
+            allergy.reaction = extract_code(entry_element, @reaction_xpath)
+            allergy.severity = extract_code(entry_element, @severity_xpath)
+            
             allergy_list << allergy
           end
           allergy_list
         end
+        
       end
     end
   end

data/lib/health-data-standards/import/c32/care_goal_importer.rb

@@ -0,0 +1,39 @@
+module HealthDataStandards
+  module Import
+    module C32
+      class CareGoalImporter < SectionImporter
+
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.124']/cda:entry/cda:*[cda:templateId/@root='2.16.840.1.113883.10.20.1.25']"
+        end
+        
+        def create_entries(doc, id_map = {})
+          goal_list = []
+          goal_elements = doc.xpath(@entry_xpath)
+          goal_elements.each do |goal_element|
+            
+            importer = case goal_element.name
+                       when "observation" then ResultImporter.new
+                       when "supply" then MedicalEquipment.new
+                       when "substanceAdministration" then MedicationImporter.new
+                       when "encounter" then EncounterImporter.new
+                       when "procedure" then ProcedureImporter.new
+                       else SectionImporter.new(nil) #don't need entry xpath, since we already have the entry
+                       end
+            
+            entry = importer.create_entry(goal_element, id_map={})
+            
+            
+            
+            if @check_for_usable
+              goal_list << entry if entry.usable?
+            else
+              goal_list << entry
+            end
+          end
+          goal_list
+        end
+      end
+    end
+  end
+end

data/lib/health-data-standards/import/c32/condition_importer.rb

@@ -7,7 +7,10 @@ module HealthDataStandards
           @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.103']/cda:entry/cda:act/cda:entryRelationship/cda:observation"
           @code_xpath = "./cda:value"
           @status_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.50']/cda:value"
+          @priority_xpath = "./cda:priorityCode"
           @description_xpath = "./cda:text/cda:reference[@value]"
+          @provider_xpath = "./cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.27']/cda:performer"
+          @cod_xpath = "./cda:entryRelationship[@typeCode='CAUS']/cda:observation/cda:code[@code='419620001']"
         end
         
         def create_entries(doc, id_map = {})
@@ -21,12 +24,15 @@ module HealthDataStandards
             extract_codes(entry_element, condition)
             extract_dates(entry_element, condition)
             extract_status(entry_element, condition)
+            extract_priority(entry_element, condition)
             extract_description(entry_element, condition, id_map)
-            extract_cause_of_death(entry_element, condition)
+            extract_cause_of_death(entry_element, condition) if @cod_xpath
             extract_type(entry_element, condition)
 
-            entry_element.xpath("./cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.27']/cda:performer").each do |provider_element|
-              condition.treating_provider < import_actor(provider_element)
+            if @provider_xpath
+              entry_element.xpath(@provider_xpath).each do |provider_element|
+                condition.treating_provider << import_actor(provider_element)
+              end
             end
 
             condition_list << condition
@@ -38,7 +44,7 @@ module HealthDataStandards
         private
 
         def extract_cause_of_death(entry_element, condition)
-          cod = entry_element.at_xpath("./cda:entryRelationship[@typeCode='CAUS']/cda:observation/cda:code[@code='419620001']")
+          cod = entry_element.at_xpath(@cod_xpath)
           condition.cause_of_death = cod.present?
         end
 

data/lib/health-data-standards/import/c32/encounter_importer.rb

@@ -8,7 +8,8 @@ module HealthDataStandards
           @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.127']/cda:entry/cda:encounter"
           @code_xpath = "./cda:code"
           @status_xpath = "./cda:statusCode"
-          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] "
+          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value]"
+          @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:act"
           @check_for_usable = true               # Pilot tools will set this to false
           @id_map = {}
         end
@@ -23,22 +24,27 @@ module HealthDataStandards
           encounter_list = []
           entry_elements = doc.xpath(@entry_xpath)
           entry_elements.each do |entry_element|
-            encounter = Encounter.new
-            extract_codes(entry_element, encounter)
-            extract_dates(entry_element, encounter)
-            extract_description(entry_element, encounter, id_map)
+            encounter = create_entry(entry_element, id_map={})
             if @check_for_usable
               encounter_list << encounter if encounter.usable?
             else
               encounter_list << encounter
             end
-            extract_performer(entry_element, encounter)
-            extract_facility(entry_element, encounter)
-            extract_reason(entry_element, encounter, id_map)
-            extract_admission(entry_element, encounter)
           end
           encounter_list
         end
+        
+        def create_entry(entry_element, id_map={})
+          encounter = Encounter.new
+          extract_codes(entry_element, encounter)
+          extract_dates(entry_element, encounter)
+          extract_description(entry_element, encounter, id_map)
+          extract_performer(entry_element, encounter)
+          extract_facility(entry_element, encounter)
+          extract_reason(entry_element, encounter, id_map)
+          extract_admission(entry_element, encounter)
+          encounter
+        end
     
         private
     
@@ -58,7 +64,7 @@ module HealthDataStandards
         end
     
         def extract_reason(parent_element, encounter, id_map)
-          reason_element = parent_element.at_xpath("./cda:entryRelationship[@typeCode='RSON']/cda:act")
+          reason_element = parent_element.at_xpath(@reason_xpath)
           if reason_element
             reason = Entry.new
             extract_codes(reason_element, reason)

data/lib/health-data-standards/import/c32/immunization_importer.rb

@@ -7,7 +7,7 @@ module HealthDataStandards
           @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.117']/cda:entry/cda:substanceAdministration"
           @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
           @description_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code/cda:originalText/cda:reference[@value]"
-          @refusal_resason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.27']/cda:code"
+          @refusal_reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.27']/cda:code"
           @check_for_usable = true               # Pilot tools will set this to false
         end
 
@@ -42,7 +42,7 @@ module HealthDataStandards
           unless negation_indicator.nil?
             immunization.refusal_ind = negation_indicator.eql?('true')
             if immunization.refusal_ind
-              refusal_reason_element = parent_element.at_xpath(@refusal_resason_xpath)
+              refusal_reason_element = parent_element.at_xpath(@refusal_reason_xpath)
               if refusal_reason_element
                 immunization.refusal_reason = {'code' => refusal_reason_element['code'],
                                                'codeSystem' => 'HL7 No Immunization Reason'}

data/lib/health-data-standards/import/c32/insurance_provider_importer.rb

@@ -0,0 +1,42 @@
+module HealthDataStandards
+  module Import
+    module C32
+      class InsuranceProviderImporter < SectionImporter
+        
+        def initialize
+          @entry_xpath = "//cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.1.26']"
+        end
+        
+        def create_entries(doc, id_map={})
+          doc.xpath(@entry_xpath).map do |payer_element|
+            ip = InsuranceProvider.new
+            ip.type = extract_code(payer_element, "./cda:code")
+            ip.payer = import_organization(payer_element.at_xpath("./cda:performer/cda:assignedEntity"))
+            ip.guarantors = extract_guarantors(payer_element.xpath("./cda:performer/cda:assignedEntity"))
+            ip.subscriber = import_person(payer_element.at_xpath("./cda:participant[@typeCode='HLD']/cda:participantRole"))
+            member_info_element = payer_element.at_xpath("cda:participant[@typeCode='COV']")
+            extract_dates(member_info_element, ip, "time")
+            name = payer_element.at_xpath("./cda:entryRelationship[@typeCode='REFR']/cda:act[@classCode='ACT' and @moodCode='DEF']/cda:text")
+            ip.name = name.try(:text)
+            patient_element = member_info_element.at_xpath("./cda:participantRole[@classCode='PAT']")
+            ip.member_id = patient_element.at_xpath("./cda:id")
+            ip.relationship = extract_code(patient_element, "./cda:code")
+            ip.financial_responsibility_type = extract_code(payer_element, "./cda:performer/cda:assignedEntity/cda:code")
+          end                  
+        end
+        
+        def extract_guarantors(guarantor_elements)
+          guarantor_elements.map do |guarantor_element|
+            guarantor = Guarantor.new
+            guarantor.person = import_person(guarantor_element.at_xpath("./cda:assignedPerson"))
+            guarantor.organization = import_organization(guarantor_element.at_xpath("./cda:representedOrganization"))
+            extract_dates(guarantor_element, guarantor, element_name="time")
+            guarantor
+          end
+        end
+        
+      end
+    end
+  end
+  
+end

data/lib/health-data-standards/import/c32/medical_equipment_importer.rb

@@ -0,0 +1,45 @@
+module HealthDataStandards
+  module Import
+    module C32
+      class MedicalEquipmentImporter < SectionImporter
+        
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.128']/cda:entry/cda:supply"
+          @code_xpath = "./cda:participant/cda:participantRole/cda:playingDevice/cda:code"
+          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value]"
+          @check_for_usable = true
+        end
+        
+        def create_entries(doc,id_map = {})
+          entry_list = []
+          entry_elements = doc.xpath(@entry_xpath)
+          entry_elements.each do |entry_element|
+            entry = create_entry(entry_element, id_map)
+            if @check_for_usable
+              entry_list << entry if entry.usable?
+            else
+              entry_list << entry
+            end
+          end
+          entry_list
+        end
+        
+        def create_entry(entry_element, id_map={})
+          entry = MedicalEquipment.new
+          extract_codes(entry_element, entry)
+          extract_dates(entry_element, entry)
+          extract_value(entry_element, entry)
+          
+          extract_description(entry_element, entry, id_map)
+          extract_manufacturer(entry_element, entry)
+          entry
+        end
+        
+        def extract_manufacturer(entry_element, entry)
+          manufacturer = entry_element.at_xpath("./cda:participant/cda:participantRole/cda:scopingEntity/cda:desc").try(:inner_text)
+          entry.manufacturer = manufacturer.strip if manufacturer
+        end
+      end
+    end
+  end
+end

data/lib/health-data-standards/import/c32/medication_importer.rb

@@ -16,57 +16,42 @@ module HealthDataStandards
           @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.112']/cda:entry/cda:substanceAdministration"
           @code_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code"
           @description_xpath = "./cda:consumable/cda:manufacturedProduct/cda:manufacturedMaterial/cda:code/cda:originalText/cda:reference[@value]"
-
+          @type_of_med_xpath = "./cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.8.1']/cda:code"
+          @indication_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.28']/cda:code"
+          @vehicle_xpath = "cda:participant/cda:participantRole[cda:code/@code='412307009' and cda:code/@codeSystem='2.16.840.1.113883.6.96']/cda:playingEntity/cda:code"
+          @fill_number_xpath = "./cda:entryRelationship[@typeCode='COMP']/cda:sequenceNumber/@value"
           @check_for_usable = true               # Pilot tools will set this to false
         end
-
-        # Traverses that HITSP C32 document passed in using XPath and creates an Array of Entry
-        # objects based on what it finds
-        # @param [Nokogiri::XML::Document] doc It is expected that the root node of this document
-        #        will have the "cda" namespace registered to "urn:hl7-org:v3"
-        #        measure definition
-        # @return [Array] will be a list of Entry objects
-        def create_entries(doc,id_map = {})
-          medication_list = []
-          entry_elements = doc.xpath(@entry_xpath)
-          entry_elements.each do |entry_element|
-            medication = Medication.new
-            extract_codes(entry_element, medication)
-            extract_dates(entry_element, medication)
-            extract_description(entry_element, medication, id_map)
-
-            if medication.description.present?
-              medication.free_text_sig = medication.description
-            end
-
-            extract_administration_timing(entry_element, medication)
-
-            medication.route = extract_code(entry_element, "./cda:routeCode")
-            medication.dose = extract_scalar(entry_element, "./cda:doseQuantity")
-            medication.site = extract_code(entry_element, "./cda:approachSiteCode", 'SNOMED-CT')
-
-            extract_dose_restriction(entry_element, medication)
         
-            medication.product_form = extract_code(entry_element, "./cda:administrationUnitCode", 'NCI Thesaurus')
-            medication.delivery_method = extract_code(entry_element, "./cda:code", 'SNOMED-CT')
-            medication.type_of_medication = extract_code(entry_element,
-                "./cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.8.1']/cda:code", 'SNOMED-CT')
-            medication.indication = extract_code(entry_element,
-                "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.28']/cda:code", 'SNOMED-CT')
-            medication.vehicle = extract_code(entry_element,
-                    "cda:participant/cda:participantRole[cda:code/@code='412307009' and cda:code/@codeSystem='2.16.840.1.113883.6.96']/cda:playingEntity/cda:code", 'SNOMED-CT')
-
-            extract_order_information(entry_element, medication)
-        
-            extract_fulfillment_history(entry_element, medication)
-
-            if @check_for_usable
-              medication_list << medication if medication.usable?
-            else
-              medication_list << medication
-            end
+        def create_entry(entry_element, id_map={})
+          medication = Medication.new
+          extract_codes(entry_element, medication)
+          extract_dates(entry_element, medication)
+          extract_description(entry_element, medication, id_map)
+          
+          if medication.description.present?
+            medication.free_text = medication.description
           end
-          medication_list
+          
+          extract_administration_timing(entry_element, medication)
+          
+          medication.route = extract_code(entry_element, "./cda:routeCode")
+          medication.dose = extract_scalar(entry_element, "./cda:doseQuantity")
+          medication.site = extract_code(entry_element, "./cda:approachSiteCode", 'SNOMED-CT')
+          
+          extract_dose_restriction(entry_element, medication)
+          
+          medication.product_form = extract_code(entry_element, "./cda:administrationUnitCode", 'NCI Thesaurus')
+          medication.delivery_method = extract_code(entry_element, "./cda:code", 'SNOMED-CT')
+          medication.type_of_medication = extract_code(entry_element, @type_of_med_xpath, 'SNOMED-CT') if @type_of_med_xpath
+          medication.indication = extract_code(entry_element, @indication_xpath, 'SNOMED-CT')
+          medication.vehicle = extract_code(entry_element, @vehicle_xpath, 'SNOMED-CT')
+          
+          extract_order_information(entry_element, medication)
+          
+          extract_fulfillment_history(entry_element, medication)
+          
+          medication
         end
 
         private
@@ -84,7 +69,8 @@ module HealthDataStandards
               hl7_timestamp = fh_element.at_xpath('./cda:effectiveTime').try(:[], 'value')
               fulfillment_history.dispense_date = HL7Helper.timestamp_to_integer(hl7_timestamp) if hl7_timestamp
               fulfillment_history.quantity_dispensed = extract_scalar(fh_element, "./cda:quantity")
-              fulfillment_history.fill_number = fh_element.at_xpath("./cda:entryRelationship[@typeCode='COMP']/cda:sequenceNumber").try(:[], 'value').to_i
+              fill_number = fh_element.at_xpath(@fill_number_xpath).try(:text)
+              fulfillment_history.fill_number = fill_number.to_i if fill_number
               medication.fulfillmentHistory << fulfillment_history
             end
           end
@@ -128,6 +114,7 @@ module HealthDataStandards
             medication.dose_restriction = dr
           end
         end
+
       end
     end
   end

data/lib/health-data-standards/import/c32/organization_importer.rb

@@ -11,7 +11,7 @@ module HealthDataStandards
         def extract_organization(org_element)
           return unless org_element
           org = Organization.new
-          org.name = org_element.at_xpath("./name").try(:text)
+          org.name = org_element.at_xpath("./cda:name | ./cda:representedOrganization/cda:name").try(:text)
           org.addresses = org_element.xpath("./cda:addr").map { |addr| import_address(addr) }
           org.telecoms = org_element.xpath("./cda:telecom").map { |tele| import_telecom(tele) }
           org

data/lib/health-data-standards/import/c32/patient_importer.rb

@@ -61,11 +61,11 @@ module HealthDataStandards
           @section_importers[:medications] = MedicationImporter.new
           @section_importers[:conditions] = ConditionImporter.new
           @section_importers[:social_history] = SectionImporter.new("//cda:observation[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.19']")
-          @section_importers[:care_goals] = SectionImporter.new("//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.1.25']")
-          @section_importers[:medical_equipment] = SectionImporter.new("//cda:section[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.128']/cda:entry/cda:supply",
-          "./cda:participant/cda:participantRole/cda:playingDevice/cda:code")
+          @section_importers[:care_goals] = CareGoalImporter.new
+          @section_importers[:medical_equipment] = MedicalEquipmentImporter.new
           @section_importers[:allergies] = AllergyImporter.new
           @section_importers[:immunizations] = ImmunizationImporter.new
+          @section_importers[:insurance_providers] = InsuranceProviderImporter.new
         end
 
         def build_id_map(doc)

data/lib/health-data-standards/import/c32/procedure_importer.rb

@@ -6,9 +6,8 @@ module HealthDataStandards
       class ProcedureImporter < SectionImporter
 
         def initialize
-          @entry_xpath = "//cda:procedure[cda:templateId/@root='2.16.840.1.113883.10.20.1.29']"
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.1.12']/cda:entry/cda:procedure"
           @code_xpath = "./cda:code"
-          @status_xpath = "./cda:statusCode"
           @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] "
           @check_for_usable = true               # Pilot tools will set this to false
         end
@@ -23,20 +22,25 @@ module HealthDataStandards
           procedure_list = []
           entry_elements = doc.xpath(@entry_xpath)
           entry_elements.each do |entry_element|
-            procedure = Procedure.new
-            extract_codes(entry_element, procedure)
-            extract_dates(entry_element, procedure)
-            extract_description(entry_element, procedure, id_map)
+            procedure = create_entry(entry_element, id_map)
             if @check_for_usable
               procedure_list << procedure if procedure.usable?
             else
               procedure_list << procedure
             end
-            extract_performer(entry_element, procedure)
-            extract_site(entry_element, procedure)
           end
           procedure_list
         end
+        
+        def create_entry(entry_element, id_map={})
+          procedure = Procedure.new
+          extract_codes(entry_element, procedure)
+          extract_dates(entry_element, procedure)
+          extract_description(entry_element, procedure, id_map)
+          extract_performer(entry_element, procedure)
+          extract_site(entry_element, procedure)
+          procedure
+        end
 
         private
 

data/lib/health-data-standards/import/c32/result_importer.rb

@@ -5,7 +5,6 @@ module HealthDataStandards
         def initialize
           @entry_xpath = "//cda:observation[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.15.1'] | //cda:observation[cda:templateId/@root='2.16.840.1.113883.3.88.11.83.15']"
           @code_xpath = "./cda:code"
-          @status_xpath = "./cda:statusCode"
           @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] "
           @check_for_usable = true               # Pilot tools will set this to false
         end
@@ -20,13 +19,7 @@ module HealthDataStandards
           result_list = []
           entry_elements = doc.xpath(@entry_xpath)
           entry_elements.each do |entry_element|
-            result = LabResult.new
-            extract_codes(entry_element, result)
-            extract_dates(entry_element, result)
-            extract_value(entry_element, result)
-            extract_status(entry_element, result)
-            extract_description(entry_element, result, id_map)
-            extract_interpretation(entry_element, result)
+            result = create_entry(entry_element, id_map)
             if @check_for_usable
               result_list << result if result.usable?
             else
@@ -35,6 +28,16 @@ module HealthDataStandards
           end
           result_list
         end
+        
+        def create_entry(entry_element, id_map={})
+          result = LabResult.new
+          extract_codes(entry_element, result)
+          extract_dates(entry_element, result)
+          extract_value(entry_element, result)
+          extract_description(entry_element, result, id_map)
+          extract_interpretation(entry_element, result)
+          result
+        end
     
         private
         def extract_interpretation(parent_element, result)
@@ -46,12 +49,6 @@ module HealthDataStandards
           end
         end
     
-        def extract_status(parent_element, result)
-          status_code_element = parent_element.at_xpath(@status_xpath)
-          if status_code_element
-            result.status = status_code_element['code']
-          end
-        end
       end
     end
   end