health-data-standards 2.1.4 → 2.2.0

data/lib/health-data-standards.rb

@@ -69,6 +69,7 @@ require_relative 'health-data-standards/models/metadata/change_info'
 require_relative 'health-data-standards/models/metadata/link_info'
 require_relative 'health-data-standards/models/metadata/pedigree'
 
+require_relative 'health-data-standards/import/c32/locatable_import_utils'
 require_relative 'health-data-standards/import/c32/section_importer'
 require_relative 'health-data-standards/import/c32/allergy_importer'
 require_relative 'health-data-standards/import/c32/encounter_importer'

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

@@ -3,12 +3,15 @@ module HealthDataStandards
     module TemplateHelper
       attr_accessor :template_format
       attr_accessor :template_subdir
+      attr_accessor :template_directory
 
       def template_root
+        @template_directory ||= File.dirname(__FILE__)
+
         if @template_subdir
-          return File.join(File.dirname(__FILE__), '..', '..', '..', 'templates', @template_subdir)
+          return File.join(@template_directory, '..', '..', '..', 'templates', @template_subdir)
         else
-          return File.join(File.dirname(__FILE__), '..', '..', '..', 'templates')
+          return File.join(@template_directory, '..', '..', '..', 'templates')
         end
       end
 
@@ -33,6 +36,7 @@ module HealthDataStandards
         rendering_context = RenderingContext.new(locals)
         rendering_context.template_format = self.template_format
         rendering_context.template_subdir = self.template_subdir
+        rendering_context.template_directory = self.template_directory
         eruby = Erubis::EscapedEruby.new(erb)
         eruby.result(rendering_context.my_binding)
       end

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

@@ -99,6 +99,51 @@ module HealthDataStandards
         end
       end
       
+      def convert_field_to_hash(field, codes)
+        if (codes.is_a? Hash)
+          clean_hash = {}
+          
+          if codes['codeSystem']
+            if codes['title']
+              clean_hash[codes['codeSystem']] = codes['code'] + " (#{codes['title']})"
+            else
+              clean_hash[codes['codeSystem']] = codes['code']
+            end
+          elsif codes['_id']
+            codes.keys.reject {|key| ['_id'].include? key}.each do |hashkey|
+              value = codes[hashkey]
+              if value.nil?
+                clean_hash[hashkey.titleize] = 'none'
+              elsif value.is_a? Hash
+                hash_result = convert_field_to_hash(hashkey, value)
+                if hash_result.is_a? Hash
+                  clean_hash[hashkey.titleize] = hash_result.map {|key, value| "#{key}: #{value}"}.join(' ')
+                else
+                  clean_hash[hashkey.titleize] = hash_result
+                end
+              elsif value.is_a? Array
+                clean_hash[hashkey.titleize] = value.join(', ')
+              else
+                clean_hash[hashkey.titleize] = convert_field_to_hash(hashkey, value)
+              end
+            end
+          elsif codes['scalar']
+            return "#{codes['scalar']} #{codes['units']}"
+          else
+            return codes.map {|hashcode_set, hashcodes| "#{hashcode_set}: #{(hashcodes.respond_to? :join) ? hashcodes.join(', ') : hashcodes.to_s}"}.join(' ')
+          end
+            
+          clean_hash
+        else
+          if codes && (field.match(/Time$/) || field.match(/\_time$/)) 
+            Entry.time_to_s(codes)
+          else
+            codes.to_s
+          end
+        end
+      end
+      
+      
     end
   end
 end

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

@@ -49,11 +49,7 @@ module HealthDataStandards
         def extract_ordinality(parent_element, entry)
           ordinality_element = parent_element.at_xpath(@ordinality_xpath)
           if ordinality_element
-            entry.ordinality_code = {CodeSystemHelper.code_system_for(ordinality_element['codeSystem']) => [ordinality_element['code']]}
-            case ordinality_element['code']
-            when '8319008'
-              entry.ordinality = :principal
-            end
+            entry.ordinality = {CodeSystemHelper.code_system_for(ordinality_element['codeSystem']) => [ordinality_element['code']]}
           end
         end
 

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

