health-data-standards 0.8.1 → 1.0.0

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

@@ -15,10 +15,11 @@ module HealthDataStandards
         # @param [String] status_xpath XPath expression to find the status element as a child of the desired CDA
         #        entry. Defaults to nil. If not provided, a status will not be checked for since it is not applicable
         #        to all enrty types
-        def initialize(entry_xpath, code_xpath="./cda:code", status_xpath=nil, description_xpath="./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] ")
+        def initialize(entry_xpath, code_xpath="./cda:code", status_xpath=nil,priority_xpath=nil, description_xpath="./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] ")
           @entry_xpath = entry_xpath
           @code_xpath = code_xpath
           @status_xpath = status_xpath
+          @priority_xpath = priority_xpath
           @description_xpath = description_xpath
           @check_for_usable = true               # Pilot tools will set this to false
         end
@@ -48,16 +49,7 @@ module HealthDataStandards
           entry_list = []
           entry_elements = doc.xpath(@entry_xpath)
           entry_elements.each do |entry_element|
-            entry = Entry.new
-            extract_codes(entry_element, entry)
-            extract_dates(entry_element, entry)
-            extract_value(entry_element, entry)
-            if @status_xpath
-              extract_status(entry_element, entry)
-            end
-            if @description_xpath
-              extract_description(entry_element, entry, id_map)
-            end
+            entry = create_entry(entry_element, id_map)
             if @check_for_usable
               entry_list << entry if entry.usable?
             else
@@ -66,6 +58,23 @@ module HealthDataStandards
           end
           entry_list
         end
+        
+        def create_entry(entry_element, id_map={})
+          entry = Entry.new
+          extract_codes(entry_element, entry)
+          extract_dates(entry_element, entry)
+          extract_value(entry_element, entry)
+          if @status_xpath
+            extract_status(entry_element, entry)
+          end
+          if @priority_xpath
+              extract_priority(entry_element, entry)
+            end
+          if @description_xpath
+            extract_description(entry_element, entry, id_map)
+          end
+          entry
+        end
 
         private
 
@@ -83,6 +92,17 @@ module HealthDataStandards
           end
         end
 
+        def extract_priority(parent_element, entry)
+          priority_element = parent_element.at_xpath(@priority_xpath)
+          if priority_element
+            case priority_element['code']
+            when '8319008'
+              entry.ordinality = :principal
+            end
+          end
+        end
+
+
         def extract_description(parent_element, entry, id_map)
           code_elements = parent_element.xpath(@description_xpath)
           code_elements.each do |code_element|
@@ -108,18 +128,18 @@ module HealthDataStandards
           end
         end
 
-        def extract_dates(parent_element, entry)
-          if parent_element.at_xpath('cda:effectiveTime')
-            entry.time = HL7Helper.timestamp_to_integer(parent_element.at_xpath('cda:effectiveTime')['value'])
+        def extract_dates(parent_element, entry, element_name="effectiveTime")
+          if parent_element.at_xpath("cda:#{element_name}")
+            entry.time = HL7Helper.timestamp_to_integer(parent_element.at_xpath("cda:#{element_name}")['value'])
           end
-          if parent_element.at_xpath('cda:effectiveTime/cda:low')
-            entry.start_time = HL7Helper.timestamp_to_integer(parent_element.at_xpath('cda:effectiveTime/cda:low')['value'])
+          if parent_element.at_xpath("cda:#{element_name}/cda:low")
+            entry.start_time = HL7Helper.timestamp_to_integer(parent_element.at_xpath("cda:#{element_name}/cda:low")['value'])
           end
-          if parent_element.at_xpath('cda:effectiveTime/cda:high')
-            entry.end_time = HL7Helper.timestamp_to_integer(parent_element.at_xpath('cda:effectiveTime/cda:high')['value'])
+          if parent_element.at_xpath("cda:#{element_name}/cda:high")
+            entry.end_time = HL7Helper.timestamp_to_integer(parent_element.at_xpath("cda:#{element_name}/cda:high")['value'])
           end
