health-data-standards 3.2.7 → 3.2.8

data/Gemfile

@@ -16,7 +16,7 @@ group :test do
   gem 'simplecov', :require => false
   gem 'webmock'
 
-  gem 'minitest'
+  gem "minitest", "~> 4.0"
   gem 'turn', :require => false
   gem 'awesome_print', :require => 'ap'
 

data/README.md

@@ -5,7 +5,7 @@ In addition this project also contains libaries for parsing hqmf documents and f
 Environment
 ===========
 
-This project currently uses Ruby 1.9.2 and is built using [Bundler](http://gembundler.com/). To get all of the dependencies for the project, first install bundler:
+This project currently uses Ruby 1.9.3 and is built using [Bundler](http://gembundler.com/). To get all of the dependencies for the project, first install bundler:
 
     gem install bundler
 
@@ -22,10 +22,19 @@ Project Practices
 
 Please try to follow our [Coding Style Guides](http://github.com/eedrummer/styleguide). Additionally, we will be using git in a pattern similar to [Vincent Driessen's workflow](http://nvie.com/posts/a-successful-git-branching-model/). While feature branches are encouraged, they are not required to work on the project.
 
+Change Log
+==========
+
+3.2.8 - August 23, 2013
+
+* Bug fixes for QRDA Category III generation
+* Import for insurance providers from QRDA Category I documents
+* Consolidated code for dealing with code system names
+
 License
 =======
 
-Copyright 2011 The MITRE Corporation
+Copyright 2013 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/health-data-standards/export/helper/cat1_view_helper.rb

@@ -4,14 +4,16 @@ module HealthDataStandards
       module Cat1ViewHelper
         include HealthDataStandards::Export::Helper::ScoopedViewHelper
 
-        def render_data_criteria(dc_oid, vs_oid, entries)
+        def render_data_criteria(dc, entries)
           html_array = entries.map do |entry|
               bundle_id = entry.record ? entry.record["bundle_id"] : nil
-              vs_map = (value_set_map(bundle_id) || {})[vs_oid]
-              binding.pry if vs_map.nil? || vs_map.empty?
-              render(:partial => HealthDataStandards::Export::QRDA::EntryTemplateResolver.partial_for(dc_oid, vs_oid), :locals => {:entry => entry,
-                                                                                                                                   :value_set_oid => vs_oid,
-                                                                                                                                   :value_set_map => vs_map})
+              vs_map = (value_set_map(bundle_id) || {})[dc['value_set_oid']]
+              render(:partial => HealthDataStandards::Export::QRDA::EntryTemplateResolver.partial_for(dc['data_criteria_oid'], dc['value_set_oid']), :locals => {:entry => entry,
+                                                                                                                                   :data_criteria => dc['data_criteria'],
+                                                                                                                                   :value_set_oid => dc['value_set_oid'],
+                                                                                                                                   :value_set_map => vs_map,
+                                                                                                                                   :result_oids => dc["result_oids"],
+                                                                                                                                   :field_oids => dc["field_oids"]})
           end
           html_array.join("\n")
         end
@@ -21,7 +23,7 @@ module HealthDataStandards
           udcs = unique_data_criteria(measures)
           data_criteria_html = udcs.map do |udc|
             entries = entries_for_data_criteria(udc['data_criteria'], patient)
-            render_data_criteria(udc['data_criteria_oid'], udc['value_set_oid'], entries)          
+            render_data_criteria(udc, entries)          
           end
           data_criteria_html.compact.join("\n")
         end
@@ -34,6 +36,21 @@ module HealthDataStandards
           end
         end
 
+        def oid_for_code(codedValue, valueset_oids,  bundle_id = nil)
+          valueset_oids ||=[]
+          code = codedValue["code"]
+          code_system = codedValue["code_set"]
+          vs_map = (value_set_map(bundle_id) || {})
+          valueset_oids.each do |vs_oid|
+            oid_list = (vs_map[vs_oid] || [])
+            oid_map = Hash[oid_list.collect{|x| [x["set"],x["values"]]}]
+            if (oid_map[code_system] || []).index code
+              return vs_oid
+            end
+          end
+          return nil
+        end
+
       end
     end
   end

data/lib/health-data-standards/export/helper/scooped_view_helper.rb

@@ -15,14 +15,31 @@ module HealthDataStandards
         # one for the value set oid and one for the data criteria itself
         def unique_data_criteria(measures)
           all_data_criteria = measures.map {|measure| measure.all_data_criteria}.flatten
-          unioned_data_criteria = all_data_criteria.map do |data_criteria|
+          mapped_data_criteria = {}
+          all_data_criteria.each do |data_criteria|
             data_criteria_oid = HQMFTemplateHelper.template_id_by_definition_and_status(data_criteria.definition, 
                                                                               (data_criteria.status || ""),
                                                                               data_criteria.negation)
             value_set_oid = data_criteria.code_list_id
-            {'data_criteria_oid' => data_criteria_oid, 'value_set_oid' => value_set_oid, 'data_criteria' => data_criteria}
+            dc = {'data_criteria_oid' => data_criteria_oid, 'value_set_oid' => value_set_oid}
+            mapping = mapped_data_criteria[dc] ||= {'result_oids' => [], 'field_oids' =>{}, 'data_criteria' => data_criteria}
+            
+            if data_criteria.field_values
+              data_criteria.field_values.each_pair do |field,descr|
+                if descr && descr.type == "CD"
+                  (mapping['field_oids'][field] ||= []) << descr.code_list_id
+                end
+              end
+            end
+
+            if data_criteria.value && data_criteria.value.type == "CD"
+              mapping["result_oids"] << data_criteria.value.code_list_id
+            end
+
+            # {'data_criteria_oid' => data_criteria_oid, 'value_set_oid' => value_set_oid, 'data_criteria' => data_criteria}
           end
-          unioned_data_criteria.uniq_by {|thingy| [thingy['data_criteria_oid'], thingy['value_set_oid']]}
+          # unioned_data_criteria.uniq_by {|thingy| [thingy['data_criteria_oid'], thingy['value_set_oid']]}
+          mapped_data_criteria.collect{|dc| dc[0].merge dc[1] }
         end
 
         # Returns true if the supplied entry matches any of the supplied data criteria, false otherwise
@@ -54,6 +71,7 @@ module HealthDataStandards
                                                                                        data_criteria.negation)
           HealthDataStandards.logger.warn("Looking for dc [#{data_criteria_oid}]")
           filtered_entries = []
+          entries = []
           case data_criteria_oid
           when '2.16.840.1.113883.3.560.1.404'
             filtered_entries = handle_patient_expired(patient)
@@ -62,7 +80,7 @@ module HealthDataStandards
           when '2.16.840.1.113883.3.560.1.405'
             filtered_entries = handle_payer_information(patient)
           else
-            entries = patient.entries_for_oid(data_criteria_oid)
+            entries.concat patient.entries_for_oid(data_criteria_oid)
 
               case data_criteria_oid
               when '2.16.840.1.113883.3.560.1.5' 
@@ -80,6 +98,7 @@ module HealthDataStandards
             if codes.empty?
               HealthDataStandards.logger.warn("No codes for #{data_criteria.code_list_id}")
             end
+            entries.uniq!
             filtered_entries = entries.find_all do |entry|
               # This special case is for when the code list is a reason
               if data_criteria.code_list_id =~ /2\.16\.840\.1\.113883\.3\.526\.3\.100[7-9]/
@@ -117,6 +136,19 @@ module HealthDataStandards
           patient.insurance_providers
         end
 
+        def code_in_valueset( code, valuesets=[],bundle_id=nil)
+          unless(bundle_id.nil?)
+            bundle = Bundle.find(bundle_id)
+            vs_matches = []
+            valuesets.each do |vs|
+              vset = bundle.valuesets.where({"oid"=>vs}).first
+              if vset && vset.concepts.where({"code" => code["code"], "codeSystem" => code["code_system"]}).first
+                vs_matches << vs
+              end
+            end
+            return vs_matches
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,22 @@
+module HealthDataStandards
+  module Import
+    module Cat1
+      class InsuranceProviderImporter < CDA::SectionImporter
+      
+        def initialize
+          super(CDA::EntryFinder.new("//cda:observation[cda:templateId/@root = '2.16.840.1.113883.10.20.24.3.55']"))
+          @check_for_usable = false # needs to be this way becase InsuranceProvider does not respond
+                                    # to usable?
+        end
+
+        def create_entry(payer_element, nrh = CDA::NarrativeReferenceHandler.new)
+          ip = InsuranceProvider.new
+          value_element = payer_element.at_xpath('cda:value')
+          ip.codes = { 'SOP' => [value_element['code']] } if value_element
+          ip
+        end
+
+      end
+    end
+  end
+end

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

@@ -64,6 +64,8 @@ module HealthDataStandards
 
           @section_importers[:social_history] = [generate_importer(TobaccoUseImporter, nil, '2.16.840.1.113883.3.560.1.1001', 'completed')]
 
+          @section_importers[:insurance_providers] = [generate_importer(InsuranceProviderImporter, nil, '2.16.840.1.113883.3.560.1.405')]
+
         end 
 
         def parse_cat1(doc)

data/lib/health-data-standards/models/cqm/measure.rb

@@ -71,15 +71,15 @@ module HealthDataStandards
       end
 
       def smoking_gun_data(patient_cache_filter={})
-        ::Measure.calculate_smoking_gun_data(self.hqmf_id, patient_cache_filter)
+        ::Measure.calculate_smoking_gun_data(self["bundle_id"], self.hqmf_id, patient_cache_filter)
       end
       # Calculate the smoking gun data for the given hqmf_id with the given patient_cache_filter
       # The  filter will allow us to segment the cache by things like test_id required for Cypress.
 
-      def self.calculate_smoking_gun_data(hqmf_id, patient_cache_filter={})
+      def self.calculate_smoking_gun_data(bundle_id, hqmf_id, patient_cache_filter={})
         population_keys = ('a'..'zz').to_a
         values = {}
-        measure = Measure.top_level.where({hqmf_id: hqmf_id}).first
+        measure = Measure.top_level.where({hqmf_id: hqmf_id, bundle_id: bundle_id}).first
         sub_ids = []
         hqmf_measure = measure.as_hqmf_model
         population_codes = []
@@ -139,7 +139,7 @@ module HealthDataStandards
               qrda_template = 'N/A'
             end # end begin recue
              description = "#{HQMF::DataCriteria.title_for_template_id(template).titleize}: #{data_criteria.title}"
-             result << {description: description, oid: value_set_oid, template: qrda_template}
+             result << {description: description, oid: value_set_oid, template: qrda_template, rationale: rationale[data_criteria.id]}
             if data_criteria.temporal_references
               data_criteria.temporal_references.each do |temporal_reference|
                 if temporal_reference.reference.id != 'MeasurePeriod'

data/lib/health-data-standards/models/cqm/patient_cache.rb

@@ -1,4 +1,4 @@
-module HealthDataStandards
+ module HealthDataStandards
 	module CQM
 	  class PatientCache
 			include Mongoid::Document

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

@@ -1,4 +1,4 @@
-class InsuranceProvider
+class InsuranceProvider < Entry
   include Mongoid::Document
   include ThingWithCodes
   

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

@@ -39,8 +39,9 @@ module HealthDataStandards
         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|
+            code_system_name = HealthDataStandards::Util::CodeSystemHelper::CODE_SYSTEMS[con["codeSystem"]] || con["codeSystemName"]
             Concept.new(code: con["code"], 
-                        code_system_name: normalize_code_set_name(con["codeSystemName"]), 
+                        code_system_name: code_system_name,
                         code_system_version: con["code_system_version"],
                         display_name: con["displayName"], code_system: con["codeSystem"])
           end
@@ -48,47 +49,6 @@ module HealthDataStandards
           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
-      def self.denormalize_code_set_name(code_set_name)
-        case code_set_name
-        when'RxNorm'
-          'RXNORM'
-        when'ICD-9-CM'
-          'ICD9CM'
-        when'ICD-10-CM'
-          'ICD10CM'
-        when'ICD-10-PCS'
-          'ICD10PCS'
-        when'SNOMED-CT'
-          'SNOMEDCT'
-        when'CDC Race'
-          'CDCREC'
-        when'HL7 Healthcare Service Location'
-          'HSLOC'
-        else
-          code_set_name
-        end
-      end
     end
   end
 end

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

@@ -12,7 +12,8 @@ module HealthDataStandards
         '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.14' =>   'HCP',
+        '2.16.840.1.113883.6.285' =>   'HCPCS',
         '2.16.840.1.113883.5.2' => "HL7 Marital Status",
         '2.16.840.1.113883.12.292' => 'CVX',
         '2.16.840.1.113883.5.83' => 'HITSP C80 Observation Status',
@@ -32,7 +33,8 @@ module HealthDataStandards
         '2.16.840.1.113883.3.88.12.80.33' => "NUBC",
         '2.16.840.1.113883.1.11.78' => "HL7 Observation Interpretation",
         '2.16.840.1.113883.3.221.5' => "Source of Payment Typology",
-        '2.16.840.1.113883.6.13' => 'CDT'
+        '2.16.840.1.113883.6.13' => 'CDT',
+        '2.16.840.1.113883.18.2' => 'AdministrativeSex'
       }
       
       CODE_SYSTEM_ALIASES = {

data/lib/health-data-standards.rb

@@ -154,6 +154,7 @@ require_relative 'health-data-standards/import/cat1/entry_package'
 require_relative 'health-data-standards/import/cat1/lab_result_importer'
 require_relative 'health-data-standards/import/cat1/ecog_status_importer'
 require_relative 'health-data-standards/import/cat1/symptom_active_importer'
+require_relative 'health-data-standards/import/cat1/insurance_provider_importer'
 
 require_relative 'health-data-standards/models/cqm/aggregate_objects'
 require_relative 'health-data-standards/models/cqm/query_cache'

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.11.cat1.erb

@@ -14,7 +14,7 @@
       <!-- Attribute: discharge datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :reason_oids=>field_oids["ORDINALITY"]}) %>
     
     <%== code_display(entry, {'tag_name' => 'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'],
                                                     'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\""}) %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.13.cat1.erb

@@ -15,7 +15,7 @@
     <!-- Attribute: Stop Datetime -->
     <high <%= value_or_null_flavor(entry.end_time) %>/>
   </effectiveTime>
-  <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
+  <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINALITY"]}) %>
 
   <%== code_display(entry, 'value_set_map' => value_set_map,'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'LOINC'], 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
   <!-- Status -->

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.14.cat1.erb

@@ -14,7 +14,7 @@
       <!-- Attribute: Stop Datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINALITY"]}}) %>
 
     <%== code_display(entry, 'value_set_map' => value_set_map,'tag_name' => 'value', 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'CPT'],
                              'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.18.cat1.erb

@@ -1,3 +1,6 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
 <entry>
   <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
     <!-- Consolidated Procedure Activity Observation templateId 
@@ -15,7 +18,8 @@
       <!-- Attribute: End Datetime -->
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
-</entry>
+</entry>
+<% end %>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.20.cat1.erb

@@ -14,7 +14,7 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.28.cat1.erb

@@ -15,6 +15,6 @@
     </effectiveTime>
 
     <!-- Result -->
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.3.cat1.erb

@@ -20,6 +20,6 @@
     <participant typeCode="IRCP">
       <participantRole classCode="PAT"/>
     </participant>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </act>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.32.cat1.erb

@@ -10,6 +10,6 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry ,:reason_oids=>field_oids["REASON"]}) %>
   </act>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.38.cat1.erb

