health-data-standards 2.1.2 → 2.1.3

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

@@ -31,10 +31,10 @@ class Entry
   attr_protected :created_at
   attr_protected :updated_at
   
-  def times_to_s
+  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) : 'UNK'
-      end_string = end_time ? Time.at(end_time).utc.to_formatted_s(:long_ordinal) : 'UNK'
+      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} - #{end_string}"
     elsif time.present?
       Time.at(time).utc.to_formatted_s(:long_ordinal)

data/templates/_allergies_no_current.c32.erb

@@ -4,7 +4,7 @@
              <templateId root="2.16.840.1.113883.3.88.11.83.102" assigningAuthorityName="HITSP/C83"/>
              <templateId root="1.3.6.1.4.1.19376.1.5.3.1.3.13" assigningAuthorityName="IHE PCC"/>
              <templateId root="2.16.840.1.113883.10.20.1.2" assigningAuthorityName="HL7 CCD"/>
-              <code code="11450-4" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Problem List"/>
+              <code code="48765-2" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC" displayName="Problem List"/>
               <title>Allergies and Adverse Reactions</title>                
                <text>
                 <table border="1" width="100%">

data/templates/_narrative_block.c32.erb

@@ -18,7 +18,7 @@
       <% entries.each_with_index do |entry, i| -%>
         <tr>
           <td ID="<%= section %>-desc-<%= i %>"><%= entry.description %></td>
-          <td ID="<%= section %>-code-<%= i %>"><%= entry.codes_to_s %><br/><i><%= entry.specifics %></i></td>
+          <td ID="<%= section %>-code-<%= i %>"><%= entry.codes_to_s %><br/><%= entry.specifics %></td>
           <td><%= entry.times_to_s %></td>
            <% if status.present? %>
             <td><%= entry.status %></td>

data/templates/ccda/_allergies_no_current.ccda.erb

@@ -19,10 +19,11 @@
             <templateId root="2.16.840.1.113883.10.20.22.4.7"/>
             <id root="<%= UUID.generate %>"/>
             <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
+            <statusCode code="completed"/>
             <effectiveTime>
               <low nullFlavor="UNK"/>
             </effectiveTime>
-            <statusCode code="completed"/>
+            
             <value xsi:type="CD" code="419199007"
               codeSystem="2.16.840.1.113883.6.96" displayName="Allergy to Substance"/>
           </observation>

data/templates/ccda/_conditions_no_current.ccda.erb

@@ -19,10 +19,11 @@
             <templateId root="2.16.840.1.113883.10.20.22.4.4"/>
             <id root="<%= UUID.generate %>"/>
             <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
+             <statusCode code="completed"/>
             <effectiveTime>
               <low nullFlavor="UNK"/>
             </effectiveTime>
-            <statusCode code="completed"/>
+           
           </observation>
         </entryRelationship>
       </act>

data/templates/ccda/_medications_no_current.ccda.erb

@@ -6,7 +6,7 @@
     <title>Medications</title>
     <text>There are no current medications at the time of this document's creation.</text>
     <entry>
-      <substanceAdministration moodCode="EVN" classCode="SBADM" negationInd=”true”>
+      <substanceAdministration moodCode="EVN" classCode="SBADM" negationInd="true">
         <text>No known medications.</text>
         <consumable>
           <manufacturedProduct>

data/templates/ccda/_narrative_block.ccda.erb

@@ -18,7 +18,7 @@
       <% entries.each_with_index do |entry, i| -%>
         <tr>
           <td ID="<%= section %>-desc-<%= i %>"><%= entry.description %></td>
-          <td ID="<%= section %>-code-<%= i %>"><%= entry.codes_to_s %><br/><i><%= entry.specifics %></i></td>
+          <td ID="<%= section %>-code-<%= i %>"><%= entry.codes_to_s %><br/><%= entry.specifics %></td>
           <td><%= entry.times_to_s %></td>
            <% if status.present? %>
             <td><%= entry.status %></td>

