health-data-standards 3.1.1 → 3.2.0

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

@@ -5,7 +5,7 @@
     <!-- Risk Category Assessment -->
     <templateId root="2.16.840.1.113883.10.20.24.3.69"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
-    <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== 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>

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

@@ -21,7 +21,7 @@
     <participant typeCode="DEV">
       <participantRole classCode="MANU">
         <playingDevice classCode="DEV">
-          <%== code_display(entry, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'value_set_map' => value_set_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </playingDevice>
       </participantRole>
     </participant>

data/templates/cat1/_2.16.840.1.113883.10.20.24.3.76.cat1.erb

@@ -15,7 +15,7 @@
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     
-     <%== code_display(entry, 'preferred_code_sets' => ['SNOMED-CT'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
+     <%== code_display(entry, 'value_set_map' => value_set_map,'preferred_code_sets' => ['SNOMED-CT'], 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\"") %>
     <!-- Status -->
     <entryRelationship typeCode="REFR">
       <observation classCode="OBS" moodCode="EVN">

data/templates/cat1/_measures.cat1.erb

@@ -19,7 +19,6 @@
                   <th>eMeasure Title</th>
                   <th>Version neutral identifier</th>
                   <th>eMeasure Version Number</th>
-                  <th>NQF eMeasure Number</th>
                   <th>Version specific identifier</th>
                 </tr>
               </thead>
@@ -29,7 +28,6 @@
                   <td><%= measure.title %></td>
                   <td><%= measure.hqmf_set_id %></td>
                   <td><%= measure.hqmf_version_number %></td>
-                  <td><%= measure.id %></td>
                   <td><%= measure.hqmf_id %></td>
                   <td></td>
                 </tr>

data/templates/cat1/_medication_details.cat1.erb

@@ -1,9 +1,9 @@
-<% if entry.route.present? 
+<% if entry.respond_to?(:route) && entry.route.present? 
       # hard coded to NCI Thesaurus for the code system since Cat I mandates that
 -%>
-<routeCode code="<%= entry.route['code'] %>" codeSystem="2.16.840.1.113883.3.26.1.1"/>
+<routeCode code="<%= entry.route['code'] %>" codeSystem="<%= entry.route['codeSystem'] %>"/>
 <% end -%>
 
-<% if entry.dose.present? -%>
+<% if entry.respond_to?(:dose) && entry.dose.present? -%>
 <doseQuantity value="<%= entry.dose['value']%>"/>
 <% end -%>

data/templates/cat1/_patient_data.cat1.erb

@@ -10,5 +10,8 @@
 
           </text>
           <%== render_patient_data(patient, measures) %>
+          <% patient.insurance_providers.each do |entry| %>
+              <%== render(:partial => '2.16.840.1.113883.10.20.24.3.55', :locals => {:entry => entry}) %>
+          <% end %>
         </section>
       </component>

data/templates/cat1/_record_target.cat1.erb

@@ -2,7 +2,12 @@
     <patientRole>
       <!-- id root="Cypress" extension="<%= patient.id %>"/ -->
       <!-- Fake Medicare HIC number -->
-      <id extension="12345" root="2.16.840.1.113883.4.572"/>
+      <% 
+      # 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)
+      %>
+      <id extension="<%= hic %>A" root="2.16.840.1.113883.4.572"/>
       <addr use="HP">
         <streetAddressLine>202 Burlington Rd.</streetAddressLine>
         <city>Bedford</city>

data/templates/cat1/_result_value.cat1.erb

@@ -1,16 +1,19 @@
-<% ev = entry.values.first
-   if ev.present?
-     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\"") %>
-<%   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 -%>/>
-<%     elsif is_bool?(ev.scalar)%>
-<value xsi:type="BL" value="<%= ev.scalar %>" />
-<%     else -%>
-<value xsi:type="ST" ><%= ev.scalar %></value> 
-<%     end 
-     end
+<% 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\"") %>
+	<%   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 -%>/>
+	<%     elsif is_bool?(ev.scalar)%>
+	<value xsi:type="BL" value="<%= ev.scalar %>" />
+	<%     else -%>
+	<value xsi:type="ST" ><%= ev.scalar %></value> 
+	<%     end 
+	     end
+      end
+   # else is empty   
    else -%>
 <value xsi:type="CD" nullFlavor="UNK"/>
 <% end -%>

data/templates/html/_entries_by_section.html.erb

@@ -1,13 +1,21 @@
 <div id="patient_information_by_section" style="display:block">
   <% 
     entries_by_section = {}
+    udcs = nil
+    if measures.length > 0
+      udcs = unique_data_criteria(measures) 
+    end
     Record::Sections.each do |section|
 	    if section != :insurance_providers
-	      patient.send(section).each do |entry|
-	        decoded_section = decode_hqmf_section(section, entry.oid)
-	        entries_by_section[decoded_section] ||= []
-	        entries_by_section[decoded_section] << entry
-	      end if patient.respond_to? section
+	       if patient.respond_to? section
+           patient.send(section).each do |entry|
+            if udcs.nil? || entry_matches_criteria(entry, udcs)
+              decoded_section = decode_hqmf_section(section, entry.oid)
+              entries_by_section[decoded_section] ||= []
+              entries_by_section[decoded_section] << entry
+            end
+          end
+        end
 	    end
     end
   %>

data/templates/html/show.html.erb

@@ -133,8 +133,10 @@
     <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, code_map: code_map} %>