@@ -11,6 +11,6 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.4.cat1.erb

@@ -23,6 +23,6 @@
         <code code="158965000" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Medical Practitioner"/>
       </participantRole>
     </participant>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </act>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.40.cat1.erb

@@ -13,6 +13,6 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.41.cat1.erb

@@ -13,7 +13,7 @@
         <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     
-    <%== render(:partial => 'medication_details', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
 
 
     <% if entry.product_form.present? -%>
@@ -33,6 +33,6 @@
         </manufacturerOrganization>
       </manufacturedProduct>
     </consumable>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </substanceAdministration>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.42.cat1.erb

@@ -20,7 +20,7 @@
           <low <%= value_or_null_flavor(entry.start_time) %>/>
           <high <%= value_or_null_flavor(entry.end_time) %>/>
         </effectiveTime>
-        <%== render(:partial => 'medication_details', :locals => {:entry => entry}) %>
+        <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
         <consumable>
           <manufacturedProduct classCode="MANU">
             <!-- Medication Information (consolidation) template -->
@@ -33,6 +33,6 @@
         </consumable>
       </substanceAdministration>
     </entryRelationship>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
   </act>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.47.cat1.erb

@@ -11,7 +11,7 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-     <%== render(:partial => 'medication_details', :locals => {:entry => entry}) %>
+     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
     <consumable>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->
@@ -22,6 +22,6 @@
         </manufacturedMaterial>
       </manufacturedProduct>
     </consumable>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </substanceAdministration>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.57.cat1.erb

@@ -7,13 +7,12 @@
     <templateId root="2.16.840.1.113883.10.20.24.3.57"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
     <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>    
-
     <statusCode code="completed"/>
 
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.59.cat1.erb

@@ -12,6 +12,6 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first]}) %>
+    <%== render(:partial => 'result_value', :locals => {:values => [entry.values.first], :result_oids=>result_oids}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.63.cat1.erb

@@ -18,6 +18,6 @@
         <id nullFlavor="NA"/>
       </assignedAuthor>
     </author>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </procedure>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.64.cat1.erb

@@ -12,8 +12,8 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <%== render(:partial => 'ordinality', :locals => {:entry => entry}) %>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINALITY"]}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
     <% if entry.respond_to?(:incision_time) && entry.incision_time.present? -%>
     <entryRelationship typeCode="REFR">
       <procedure classCode="PROC" moodCode="EVN">

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.66.cat1.erb

@@ -27,7 +27,7 @@
         <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         <statusCode code="completed"/>
         <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>
-        <%== render(:partial => 'result_value', :locals => {:values => entry.values}) %>
+        <%== render(:partial => 'result_value', :locals => {:values => entry.values, :result_oids=>result_oids} ) %>
       </observation>
     </entryRelationship>
   </procedure>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.69.cat1.erb

@@ -14,15 +14,19 @@
     </effectiveTime>
 
     <% ev = entry.values.first
-       if ev.present? && ev.respond_to?(:scalar) 
-        if is_num?(ev.scalar) -%>
+       if ev.present? 
+        if ev.respond_to?(:scalar) 
+          if is_num?(ev.scalar) -%>
     <value xsi:type="INT" value="<%= ev.scalar %>"/>
-        <% else -%>
-        <value xsi:type="ST"><%= ev.scalar%></value>
-        <% end %>  
+         <% else -%>
+    <value xsi:type="ST"><%= ev.scalar%></value>
+         <% end %>  
+       <% else %>
+       <%== code_display(entry, 'tag_name'=>'value', 'value_set_map' => value_set_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT'],'extra_content' =>'xsi:type="CD"') %>
+       <% end %>  
     <% else -%>
     <value  xsi:type="CD" nullFlavor="UNK"/>
     <% end -%>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </observation>
 </entry>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.7.cat1.erb

@@ -25,6 +25,6 @@
         </playingDevice>
       </participantRole>
     </participant>
-    <%== render(:partial => 'reason', :locals => {:entry => entry}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </procedure>
 </entry>

data/templates/cat1/_medication_details.cat1.erb

@@ -1,7 +1,13 @@
 <% if entry.respond_to?(:route) && entry.route.present? 
       # hard coded to NCI Thesaurus for the code system since Cat I mandates that
+      vset = oid_for_code(entry.route,route_oids, entry.record["bundle_id"])
 -%>
-<routeCode code="<%= entry.route['code'] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.route['code_system']) %>"/>
+<routeCode code="<%= entry.route['code'] %>" 
+           codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.route['code_system']) %>" 
+            <% if vset -%>
+              sdtc:valueSet="<%= vset %>"
+            <% end -%>
+           />
 <% end -%>
 
 <% if entry.respond_to?(:dose) && entry.dose.present? -%>

data/templates/cat1/_ordinality.cat1.erb

@@ -1,4 +1,10 @@
-<% if entry.respond_to?(:ordinality) && entry.ordinality.present? -%>
+<% if entry.respond_to?(:ordinality) && entry.ordinality.present? 
+  vset = oid_for_code(entry.ordinality,ordinality_oids || [], entry.record["bundle_id"]) 
+  -%>
 <priorityCode  code="<%= entry.ordinality['code'] %>" 
-              codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.ordinality['codeSystem'] || entry.ordinality['code_system']) %>"/>
+              codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.ordinality['codeSystem'] || entry.ordinality['code_system']) %>"
+              <% if vset -%>
+              sdtc:valueSet="<%= vset %>"
+              <% end -%>
+              />
 <% end -%>