@@ -0,0 +1,27 @@
+module HealthDataStandards
+  module Import
+    module C32
+      # Helpers for importing C32 addresses and telecoms
+      module LocatableImportUtils
+        def import_address(address_element)
+          address = Address.new
+          address.use = address_element['use']
+          address.street = address_element.xpath("./cda:streetAddressLine").map {|street| street.text}
+          address.city = address_element.at_xpath("./cda:city").try(:text)
+          address.state = address_element.at_xpath("./cda:state").try(:text)
+          address.zip = address_element.at_xpath("./cda:postalCode").try(:text)
+          address.country = address_element.at_xpath("./cda:country").try(:text)
+          address
+        end
+
+        def import_telecom(telecom_element)
+          tele = Telecom.new
+          tele.value = telecom_element['value']
+          tele.use = telecom_element['use']
+          tele
+        end
+      end
+    end
+  end
+end
+    

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

@@ -11,6 +11,7 @@ module HealthDataStandards
 
         include Singleton
         include HealthDataStandards::Util
+        include HealthDataStandards::Import::C32::LocatableImportUtils
 
         # Creates a new PatientImporter with the following XPath expressions used to find content in 
         # a HITSP C32:
@@ -150,10 +151,16 @@ module HealthDataStandards
           patient.race = { code: race_node['code'], code_set: 'CDC-RE' } if race_node
           ethnicity_node = patient_element.at_xpath('cda:ethnicGroupCode')
           patient.ethnicity = {code: ethnicity_node['code'], code_set: 'CDC-RE'} if ethnicity_node
-
           languages = patient_element.search('languageCommunication').map {|lc| lc.at_xpath('cda:languageCode')['code'] }
           patient.languages = languages unless languages.empty?
           
+          # parse address information
+          patient.addresses = doc.xpath('/cda:ClinicalDocument/cda:recordTarget/cda:patientRole/cda:addr').map do |addr_element|
+            import_address(addr_element)
+          end
+          patient.telecoms = doc.xpath('/cda:ClinicalDocument/cda:recordTarget/cda:patientRole/cda:telecom').map do |tele|
+            import_telecom(tele)
+          end
         end
       end
     end

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

@@ -4,6 +4,7 @@ module HealthDataStandards
       # Class that can be used to create an importer for a section of a HITSP C32 document. It usually
       # operates by selecting all CDA entries in a section and then creates entries for them.
       class SectionImporter
+        include HealthDataStandards::Import::C32::LocatableImportUtils
         include HealthDataStandards::Util
         
         attr_accessor :check_for_usable
@@ -157,23 +158,6 @@ module HealthDataStandards
           return person
         end
 
-        def import_address(address_element)
-          address = Address.new
-          address.street = [address_element.at_xpath("./cda:streetAddressLine").try(:text)]
-          address.city = address_element.at_xpath("./cda:city").try(:text)
-          address.state = address_element.at_xpath("./cda:state").try(:text)
-          address.zip = address_element.at_xpath("./cda:postalCode").try(:text)
-          address.country = address_element.at_xpath("./cda:country").try(:text)
-          address
-        end
-
-        def import_telecom(telecom_element)
-          tele = Telecom.new
-          tele.value = telecom_element['value']
-          tele.use = telecom_element['use']
-          tele
-        end
-
         def extract_negation(parent_element, entry)
           negation_indicator = parent_element['negationInd']
           unless negation_indicator.nil?

data/lib/health-data-standards/models/address.rb

@@ -6,6 +6,7 @@ class Address
   field :state, type: String
   field :zip, type: String
   field :country, type: String
+  field :use, type: String
   
   embedded_in :locatable, polymorphic: true
 end

data/lib/health-data-standards/models/condition.rb

@@ -3,8 +3,7 @@ class Condition < Entry
   field :causeOfDeath,        type: Boolean
   field :priority,            type: Integer
   field :name,                type: String