-          if parent_element.at_xpath('cda:effectiveTime/cda:center')
-            entry.time = HL7Helper.timestamp_to_integer(parent_element.at_xpath('cda:effectiveTime/cda:center')['value'])
+          if parent_element.at_xpath("cda:#{element_name}/cda:center")
+            entry.time = HL7Helper.timestamp_to_integer(parent_element.at_xpath("cda:#{element_name}/cda:center")['value'])
           end
         end
 
@@ -128,24 +148,35 @@ module HealthDataStandards
           if value_element
             value = value_element['value']
             unit = value_element['unit']
+            value ||= value_element.text 
             if value
-              entry.set_value(value, unit)
+              entry.set_value(value.strip, unit)
             end
+            
           end
         end
         
         def import_actor(actor_element)
           return ProviderImporter.instance.extract_provider(actor_element)
         end
+        
+        def import_organization(organization_element)
+          return OrganizationImporter.instance.extract_organization(organization_element)
+        end
 
-        # def import_person(person_element)
-        #   person_hash = {}
-        #   name_element = person_element.at_xpath("./cda:name")
-        #   person_hash['name'] = name_element.try(:text)
-        #   person_hash['first'] = name_element.at_xpath("./cda:given").try(:text)
-        #   person_hash['last'] = name_element.at_xpath("./cda:family").try(:text)
-        #   person_hash
-        # end
+        def import_person(person_element)
+          return unless person_element
+          person = Person.new
+          name_element = person_element.at_xpath("./cda:name")
+          if name_element
+            person.title = name_element.at_xpath("./cda:title").try(:text)
+            person.given_name = name_element.at_xpath("./cda:given").try(:text)
+            person.family_name = name_element.at_xpath("./cda:family").try(:text)
+          end
+          person.addresses = person_element.xpath("./cda:addr").map { |addr| import_address(addr) }
+          person.telecoms = person_element.xpath("./cda:telecom").map { |tele| import_telecom(tele) } 
+          return person
+        end
 
         def import_address(address_element)
           address = Address.new

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

@@ -0,0 +1,20 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class AllergyImporter < C32::AllergyImporter
+        
+        
+        def initialize
+          @entry_xpath = "//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.7']"
+          @code_xpath = "./cda:participant/cda:participantRole/cda:playingEntity/cda:code"
+          @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.22.4.9']/cda:value"
+          @severity_xpath = "./cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.8']/cda:value"
+          @status_xpath   = "./cda:entryRelationship[@typeCode='SUBJ']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.28']/cda:value"
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class CareGoalImporter < C32::CareGoalImporter
+
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.10']/cda:entry/cda:*"
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class ConditionImporter < C32::ConditionImporter
+        
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.5' or cda:templateId/@root='2.16.840.1.113883.10.20.22.2.5.1']/cda:entry/cda:act/cda:entryRelationship/cda:observation"
+          @status_xpath = "./cda:entryRelationship/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.6']/cda:value"
+          @description_xpath = "./cda:text/cda:reference[@value]"
+          @code_xpath = "./cda:value"
+          
+          #optional
+          #health status
+          #age at onset
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      # TODO Extract Discharge Disposition
+      class EncounterImporter < C32::EncounterImporter
+    
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.22' or cda:templateId/@root='2.16.840.1.113883.10.20.22.2.22.1']/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] "
+          @reason_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation"
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class ImmunizationImporter < C32::ImmunizationImporter
+
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.2' or cda:templateId/@root='2.16.840.1.113883.10.20.22.2.2.1']/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_reason_xpath = "./cda:entryRelationship[@typeCode='MFST']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.9']/cda:value"
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class InsuranceProviderImporter < C32::InsuranceProviderImporter
+        
+        def initialize
+          @entry_xpath = "//cda:act[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.61']"
+        end
+        
+      end
+    end
+  end
+  
+end

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