data/templates/cat1/_reason.cat1.erb

@@ -1,4 +1,6 @@
-<% if entry.negation_reason.present? -%>
+<% if entry.negation_reason.present? 
+      vset = oid_for_code(entry.negation_reason,reason_oids, entry.record["bundle_id"])
+  -%>
 <entryRelationship typeCode="RSON">
   <observation classCode="OBS" moodCode="EVN">
     <templateId root="2.16.840.1.113883.10.20.24.3.88"/>  
@@ -10,7 +12,11 @@
     <effectiveTime <%= value_or_null_flavor(entry.start_time) %>/>
     <value xsi:type="CD" 
          code="<%= entry.negation_reason['code'] %>" 
-         codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.negation_reason['codeSystem'] || entry.negation_reason['code_system']) %>"/>
+         codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.negation_reason['codeSystem'] || entry.negation_reason['code_system']) %>"
+        <% if vset -%>
+          sdtc:valueSet="<%= vset %>"
+        <% end -%>
+         />
   </observation>
 </entryRelationship>
 <% end -%>

data/templates/cat1/_result_value.cat1.erb

@@ -1,8 +1,17 @@
 <% values.compact!
    if !values.empty?
       values.each do |ev| 
-	     if ev.respond_to?(:codes) -%>
-	<%== code_display(ev, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\"") %>
+	     if ev.respond_to?(:codes) 
+        extra_content = 'xsi:type="CD"'
+        if defined? result_oids
+          preferred_code = ev.preferred_code(['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'])
+          oid = oid_for_code(preferred_code,result_oids, ev.entry.record["bundle_id"])
+          if oid
+            extra_content += " sdtc:valueSet='#{oid}'"
+          end
+        end
+        -%>
+	<%== code_display(ev, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM'], 'tag_name' => 'value', 'extra_content' => extra_content) %>
 	<%   elsif ev.respond_to?(:scalar) -%>
 	<%     if is_num?(ev.scalar) -%>
 	<value xsi:type="PQ" value="<%= ev.scalar %>" <% if ev.units && (ev.units != "") -%>unit="<%= ev.units %>"<% end -%>/>

data/templates/cat3/_measure_data.cat3.erb

@@ -19,7 +19,7 @@
         displayName="rate aggregation" 
         codeSystem="2.16.840.1.113883.5.4" 
         codeSystemName="ActCode"/>
-      <value xsi:type="INT" value="<%= aggregate_count.population_count(population_type, population_id) %>"/>
+      <value xsi:type="INT" value="<%= aggregate_count.population_count(population_type, population_id).round %>"/>
       <methodCode code="COUNT" 
         displayName="Count" 
         codeSystem="2.16.840.1.113883.5.84" 
@@ -48,7 +48,7 @@
                 displayName="rate aggregation" 
                 codeSystem="2.16.840.1.113883.5.4" 
                 codeSystemName="ActCode"/>
-          <value xsi:type="INT" value="<%= strat.population_count(population_type, population_id) %>"/>
+          <value xsi:type="INT" value="<%= strat.population_count(population_type, population_id).round %>"/>
           <methodCode code="COUNT" 
                       displayName="Count" 
                       codeSystem="2.16.840.1.113883.5.84" 

data/templates/cat3/_reporting_parameters.cat3.erb

@@ -0,0 +1,28 @@
+      <component>
+        <section>
+          <!-- This is the templateId for Reporting Parameters section -->
+          <templateId root="2.16.840.1.113883.10.20.17.2.1"/>
+
+          <!-- This is the templateId for the QRDA III Reporting Parameters Section -->
+          <templateId root="2.16.840.1.113883.10.20.27.2.2"/>
+
+          <code code="55187-9" codeSystem="2.16.840.1.113883.6.1"/>
+          <title>Reporting Parameters</title>
+          <text>
+            <list>
+              <item>Reporting period: <%= start_date.to_formatted_s(:long_ordinal) %> - <%= end_date.to_formatted_s(:long_ordinal) %></item>
+            </list>
+          </text>
+          <entry typeCode="DRIV">
+            <act classCode="ACT" moodCode="EVN">
+              <!-- This is the templateId for Reporting Parameteres Act -->
+              <templateId root="2.16.840.1.113883.10.20.17.3.8"/>
+              <code code="252116004" codeSystem="2.16.840.1.113883.6.96" displayName="Observation Parameters"/>
+              <effectiveTime>
+                <low value="<%= start_date.to_formatted_s(:number) %>"/>
+                <high value="<%= end_date.to_formatted_s(:number) %>"/>
+              </effectiveTime>
+            </act>
+          </entry>
+        </section>
+      </component>

data/templates/cat3/_supplemental_data.cat3.erb

@@ -25,7 +25,7 @@
                 displayName="rate aggregation" 
                 codeSystem="2.16.840.1.113883.5.4" 
                 codeSystemName="ActCode"/>
-          <value xsi:type="INT" value="<%= count %>"/>
+          <value xsi:type="INT" value="<%= count.round %>"/>
           <methodCode code="COUNT" 
                       displayName="Count" 
                       codeSystem="2.16.840.1.113883.5.84" 

data/templates/cat3/show.cat3.erb

@@ -94,7 +94,7 @@ CDA Body
 QRDA Category III Reporting Parameters 
 ********************************************************
 -->
-<%== cat1_renderer.render :partial => 'reporting_parameters', :locals => {:start_date => start_date, :end_date => end_date} %>
+<%== render :partial => 'reporting_parameters', :locals => {:start_date => start_date, :end_date => end_date} %>
       <!-- 
 ********************************************************
 Measure Section
@@ -144,7 +144,9 @@ Measure Section
               <% end -%>
               <% result.top_level_populations.each do |pop| 
                    unless pop.type == 'OBSERV' -%>
+              <component>
               <%== render :partial => 'measure_data', :locals => {:aggregate_count => result, :population_type => pop.type, :population_id => pop.id} %>
+              </component>
               <%   end
                  end -%>
             </organizer>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 description: A library for generating and consuming various healthcare related formats.
   This includes HITSP C32, ASTM CCR and PQRI.
 email: talk@projectpophealth.org
@@ -216,6 +216,7 @@ files:
 - lib/health-data-standards/import/cat1/encounter_order_importer.rb
 - lib/health-data-standards/import/cat1/entry_package.rb
 - lib/health-data-standards/import/cat1/gestational_age_importer.rb
+- lib/health-data-standards/import/cat1/insurance_provider_importer.rb
 - lib/health-data-standards/import/cat1/lab_order_importer.rb
 - lib/health-data-standards/import/cat1/lab_result_importer.rb
 - lib/health-data-standards/import/cat1/medication_active_importer.rb
@@ -438,6 +439,7 @@ files:
 - templates/cat3/_continuous_variable_value.cat3.erb
 - templates/cat3/_measure_data.cat3.erb
 - templates/cat3/_performance_rate.cat3.erb
+- templates/cat3/_reporting_parameters.cat3.erb
 - templates/cat3/_supplemental_data.cat3.erb
 - templates/cat3/show.cat3.erb
 - templates/ccda/_allergies.ccda.erb