-  field :ordinality,          type: String
-  field :ordinality_code,     type: Hash
+  field :ordinality,          type: Hash
   field :severity,            type: Hash # Currently unsupported by any importers
 
   embeds_many :treating_provider,  class_name: "Provider"

data/lib/health-data-standards/models/encounter.rb

@@ -1,18 +1,26 @@
 class Encounter < Entry
-
   field :admitType, type: Hash
   field :dischargeDisposition, type: Hash
-  field :admit_time, type: Integer
-  field :discharge_time, type: Integer
+  field :admitTime, type: Integer
+  field :dischargeTime, type: Integer
+  field :transferTo, type: Hash
+  field :transferFrom, type: Hash
 
   embeds_one :facility
   embeds_one :reason, class_name: "Entry"
 
   belongs_to :performer, class_name: "Provider"
 
+  alias :admit_time :admitTime
+  alias :admit_time= :admitTime=
   alias :admit_type :admitType
   alias :admit_type= :admitType=
   alias :discharge_disposition :dischargeDisposition
   alias :discharge_disposition= :dischargeDisposition=
-
+  alias :discharge_time :dischargeTime
+  alias :discharge_time= :dischargeTime=
+  alias :transfer_to :transferTo
+  alias :transfer_to= :transferTo=
+  alias :transfer_from :transferFrom
+  alias :transfer_from= :transferFrom=
 end

data/lib/health-data-standards/models/entry.rb

@@ -20,6 +20,7 @@ class Entry
   field :negationInd, type: Boolean
   field :negationReason, type: Hash
   field :oid, type: String
+  field :reason, type: Hash
   
   alias :negation_ind :negationInd
   alias :negation_ind= :negationInd=
@@ -33,14 +34,18 @@ class Entry
   
   def times_to_s(nil_string='UNK')
     if start_time.present? || end_time.present?
-      start_string = start_time ? Time.at(start_time).utc.to_formatted_s(:long_ordinal) : nil_string
-      end_string = end_time ? Time.at(end_time).utc.to_formatted_s(:long_ordinal) : nil_string
+      start_string = start_time ? Entry.time_to_s(start_time) : nil_string
+      end_string = end_time ? Entry.time_to_s(end_time) : nil_string
       "#{start_string} - #{end_string}"
     elsif time.present?
       Time.at(time).utc.to_formatted_s(:long_ordinal)
     end
   end
   
+  def self.time_to_s(input_time)
+    Time.at(input_time).utc.to_formatted_s(:long_ordinal)
+  end
+  
   # Entry previously had a status field that dropped the code set and converted
   # the status to a String. Entry now preserves the original code and code set.
   # This method is here to maintain backwards compatibility.
@@ -69,8 +74,8 @@ class Entry
       self.status_code = {'SNOMED-CT' => ['73425007']}
     when 'resolved'
       self.status_code = {'SNOMED-CT' => ['413322009']}
-    when 'completed'
-      self.status_code = {'HL7 ActStatus' => ['completed']}
+    else
+      self.status_code = {'HL7 ActStatus' => [status_text]}
     end
   end
   
@@ -105,6 +110,8 @@ class Entry
 
   # Checks if a code is in the list of possible codes
   # @param [Array] code_set an Array of Hashes that describe the values for code sets
+  #                The hash has a key of "set" for the code system name and "values"
+  #                for the actual code list
   # @return [true, false] whether the code is in the list of desired codes
   def is_in_code_set?(code_set)
     codes.keys.each do |code_system|

data/lib/health-data-standards/models/medical_equipment.rb

@@ -2,7 +2,10 @@ class MedicalEquipment < Entry
   
   field :manufacturer, type: String
   field :anatomicalStructure, type: Hash
+  field :removalTime, type: Integer
 
   alias :anatomical_structure :anatomicalStructure
   alias :anatomical_structure= :anatomicalStructure=
+  alias :removal_time :removalTime
+  alias :removal_time= :removalTime=
 end

data/lib/health-data-standards/models/procedure.rb

@@ -1,11 +1,11 @@
 class Procedure < Entry