@@ -0,0 +1,16 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class MedicalEquipmentImporter < C32::MedicalEquipmentImporter
+        
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.50']/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]"
+
+        end
+  
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      
+      class MedicationImporter < C32::MedicationImporter
+
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.1' or cda:templateId/@root='2.16.840.1.113883.10.20.22.2.1.1']/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]"
+          @indication_xpath = "./cda:entryRelationship[@typeCode='RSON']/cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.19']/cda:code"
+          @vehicle_xpath = "./cda:participant/cda:participantRole[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.24']/cda:playingEntity/cda:code"
+          @fill_number_xpath = './cda:repeatNumber'
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class PatientImporter < C32::PatientImporter
+        
+        def initialize(check_usable = true)
+          @section_importers = {}
+          @section_importers[:encounters] = EncounterImporter.new
+          @section_importers[:procedures] = ProcedureImporter.new
+          @section_importers[:results] = ResultImporter.new
+          @section_importers[:vital_signs] = VitalSignImporter.new
+          @section_importers[:medications] = MedicationImporter.new
+          @section_importers[:conditions] = ConditionImporter.new
+          @section_importers[:social_history] = C32::SectionImporter.new("//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.38' or cda:templateId/@root='2.16.840.1.113883.10.20.15.3.8']")
+          @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 parse_ccda(doc)
+          parse_c32(doc)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class ProcedureImporter < C32::ProcedureImporter
+
+        def initialize
+          @entry_xpath = "//cda:section[cda:templateId/@root='2.16.840.1.113883.10.20.22.2.7' or cda:templateId/@root='2.16.840.1.113883.10.20.22.2.7.1']/cda:entry/cda:*"
+          @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
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class ResultImporter < C32::ResultImporter
+        def initialize
+          @entry_xpath = "//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.2']"
+          @code_xpath = "./cda:code"
+          @description_xpath = "./cda:code/cda:originalText/cda:reference[@value] | ./cda:text/cda:reference[@value] "
+        end
+      end
+    end
+  end
+end

data/lib/health-data-standards/import/ccda/vital_sign_importer.rb

@@ -0,0 +1,12 @@
+module HealthDataStandards
+  module Import
+    module CCDA
+      class VitalSignImporter < C32::VitalSignImporter
+        def initialize
+          super
+          @entry_xpath = "//cda:observation[cda:templateId/@root='2.16.840.1.113883.10.20.22.4.27']"
+        end
+      end
+    end
+  end
+end

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

@@ -188,9 +188,22 @@ module HealthDataStandards
           patientActor = doc.at_xpath("//ccr:ContinuityOfCareRecord/ccr:Actors/ccr:Actor[ccr:ActorObjectID = \"#{patientActorID}\"]")
           patientID = patientActor.at_xpath(patient_id_xpath).try(:content)
           patientID ||= patientActorID
-
-          patient['first'] = patientActor.at_xpath('./ccr:Person/ccr:Name/ccr:CurrentName/ccr:Given').content
-          patient['last'] = patientActor.at_xpath('./ccr:Person/ccr:Name/ccr:CurrentName/ccr:Family').content
+          
+          name_element = patientActor.at_xpath('./ccr:Person/ccr:Name')
+          
+          if name_element
+            if name_element.at_xpath("./ccr:CurrentName")
+              patient['first'] = name_element.at_xpath('./ccr:CurrentName/ccr:Given').try(:content)
+              patient['last'] = name_element.at_xpath('./ccr:CurrentName/ccr:Family').try(:content)
+            elsif name_element.at_xpath("./ccr:DisplayName")
+              # this will not work in all cases, but we're using it as a last resort if no CurrentName is found
+              first, last = name_element.at_xpath("./ccr:DisplayName").content.split(" ")
+              patient['first'] = first.strip
+              patient['last'] = last.strip
+            end
+          end
+              
+          
           birthdate = patientActor.at_xpath('./ccr:Person//ccr:DateOfBirth/ccr:ExactDateTime | ./ccr:Person//ccr:DateOfBirth/ccr:ApproximateDateTime')
           patient['birthdate'] = Time.parse(birthdate.content).to_i if birthdate
           

data/lib/health-data-standards/import/green_c32/advance_directive_importer.rb

@@ -0,0 +1,14 @@
+module HealthDataStandards
+  module Import
+    module GreenC32
+      class AdvanceDirectiveImporter < SectionImporter
+        include Singleton
+        
+        def import(ad_xml)
+          generic_import(ad_xml, "advanceDirective")
+        end
+        
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module HealthDataStandards
           allergy_element = allergy_xml.xpath("./gc32:allergy")
           allergy = Allergy.new
           extract_entry(allergy_element, allergy)