-    <%== render :partial => 'entries_by_encounter', :locals => {patient: patient, code_map: code_map} %>
+    <%== render :partial => 'entries_by_section', :locals => {patient: patient, code_map: code_map, measures: measures} %>
+    <% if measures.length==0 %>
+    <%== render :partial => 'entries_by_encounter', :locals => {patient: patient, code_map: code_map, measures: measures} %>
+    <% end %>
     
     <br /><br />
     <br /><br />

data/templates/metadata.hdata.erb

@@ -1,35 +1,38 @@
-<Document xmlns="http://www.hl7.org/schemas/hdata/2009/11/metadata">
-  <MediaType>application/xml</MediaType>
-  <MediaType>application/json</MediaType>
+<hrf-md:DocumentMetaData <% if namespace %>xmlns:hrf-md="http://www.hl7.org/schemas/hdata/2009/11/metadata"<%end%>>
+  <% if metadata.mime_types %> 
+    <% metadata.mime_types.each do |mt| %>
+      <hrf-md:MediaType>mt</hrf-md:MediaType>
+    <% end %>
+  <% end %>
   <% metadata.pedigrees.each do |pedigree| %>
     <%== render :partial => "pedigree", locals: {pedigree: pedigree}%>
   <% end %>
-  <Title><%= entry.id %></Title>
-  <LinkedDocuments>
+  <hrf-md:Title><%= entry.id %></hrf-md:Title>
+  <hrf-md:LinkedDocuments>
     <% metadata.linked_documents.each do |link| %>
-    <Link>
-      <Target <% if link.extension %> targetExtension="<%=link.extension%>" <% end %>><%= link.uri %></Target>
-    </Link>
+    <hrf-md:Link>
+      <hrf-md:Target <% if link.extension %> targetExtension="<%=link.extension%>" <% end %>><%= link.href %></hrf-md:Target>
+    </hrf-md:Link>
     <% end %>
-  </LinkedDocuments>
-  <RecordDate>
-    <CreatedDateTime><%= metadata.original_creation_time%></CreatedDateTime>
-    <Modified>
+  </hrf-md:LinkedDocuments>
+  <hrf-md:RecordDate>
+    <hrf-md:CreatedDateTime><%= metadata.original_creation_time%></hrf-md:CreatedDateTime>
+    <hrf-md:Modified>
       <% metadata.modified_dates.each do |md| %>
-        <ModifiedInfo>
-          <ChangeDateTime><%= md.timestamp %></ChangeDateTime>
+        <hrf-md:ModifiedInfo>
+          <hrf-md:ChangeDateTime><%= md.timestamp %></hrf-md:ChangeDateTime>
           <%== render :partial => "pedigree", locals: {pedigree: md.pedigree}%>
-        </ModifiedInfo>
+        </hrf-md:ModifiedInfo>
       <% end %>
-    </Modified>
-    <Copied>
+    </hrf-md:Modified>
+    <hrf-md:Copied>
       <% metadata.copied_dates.each do |cd| %>
-        <CopiedInfo>
-          <ChangeDateTime><%= cd.timestamp %></ChangeDateTime>
+        <hrf-md:CopiedInfo>
+          <hrf-md:ChangeDateTime><%= cd.timestamp %></hrf-md:ChangeDateTime>
           <%== render :partial => "pedigree", locals: {pedigree: cd.pedigree}%>
-        </CopiedInfo>
+        </hrf-md:CopiedInfo>
       <% end %>
-    </Copied>
-  </RecordDate>
-  <Confidentiality><%= metadata.confidentiality%></Confidentiality>
-</Document>
+    </hrf-md:Copied>
+  </hrf-md:RecordDate>
+  <hrf-md:Confidentiality><%= metadata.confidentiality%></hrf-md:Confidentiality>
+</hrf-md:DocumentMetaData>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -195,6 +195,7 @@ files:
 - lib/health-data-standards/export/helper/cat1_view_helper.rb
 - lib/health-data-standards/export/helper/gc32_view_helper.rb
 - lib/health-data-standards/export/helper/html_view_helper.rb
+- lib/health-data-standards/export/helper/scooped_view_helper.rb
 - lib/health-data-standards/export/html.rb
 - lib/health-data-standards/export/qrda/entry_template_resolver.rb
 - lib/health-data-standards/export/rendering_context.rb
@@ -282,6 +283,7 @@ files:
 - lib/health-data-standards/models/cqm/aggregate_objects.rb
 - lib/health-data-standards/models/cqm/bundle.rb
 - lib/health-data-standards/models/cqm/measure.rb
+- lib/health-data-standards/models/cqm/patient_cache.rb
 - lib/health-data-standards/models/cqm/query_cache.rb
 - lib/health-data-standards/models/encounter.rb
 - lib/health-data-standards/models/entry.rb
@@ -362,6 +364,7 @@ files:
 - lib/hqmf-parser/parser.rb
 - lib/hqmf-parser.rb
 - lib/util/counter.rb
+- templates/_author.hdata.erb
 - templates/_pedigree.hdata.erb
 - templates/c32/_allergies.c32.erb
 - templates/c32/_allergies_no_current.c32.erb