-  field :site,             type: Hash
-  field :incisionDateTime, type: Integer
-  field :ordinality,          type: String
-  field :ordinality_code,     type: Hash
+  field :site,                type: Hash
+  field :incisionTime,        type: Integer
+  field :ordinality,          type: Hash
+  field :source,              type: Hash
   
   belongs_to :performer, class_name: "Provider"
 
-  alias :incision_date_time :incisionDateTime
-  alias :incision_date_time= :incisionDateTime=
+  alias :incision_time :incisionTime
+  alias :incision_time= :incisionTime=
 end

data/lib/health-data-standards/models/record.rb

@@ -41,6 +41,8 @@ class Record
    :insurance_providers, :functional_statuses]
 
   embeds_many :provider_performances
+  embeds_many :addresses, as: :locatable
+  embeds_many :telecoms, as: :contactable
   
   scope :by_provider, ->(prov, effective_date) { (effective_date) ? where(provider_queries(prov.id, effective_date)) : where('provider_performances.provider_id'=>prov.id)  }
   scope :by_patient_id, ->(id) { where(:medical_record_number => id) }
@@ -57,7 +59,7 @@ class Record
     matching_entries_by_section = Sections.map do |section|
       section_entries = self.send(section)
       if section_entries.present?
-        section_entries.find_all { |entry| entry.oid == oid }
+        section_entries.find_all { |entry| (entry.respond_to? :oid) ? entry.oid == oid : false}
       else
         []
       end

data/lib/health-data-standards/models/svs/value_set.rb

@@ -2,28 +2,72 @@ module HealthDataStandards
   module SVS
     class ValueSet
 
-    	include Mongoid::Document
+      include Mongoid::Document
       field :oid, type: String
       field :display_name, type: String
       field :version, type: String
 
+      index({oid: 1})
+      index({display_name: 1})
       embeds_many :concepts
+      index "concepts.code" => 1
+      index "concepts.code_system" => 1
+      index "concepts.code_system_name" => 1
+      index "concepts.display_name" => 1
+      
       scope :by_oid, ->(oid){where(:oid => oid)}
 
+      # Provides an Array of Hashes. Each code system gets its own Hash
+      # The hash has a key of "set" for the code system name and "values"
+      # for the actual code list
+      def code_set_map
+        codes = []
+        self.concepts.inject({}) do |memo, concept|
+          memo[concept.code_system_name] ||= []
+          memo[concept.code_system_name] << concept.code
+          memo
+        end.each_pair do |code_set, code_list|
+          codes << {"set" => code_set, "values" => code_list}
+        end
+
+        codes
+      end
+
       def self.load_from_xml(doc)
-      	  doc.root.add_namespace_definition("vs","urn:ihe:iti:svs:2008")
-      	 	vs_element = doc.at_xpath("/vs:RetrieveValueSetResponse/vs:ValueSet")
-      	 	if vs_element
-      	 		vs = ValueSet.new(oid: vs_element["ID"], display_name: vs_element["displayName"], version: vs_element["version"])
-      	 		concepts = vs_element.xpath("//vs:Concept").collect do |con|
-      	 				Concept.new(code: con["code"], 
-      	 					code_system_name: con["codeSystemName"], 
-      	 					code_system_version: con["code_system_version"],
-      	 				  display_name: con["displayName"],code_system: con["codeSystem"])
-      	 		   end
-                vs.concepts = concepts
-      	 		return vs
-      	 	end
+        doc.root.add_namespace_definition("vs","urn:ihe:iti:svs:2008")
+        vs_element = doc.at_xpath("/vs:RetrieveValueSetResponse/vs:ValueSet")
+        if vs_element
+          vs = ValueSet.new(oid: vs_element["ID"], display_name: vs_element["displayName"], version: vs_element["version"])
+          concepts = vs_element.xpath("//vs:Concept").collect do |con|
+            Concept.new(code: con["code"], 
+                        code_system_name: normalize_code_set_name(con["codeSystemName"]), 
+                        code_system_version: con["code_system_version"],
+                        display_name: con["displayName"], code_system: con["codeSystem"])
+          end
+          vs.concepts = concepts
+          return vs
+        end
+      end
+
+      def self.normalize_code_set_name(code_set_name)
+        case code_set_name
+        when 'RXNORM'
+          'RxNorm'
+        when 'ICD9CM'
+          'ICD-9-CM'
+        when 'ICD10CM'
+          'ICD-10-CM'
+        when 'ICD10PCS'
+          'ICD-10-PCS'
+        when 'SNOMEDCT'
+          'SNOMED-CT'
+        when 'CDCREC'
+          'CDC Race'
+        when 'HSLOC'
+          'HL7 Healthcare Service Location'
+        else
+          code_set_name
+        end
       end
     end
   end