-          allergy.type = extract_node_text(allergy_element.at_xpath("./gc32:type"))
+          extract_code(allergy_element, allergy, "./gc32:type", :type)
           extract_code(allergy_element, allergy, "./gc32:reaction", :reaction)
           extract_code(allergy_element, allergy, "./gc32:severity", :severity)
           allergy

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

@@ -0,0 +1,26 @@
+module HealthDataStandards
+  module Import
+    module GreenC32
+      class CareGoalImporter
+        include Singleton
+        
+        def initialize
+        end
+        
+        def import(care_goal_xml)
+          importer = case care_goal_xml.at_xpath("/*").try(:name)
+                     when "medication" then MedicationImporter.instance
+                     when "immunization" then ImmunizationImporter.instance
+                     when "procedure" then ProcedureImporter.instance
+                     when "encounter" then EncounterImporter.instance
+                     when "medicalEquipment" then MedicalEquipmentImporter.instance
+                     else SectionImporter.new
+                     end
+                
+          return importer.import(care_goal_xml)
+        end
+        
+      end
+    end
+  end
+end

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

@@ -15,7 +15,6 @@ module HealthDataStandards
           condition = Condition.new
 
           extract_entry(condition_element, condition)
-          extract_name(condition_element, condition)
           extract_cause_of_death(condition_element, condition)
           extract_type(condition_element, condition)
           
@@ -29,11 +28,6 @@ module HealthDataStandards
           condition.type = extract_node_text(type)
         end
         
-        def extract_name(condition_xml, condition)
-          name = condition_xml.xpath("./gc32:name").first
-          condition.name = extract_node_text(name)
-        end
-        
         def extract_cause_of_death(condition_xml, condition)
           condition.cause_of_death = extract_node_attribute(condition_xml, "causeOfDeath")
         end

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

@@ -18,12 +18,7 @@ module HealthDataStandards
           extract_code(encounter_element, encounter, "./gc32:reasonForVisit", :reason)
           extract_code(encounter_element, encounter)
           extract_facility(encounter_element, encounter)
-          
-          free_text = encounter_element.xpath("./gc32:freeText").first
-
-          if free_text
-            encounter.free_text = free_text.content
-          end
+          extract_free_text(encounter_element, encounter)
           
           encounter
         end

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

@@ -9,7 +9,7 @@ module HealthDataStandards
           immunization_element = immunization_xml.at_xpath("./gc32:immunization")
           immunization = Immunization.new
           extract_entry(immunization_element, immunization)
-          extract_time(immunization_element, immunization, "./gc32:administeredDate")
+          extract_time(immunization_element, immunization, "./gc32:effectiveTime")
           extract_code(immunization_element, immunization, "./gc32:refusalReason")
           series_number = extract_node_text(immunization_element.at_xpath("./gc32:seriesNumber"))
           immunization.series_number = series_number.to_i if series_number

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

@@ -0,0 +1,24 @@
+module HealthDataStandards
+  module Import
+    module GreenC32
+      class MedicalEquipmentImporter < SectionImporter
+        include Singleton
+        
+        def initialize
+          super
+          @value = "./gc32:quantity"
+        end
+        
+        def import(me_xml)
+          me_xml.root.add_namespace_definition('gc32', "urn:hl7-org:greencda:c32")
+          me_element = me_xml.at_xpath("./gc32:medicalEquipment")
+          me = MedicalEquipment.new
+          extract_entry(me_element, me)
+          me.manufacturer = extract_node_text(me_element.at_xpath("./gc32:manufacturer")).try(:strip)
+          me
+        end
+        
+       end
+     end
+   end 
+end

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

@@ -22,7 +22,7 @@ module HealthDataStandards
           extract_med_code_attribute(med_element, medication, :vehicle)
           extract_med_code_attribute(med_element, medication, :reaction)
           extract_med_code_attribute(med_element, medication, :deliveryMethod)
-          medication.free_text_sig = extract_node_text(med_element.at_xpath("./gc32:freeTextSig"))
+          extract_free_text(med_element, medication, "freeTextSig")
           medication.fulfillment_instructions = extract_node_text(med_element.at_xpath("./gc32:patientInstructions"))
           medication.dose_indicator = extract_node_text(med_element.at_xpath("./gc32:doseIndicator"))
           medication.fulfillment_history = extract_fulfillment_history(med_element)

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

