health-data-standards 3.2.5 → 3.2.6

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

@@ -17,6 +17,7 @@ module HealthDataStandards
         end
 
         def render_patient_data(patient, measures)
+          HealthDataStandards.logger.warn("Generating CAT I for #{patient.first} #{patient.last}")
           udcs = unique_data_criteria(measures)
           data_criteria_html = udcs.map do |udc|
             entries = entries_for_data_criteria(udc['data_criteria'], patient)

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

@@ -51,7 +51,8 @@ module HealthDataStandards
         def entries_for_data_criteria(data_criteria, patient)
           data_criteria_oid = HQMFTemplateHelper.template_id_by_definition_and_status(data_criteria.definition, 
                                                                                       data_criteria.status || '',
-                                                                                      data_criteria.negation)
+                                                                                       data_criteria.negation)
+          HealthDataStandards.logger.warn("Looking for dc [#{data_criteria_oid}]")
           filtered_entries = []
           case data_criteria_oid
           when '2.16.840.1.113883.3.560.1.404'
@@ -62,6 +63,19 @@ module HealthDataStandards
             filtered_entries = handle_payer_information(patient)
           else
             entries = patient.entries_for_oid(data_criteria_oid)
+
+              case data_criteria_oid
+              when '2.16.840.1.113883.3.560.1.5' 
+                #special case handling for Lab Test: Performed being implicitly available through a Lab Test: Result
+                entries.concat patient.entries_for_oid('2.16.840.1.113883.3.560.1.12')
+              when '2.16.840.1.113883.3.560.1.12'
+                entries.concat patient.entries_for_oid('2.16.840.1.113883.3.560.1.5')  
+              when '2.16.840.1.113883.3.560.1.6' 
+                 entries.concat patient.entries_for_oid('2.16.840.1.113883.3.560.1.63')
+              when  '2.16.840.1.113883.3.560.1.63' 
+                 entries.concat patient.entries_for_oid('2.16.840.1.113883.3.560.1.6')
+              end
+ 
             codes = (value_set_map(patient["bundle_id"])[data_criteria.code_list_id] || [])
             if codes.empty?
               HealthDataStandards.logger.warn("No codes for #{data_criteria.code_list_id}")

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

@@ -29,6 +29,3 @@
   </procedure>
 </entry>
 
-<% unless entry.values.compact.empty? %>
-  <%== render(:partial => '2.16.840.1.113883.10.20.24.3.66', :locals => {:entry => entry,:value_set_oid=>value_set_oid,:value_set_map=>value_set_map }) %>
-<% end -%>  

data/templates/cat1/_record_target.cat1.erb

@@ -5,7 +5,7 @@
       <% 
       # get the pateint id , treate it as a hex number, turn it to a string and strip the last 9 characters off of it
         hic = patient.id.to_s.hex.to_s
-        hic.slice!(hic.length-9,9)
+        hic = hic.slice(hic.length-9,9)
       %>
       <id extension="<%= hic %>A" root="2.16.840.1.113883.4.572"/>
       <addr use="HP">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client