data/lib/health-data-standards/models/thing_with_codes.rb

@@ -14,7 +14,7 @@ module ThingWithCodes
   def self.convert_codes_to_s(codes)
     codes.map {|code_set, codes| "#{code_set}: #{codes.join(', ')}"}.join(' ')
   end
-
+  
   # Will return a single code and code set if one exists in the code sets that are
   # passed in. Returns a hash with a key of code and code_set if found, nil otherwise
   def preferred_code(preferred_code_sets, codes_attribute=:codes)

data/lib/health-data-standards/util/code_system_helper.rb

@@ -9,7 +9,8 @@ module HealthDataStandards
         #'2.16.840.1.113883.3.88.12.80.32' => 'CPT', # Encounter Type from C32, a subset of CPT
         '2.16.840.1.113883.6.88' =>   'RxNorm',
         '2.16.840.1.113883.6.103' =>  'ICD-9-CM',
-        '2.16.840.1.113883.6.104' =>  'ICD-9-CM',
+        '2.16.840.1.113883.6.104' =>  'ICD-9-PCS',
+        '2.16.840.1.113883.6.4' =>   'ICD-10-PCS',
         '2.16.840.1.113883.6.90' =>   'ICD-10-CM',
         '2.16.840.1.113883.6.14' =>   'HCPCS',
         '2.16.840.1.113883.6.59' =>   'CVX',
@@ -18,9 +19,16 @@ module HealthDataStandards
         '2.16.840.1.113883.3.88.12.80.20' => 'FDA',
         '2.16.840.1.113883.5.14' => 'HL7 ActStatus',
         '2.16.840.1.113883.6.259' => 'HL7 Healthcare Service Location',
+        '2.16.840.1.113883.12.112' => 'DischargeDisposition',
         '2.16.840.1.113883.5.4' => 'HL7 Act Code',
         '2.16.840.1.113883.1.11.18877' => 'HL7 Relationship Code',
-        '2.16.840.1.113883.6.238' => 'CDC Race'
+        '2.16.840.1.113883.6.238' => 'CDC Race',
+        '2.16.840.1.113883.6.177' => 'NLM MeSH'
+      }
+      
+      CODE_SYSTEM_ALIASES = {
+        'FDA SPL' => 'NCI Thesaurus',
+        'HSLOC' => 'HL7 Healthcare Service Location'
       }
       
       # Returns the name of a code system given an oid
@@ -34,6 +42,7 @@ module HealthDataStandards
       # @param [String] the name of the code system
       # @return [String] the oid of the code system
       def self.oid_for_code_system(code_system)
+        code_system = CODE_SYSTEM_ALIASES[code_system] if CODE_SYSTEM_ALIASES[code_system]
         CODE_SYSTEMS.invert[code_system]
       end
       

data/lib/health-data-standards/util/hqmf_template_oid_map.json