data/templates/ccda/_procedures_no_current.ccda.erb

@@ -10,10 +10,11 @@
         <templateId root="2.16.840.1.113883.10.20.22.4.14"/>
         <id root="<%= UUID.generate %>"/>
           <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
+          <statusCode code="completed"/>
           <effectiveTime>
             <low nullFlavor="UNK"/>
           </effectiveTime>
-          <statusCode code="completed"/>
+          
       </procedure>
     </entry>
   </section>

data/templates/html/_entries_by_encounter.html.erb

@@ -6,7 +6,7 @@
     all_entries = []
     entry_section = {}
     Record::Sections.each do |section|
-      if section != :encounters
+      if section != :encounters and section != :insurance_providers
         patient.send(section).each do |entry|
           all_entries << entry
           entry_section[entry.hash] = section

data/templates/html/_entries_by_section.html.erb

@@ -2,11 +2,13 @@
   <% 
     entries_by_section = {}
     Record::Sections.each do |section|
-      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 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
+	    end
     end
   %>
   <% entries_by_section.each do |section, entries| %>

data/templates/html/_entry.html.erb

@@ -26,7 +26,7 @@
       <% end %>
     <% end %>
   </td>
-  <td><%= entry.times_to_s %></td>
+  <td><%= entry.times_to_s('present') %></td>
   <td><%= decode_hqmf_status(entry.status, entry.oid) %></td>   
   <td>
     <% entry.values.each do |value| %>

data/templates/html/_header.html.erb

@@ -11,10 +11,22 @@
       <td><%= (patient.gender == 'M') ? "Male" : (patient.gender == 'F') ? 'Female' : 'Unknown'%></td>
     </tr>
     <tr>
-      <td bgcolor="#3399ff"><span class="td_label">Contact info</span></td>
-      <td> Pirmary Home:<br />202 Burlington Rd.<br />Bedford, MA 01730<br />Tel:  +1-781-271-3000<br /></td>
+      <td width="20%" bgcolor="#3399ff"><span class="td_label">Race</span></td>
+      <td width="30%"><%= patient.race.nil? ? 'Unknown' : (patient.race['name'] ? patient.race['name'] : "CDC-RE: #{patient.race['code']}") %></td>
+      <td width="15%" bgcolor="#3399ff"><span class="td_label">Ethnicity</span></td>
+      <td><%= patient.ethnicity.nil? ? 'Unknown' : (patient.ethnicity['name'] ? patient.ethnicity['name'] : "CDC-RE: #{patient.ethnicity['code']}") %></td>
+    </tr>    
+    <tr>
+      <td bgcolor="#3399ff"><span class="td_label">Insurance Providers</span></td>
+      <td>
+      	<%= (patient.insurance_providers.map {|provider| provider.name }).join(", ") %>
+      </td>
       <td bgcolor="#3399ff"><span class="td_label">Patient IDs</span></td>
-      <td><%= patient.id %> Cypress<br /></td>
+      <td><%= patient.id %> Cypress</td>
+    </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>
     </tr>
   </tbody>
 </table>

data/templates/show.c32.erb

@@ -5,6 +5,8 @@
   <templateId root="2.16.840.1.113883.3.27.1776" assigningAuthorityName="CDA/R2"/>
   <templateId root="2.16.840.1.113883.10.20.3" assigningAuthorityName="HL7/CDT Header"/>
   <templateId root="1.3.6.1.4.1.19376.1.5.3.1.1.1" assigningAuthorityName="IHE/PCC"/>
+  <templateId root="2.16.840.1.113883.3.88.10.20.3" assigningAuthorityName="HITSP/C32"/>
+ 
   <templateId root="2.16.840.1.113883.3.88.11.32.1" assigningAuthorityName="HITSP/C32"/>
   <id root="2.16.840.1.113883.3.72" extension="<%= patient.id %>" assigningAuthorityName="NIST Healthcare Project"/>
   <code code="34133-9" displayName="Summarization of episode note" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client