@@ -17,18 +17,10 @@ module HealthDataStandards
           procedure = Procedure.new
           
           extract_entry(procedure_element, procedure)
-          extract_type(procedure_element, procedure)
-          
+          extract_code(procedure_element, procedure, xpath="./gc32:site", attribute=:site)
           procedure
         end
-        
-        private
-        
-        def extract_type(procedure_xml, procedure)
-          type = procedure_xml.xpath("./gc32:type").first
-          procedure.type = extract_node_text(type)
-        end
-        
+
       end
     end
   end

data/lib/health-data-standards/import/green_c32/section_importer.rb

@@ -11,9 +11,22 @@ module HealthDataStandards
           @value = "./gc32:value"
         end
         
+        
+        def import(entry_xml)
+          generic_import(entry_xml)
+        end
+        
+        def generic_import(element_xml, element_name="entry")
+          entry = Entry.new
+          element_xml.root.add_namespace_definition('gc32', "urn:hl7-org:greencda:c32")
+          element = element_xml.at_xpath("./gc32:#{element_name}")
+          extract_entry(element, entry)
+          entry
+        end
+        
         def extract_code(element, entry, xpath="./gc32:code", attribute=:codes)
           
-          code_element = element.xpath(xpath).first
+          code_element = element.at_xpath(xpath)
 
           return unless code_element
 
@@ -27,12 +40,12 @@ module HealthDataStandards
         end
         
         def extract_description(element, entry)
-          description = element.xpath(@description).first
+          description = element.at_xpath(@description)
           entry.description = extract_node_text(description)
         end
         
         def extract_status(element, entry)
-          status = extract_node_text(element.xpath(@status).first)
+          status = extract_node_text(element.at_xpath(@status))
           return unless status
           entry.status = status
         end
@@ -45,10 +58,20 @@ module HealthDataStandards
           end
         end
         
+        def extract_name(element, entry, name_element="name")
+          name_element = element.at_xpath("./gc32:#{name_element}")
+          return unless name_element
+          entry.title = name_element.at_xpath("./gc32:title").try(:content)
+          entry.given_name = name_element.at_xpath("./gc32:givenName").try(:content)
+          entry.family_name = name_element.at_xpath("./gc32:familyName").try(:content)
+        end
+        
         def extract_time(element, entry, xpath = "./gc32:effectiveTime", attribute = "time")
           datetime = element.at_xpath(xpath)
-          return unless datetime && !datetime.inner_text.empty?
-          entry.send("#{attribute}=", Time.parse(datetime.inner_text).to_i)
+          
+          return unless datetime && datetime['value']
+          
+          entry.send("#{attribute}=", Time.parse(datetime['value']).to_i)
         end
         
         def extract_interval(element, entry, element_name="effectiveTime")
@@ -79,6 +102,8 @@ module HealthDataStandards
           extract_status(element, entry)
           extract_value(element, entry)
           extract_effective_time(element, entry)
+          entry.free_text = element.at_xpath("./gc32:freeText").try(:inner_text)
+          entry
         end
         
         def extract_organization(organization_element)
@@ -96,6 +121,7 @@ module HealthDataStandards
         end
         
         def extract_address(address_element)
+          return unless address_element
           address = Address.new
           address.street = address_element.xpath("./gc32:street").map { |st| extract_node_text(st)  }
           address.city = extract_node_text(address_element.xpath("./gc32:city"))
@@ -105,6 +131,7 @@ module HealthDataStandards
         end
         
         def extract_telecom(telecom_element)
+          return unless telecom_element
           telecom = Telecom.new
           telecom.use = extract_node_attribute(telecom_element, :type)
           telecom.value = extract_node_attribute(telecom_element, :value)
@@ -112,6 +139,10 @@ module HealthDataStandards
           telecom
         end
         
+        def extract_free_text(element, entry, free_text_element="freeText")
+          entry.free_text = extract_node_text(element.at_xpath("./gc32:#{free_text_element}"))
+        end
+        
         
         private