@@ -140,8 +140,8 @@
       "status":"resolved",
       "negation":false},
   "2.16.840.1.113883.3.560.1.32":{
-      "definition":"diagnosis_family_history",
-      "status":"",
+      "definition":"diagnosis",
+      "status":"family_history",
       "negation":false},
   "2.16.840.1.113883.3.560.1.23":{
       "definition":"diagnosis",
@@ -156,8 +156,8 @@
       "status":"resolved",
       "negation":true},
   "2.16.840.1.113883.3.560.1.132":{
-      "definition":"diagnosis_family_history",
-      "status":"",
+      "definition":"diagnosis",
+      "status":"family_history",
       "negation":true},
   "2.16.840.1.113883.3.560.1.123":{
       "definition":"diagnosis",
@@ -220,8 +220,8 @@
       "status":"ordered",
       "negation":false},
   "2.16.840.1.113883.3.560.1.199":{
-      "definition":"medication_discharge",
-      "status":"",
+      "definition":"medication",
+      "status":"discharge",
       "negation":false},
   "2.16.840.1.113883.3.560.1.13":{
       "definition":"medication",
@@ -275,10 +275,6 @@
       "definition":"medication",
       "status":"administered",
       "negation":true},
-  "2.16.840.1.113883.3.560.1.19":{
-      "definition":"physical_exam",
-      "status":"",
-      "negation":false},
   "2.16.840.1.113883.3.560.1.18":{
       "definition":"physical_exam",
       "status":"",

data/templates/_code_with_reference.c32.erb

@@ -2,12 +2,12 @@
   if preferred_code 
   code_system_oid = HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(preferred_code['code_set'])
   -%>
-<code code="<%= preferred_code['code'] %>" codeSystem="<%= code_system_oid %>" displayName="<%= entry.description %>">
+<code code="<%= preferred_code['code'] %>" codeSystem="<%= code_system_oid %>" codeSystemName="<%= preferred_code['code_set'] %>" displayName="<%= entry.description %>">
 <% else -%>
 <code nullFlavor="UNK">
 <% end -%>
   <originalText><reference value="#<%= section %>-desc-<%= i %>"/></originalText>
   <% entry.translation_codes(preferred_code_sets).each do |translation| -%>
-  <translation code="<%= translation['code'] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(translation['code_set']) %>" />
+  <translation code="<%= translation['code'] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(translation['code_set']) %>"  codeSystemName="<%= translation['code_set'] %>"/>
   <% end -%>
 </code>

data/templates/html/_entry.html.erb

@@ -15,7 +15,7 @@
         <%
           matches = []
           codes.each do |code|
-            matches.concat(concept_map[set][code].values)
+            matches.concat(concept_map[set][code].values) if concept_map[set][code]
           end
         %>
         <ul id="<%=entry.id%>_<%=set%>" style="display: none; position: absolute; background: #EEE; padding: 10px; padding-left: 30px; width: 600px; z-index: 3000;">
@@ -37,7 +37,7 @@
         <% value.codes.each do |system, vals| %>
           <%= system %>: <%= vals.join(',') %>
         <% end %>
-        <%= (value.description ? "(#{value.description})" : "(UNKNOWN CODED VALUE)")%>
+        <%= (value.description ? "(#{value.description})" : '')%>
         <br/>
       <% else %>
         UNKNOWN VALUE
@@ -46,19 +46,22 @@
   </td>
   <td>
 	  <% 
-	    (entry.attributes.keys.reject {|key| ['codes', 'time', 'description', 'mood_code', 'values', '_id', '_type', 'start_time', 'end_time', 'status_code', 'negationInd', 'negationReason', 'oid'].include? key}).each do |field|
-	    field_value = ThingWithCodes.convert_codes_to_s(entry.attributes[field]) rescue entry.attributes[field].to_s
+	    (entry.attributes.keys.reject {|key| ['codes', 'time', 'description', 'mood_code', 'values', '_id', '_type', 'start_time', 'end_time', 'status_code', 'negationInd', 'oid'].include? key}).each do |field|
+      field_value = convert_field_to_hash(field, entry.attributes[field])
+
     %>
-        <%= field %>: (<b><%= field_value %></b>)
-    <%
-      end
-      if entry.negationInd 
-	      negation_reason = ''
-	      if entry.negationReason
-          negation_reason = ThingWithCodes.convert_codes_to_s(entry.negationReason) rescue entry.negationReason.to_s
-        end
-	  %>
-        negation: <%= negation_reason %>
+        <% if field_value && !field_value.empty? %> 
+        <dl>
+          <% if field_value.is_a? Hash %>
+            <dt><b><%= field.titleize %>:</b></dt>
+	          <% field_value.keys.each do |fieldkey| %>
+	            <dd><%= fieldkey %>: <i><%= field_value[fieldkey] %></i></dd>
+	          <% end %>
+          <% else %>
+            <dt><b><%= field.titleize %></b>: <%= field_value%></dt>
+          <% end %>
+        <dl>
+        <% end %>
     <%
       end
     %>

data/templates/html/_header.html.erb

@@ -26,7 +26,29 @@
     </tr>
     <tr>
       <td bgcolor="#3399ff"><span class="td_label">Contact info</span></td>
-      <td colspan="3"> Pirmary Home: 202 Burlington Rd. Bedford, MA 01730<br />Tel:  +1-781-271-3000</td>
+      <td colspan="3"> 
+      <% if patient.addresses %>
+      <% patient.addresses.each do |addr| %>
+      <% addr.street.each do |street| %>
+        <%= "#{street}," %>
+      <% end %>
+      <%= "#{addr.city}, #{addr.state}, #{addr.zip}." %>
+      <% if addr.use %>
+      (<%= addr.use %>)
+      <% end %>
+      <br />
+      <% end %>
+      <% end %>
+      <% if patient.telecoms %>
+      <% patient.telecoms.each do |telecom| %>
+      <%= telecom.value %>
+      <% if telecom.use %>
+      (<%= telecom.use %>)
+      <% end %>
+      <br />
+      <% end %>
+      <% end %>
+      </td>
     </tr>
   </tbody>
 </table>
@@ -51,7 +73,7 @@
     <tr>
       <td bgcolor="#3399ff"><span class="td_label">Contact info</span></td>
       <td>
-        <br />Tel:  +1-781-271-3000<br />
+        Tel:  +1-781-271-3000<br />
       </td>
     </tr>
   </tbody>

data/templates/html/show.html.erb

@@ -112,7 +112,6 @@
     <div>
       <h3><a href="#" onclick="toggle('table_by_encounter');" id="toggle_button">View By Encounter</a></h3>
     </div>
-    
     <%== render :partial => 'entries_by_section', :locals => {patient: patient, concept_map: concept_map} %>
     <%== render :partial => 'entries_by_encounter', :locals => {patient: patient, concept_map: concept_map} %>
     

data/templates/show.c32.erb

@@ -17,13 +17,20 @@
   <recordTarget>
     <patientRole>
       <id root="Cypress" extension="<%= patient.id %>"/>
-      <addr use="HP">
-        <streetAddressLine>202 Burlington Rd.</streetAddressLine>
-        <city>Bedford</city>
-        <state>MA</state>
-        <postalCode>01730</postalCode>
+      <% patient.addresses.each do |address| %>
+      <addr <%= address.use ? "use='#{address.use}'" : "" %>>
+        <% address.street.each do |street| %>
+        <streetAddressLine><%= street %></streetAddressLine>
+        <% end %>
+        <city><%= address.city %></city>
+        <state><%= address.state %></state>
+        <postalCode><%= address.zip %></postalCode>
+        <country><%= address.country %></country>
       </addr>
-      <telecom value="tel:+1-781-271-3000"/>
+      <% end %>
+      <% patient.telecoms.each do |telecom| %>
+      <telecom value='<%= telecom.value %>' <%= telecom.use ? "use='#{telecom.use}'" : "" %>/>
+      <% end %>
       <patient>
         <name>
           <given><%= patient.first %></given>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,7 +61,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.0.14
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.9
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +153,7 @@ files:
 - lib/health-data-standards/import/c32/encounter_importer.rb
 - lib/health-data-standards/import/c32/immunization_importer.rb
 - lib/health-data-standards/import/c32/insurance_provider_importer.rb
+- lib/health-data-standards/import/c32/locatable_import_utils.rb
 - lib/health-data-standards/import/c32/medical_equipment_importer.rb
 - lib/health-data-standards/import/c32/medication_importer.rb
 - lib/health-data-standards/import/c32/organization_importer.rb