health-data-standards 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a64a7088e8424184e26a1b2eddf307d03bfb6c
-  data.tar.gz: 37678d049beef3e04acf5823083ec6f0046698ac
+  metadata.gz: ed7ac32f30130f0ea0517470c15e03fdfe779114
+  data.tar.gz: 206797804b2a887780b08b7250ebf9063c6911c1
 SHA512:
-  metadata.gz: beab3c39c626c200068b52bc87a2b2fd073e149bc209f3ce51077518172dfa4418e55a8737acafa3cb15096ca7762c7242e27bd85104ccde16330421bfe34b05
-  data.tar.gz: 6be1b3371612bd1e64a7bdd2c16548d72e3b8753efc8944db6271e216d404029bd279e9968c445f385269791aee465eb5d431992e2a7fc7f5d900a5176c2464f
+  metadata.gz: 103de0eb07ad45cf8f1cad1cb52fa58bf150bf4e942fe47aad0be9fe051100580105b5c6d235199eea2f51fdd6b9896f4477bec29509cd7a88d32cf6314f10c3
+  data.tar.gz: 212134946675814e7519b8e0761c974da0d5be30c0cc3b75e31f28c822c1e184a45c693b7d7974460a157d730c2635d4395f6ee5d48bab9468a92ccfc40bacf1

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

@@ -93,20 +93,23 @@ module HealthDataStandards
       end
 
       def dose_quantity(codes, dose)
-        if (codes["RxNorm"].present? || codes["CVX"].present?)
-          if dose[:unit].present?
-            return "value='1' unit='#{ucum_for_dose_quantity(dose[:unit])}'"
-          else
-            return "value='1'"
-          end
+        # this previously paid attention to precoordinated medications like RxNorm and CVX
+        # and would ignore medication dosage if the code was one of those. However, that does
+        # not seem accurate. From conversation with Dave Czulada on 8/8:
+        # "When a medication code is "precoordinated" one should not be able to specify a UOM
+        # that is other than capsule/dose/tablet/unit. For example, you wouldn't say 20 MG of
+        # RxNorm 1000048 (Doxepin Hydrochloride 10 MG Oral Capsule).  You would say 2 capsules
+        # of RxNorm 1000048 or 2 units of RxNorm 1000048."
+        #
+        # In order to enable a user to say "2 units" or "2 capsules", we need to allow the
+        # dosage to be present even if an RxNorm or CVX code is used. It is the user's job
+        # to confirm that they aren't contradicting the coded value.
+        if dose[:scalar].present?
+          return "value='#{dose[:scalar]}' unit='#{dose[:units]}'"
+        elsif dose[:value].present?
+          return "value='#{dose[:value]}' unit='#{dose[:unit]}'"
         else
-          if dose[:scalar].present?
-            return "value='#{dose[:scalar]}' unit='#{dose[:units]}'"
-          elsif dose[:value].present?
-            return "value='#{dose[:value]}' unit='#{dose[:unit]}'"
-          else
-            return "value='1'"
-          end
+          return "value='1' unit='1'"
         end
       end
 

data/templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.105.cat1.erb

@@ -25,10 +25,9 @@
             <low <%= value_or_null_flavor(entry.start_time) %>/>
             <high <%= value_or_null_flavor(entry.end_time) %>/>
         </effectiveTime>
-        <% if entry.administrationTiming.present?
-          period = entry.administrationTiming['period'] %>
+        <% if entry.administrationTiming.present? && entry.administrationTiming.key?('scalar') %>
           <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
-            <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+            <period value="<%= entry.administrationTiming['scalar']%>" <% if entry.administrationTiming['units'] && (entry.administrationTiming['units'] != "") -%>unit="<%= entry.administrationTiming['units']%>"<% end %>/>
           </effectiveTime>
         <% end %>
         <% if entry.route.present? -%>
@@ -38,7 +37,7 @@
         
         <!-- Attribute: dose -->
         <% if entry.dose.present? -%>
-          <doseQuantity value="<%= entry.dose[:value]%>"/>
+          <doseQuantity value="<%= entry.dose[:scalar]%>"/>
         <% end -%>
 
         <% if entry.product_form.present? -%>

data/templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.135.cat1.erb

@@ -48,21 +48,7 @@
                             displayName="<%=entry.anatomical_location[:title]%>"
                           <% end -%>/>
         <% end -%>
-        <% if entry.severity -%>
-          <entryRelationship typeCode="REFR">
-            <observation classCode="OBS" moodCode="EVN">
-              <templateId root="2.16.840.1.113883.10.20.22.4.8" extension="2014-06-09" />
-              <code code="SEV" codeSystem="2.16.840.1.113883.5.4" />
-              <statusCode code="completed" />
-              <value xsi:type="CD"
-                     code="<%= entry.severity[:code] %>"
-                     codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.severity[:codeSystem] || entry.severity[:code_system]) %>"
-                     <% if entry.severity.has_key?(:title) -%>
-                       displayName="<%=entry.severity[:title]%>"
-                     <% end -%>/>
-            </observation>
-          </entryRelationship>
-        <% end -%>
+        <%== render(:partial => 'severity', :locals => {:entry => entry, :severity_oids=>field_oids["SEVERITY"]}) %>
       </observation>
     </entryRelationship>
   </act>

data/templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.147.cat1.erb

@@ -24,5 +24,6 @@
         </playingEntity>
       </participantRole>
     </participant>
+    <%== render(:partial => 'severity', :locals => {:entry => entry, :severity_oids=>field_oids["SEVERITY"]}) %>
   </observation>
-</entry>
+</entry>

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

@@ -19,6 +19,8 @@
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     <value nullFlavor="NA" xsi:type="CD" />
+    <%== render(:partial => 'method', :locals => {:entry => entry, :method_oids=>field_oids["METHOD"]}) %>
+    <%== render(:partial => 'facility', :locals => {:entry => entry,:facility_oids=>field_oids["FACILITY_LOCATION"]}) %>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
     <%== render(:partial => 'results', :locals => {:entry => entry, :result_oids => result_oids, :value_set_oid => value_set_oid}) %>
     <% if entry.components -%>
@@ -26,4 +28,4 @@
     <% end %>
   </observation>
 </entry>
-<% end %>
+<% end %>

data/templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.23.cat1.erb

@@ -21,33 +21,11 @@
           <high <%= value_or_null_flavor(entry.discharge_time || entry.end_time) %>/>
         </effectiveTime>
         <% if entry.discharge_disposition.present? %>
-            <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition.code %>" 
-                codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition.code_system) %>"/>
-        <% end -%>
-        <% if entry.respond_to?(:facility) && entry.facility.present? -%>
-        <participant typeCode="LOC">
-          <!-- Facility Location template -->
-          <templateId root="2.16.840.1.113883.10.20.24.3.100" extension="2017-08-01"/>
-          <time>
-            <!-- Attribute: facility location arrival datetime -->
-            <low <%= value_or_null_flavor(entry.start_time) %>/>
-            <!-- Attribute: facility location departure datetime -->
-            <high <%= value_or_null_flavor(entry.end_time) %>/>
-          </time>
-          <participantRole classCode="SDLOC">
-            <% if entry.facility[:values][0].present? -%>
-                <code code="<%= entry.facility.values[0][0].code.code %>" 
-                  codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.facility.values[0][0].code.code_system) %>"/>
-            <% else -%>
-            <code nullFlavor="UNK"/>
-            <% end -%>
-            <telecom nullFlavor="UNK"/>
-            <playingEntity classCode="PLC">
-              <name><%= entry.facility[:values][0]['display'] %></name>
-            </playingEntity>
-          </participantRole>
-        </participant>
+            <sdtc:dischargeDispositionCode code="<%= entry.discharge_disposition[:code] %>"
+                codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.discharge_disposition[:code_system]) %>"/>
         <% end -%>
+        <%== render(:partial => 'facility', :locals => {:entry => entry,:facility_oids=>field_oids["FACILITY_LOCATION"]}) %>
+        <%== render(:partial => 'admission_source', :locals => {:entry => entry,:admission_source_oids=>field_oids["ADMISSION_SOURCE"]}) %>
         <% if entry.reason.present? -%>
           <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
         <% end -%>
@@ -57,11 +35,13 @@
                   <templateId root="2.16.840.1.113883.10.20.24.3.152" extension="2017-08-01"/>
                   <id root="1.3.6.1.4.1.115" extension="<%= UUID.generate %>"/>
                   <code code="8319008" codeSystem="2.16.840.1.113883.6.96" displayName="Principal Diagnosis" codeSystemName="SNOMED CT"/>
-                  <value code="<%= entry.principal_diagnosis.code %>" xsi:type="CD" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.principal_diagnosis.code_system) %>"/>
+                  <value code="<%= entry.principal_diagnosis[:code] %>" xsi:type="CD" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.principal_diagnosis[:code_system]) %>"/>
                 </observation>
             </entryRelationship>
         <% end -%>
-        <% if entry.diagnosis %>
+        <% if entry.diagnosis
+            entry.diagnosis[:values].each do |diagnosis|
+          %>
             <entryRelationship typeCode="REFR">
                 <act classCode="ACT" moodCode="EVN">
                   <templateId root="2.16.840.1.113883.10.20.22.4.80" extension="2015-08-01"/>
@@ -81,12 +61,13 @@
                         <!-- Attribute: discharge datetime -->
                         <high <%= value_or_null_flavor(entry.end_time) %>/>
                       </effectiveTime>
-                      <value code="<%= entry.diagnosis.values[1][0].code %>" xsi:type="CD" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.diagnosis.values[1][0].code_system) %>"/>
+                      <value code="<%= diagnosis[:code] %>" xsi:type="CD" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(diagnosis[:code_system]) %>" />
                     </observation>
                   </entryRelationship>
                 </act>
             </entryRelationship>
-        <% end -%>
+        <%   end 
+           end -%>
       </encounter>
     </entryRelationship>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"], :r2_compatibility => r2_compatibility}) %>

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

@@ -14,7 +14,7 @@
     </effectiveTime>
     <%== render(:partial => 'reason', :locals => {:entry => entry ,:reason_oids=>field_oids["REASON"]}) %>
     <%if !entry.values.empty? %>
-      <%== render(:partial=> 'result_value', :locals => {:values => entry.values}) %>
+      <%== render(:partial=> 'results', :locals => {:entry => entry}) %>
     <% end %>
 
   </act>

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

@@ -19,5 +19,19 @@
     <% if entry.components -%>
       <%== render(:partial => 'components', :locals => {:entry => entry} ) %>
     <% end %>
-    </observation>
-</entry>
+    <% if entry.referenceRangeHigh || entry.referenceRangeLow %>
+    <referenceRange>
+      <observationRange>
+        <value xsi:type="IVL_PQ">
+        <% if entry.referenceRangeLow %>
+          <low value="<%= entry.referenceRangeLow['scalar'] %>" <% if entry.referenceRangeLow['units'] && (entry.referenceRangeLow['units'] != "") -%>unit="<%= entry.referenceRangeLow['units'] %>"<% else -%>unit="1"<% end -%>/>
+        <% end %>
+        <% if entry.referenceRangeHigh %>
+          <high value="<%= entry.referenceRangeHigh['scalar'] %>" <% if entry.referenceRangeHigh['units'] && (entry.referenceRangeHigh['units'] != "") -%>unit="<%= entry.referenceRangeHigh['units'] %>"<% else -%>unit="1"<% end -%>/>
+        <% end %>
+        </value>
+      </observationRange>
+    </referenceRange>
+    <% end %>
+  </observation>
+</entry>

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

@@ -12,10 +12,9 @@
         <low <%= value_or_null_flavor(entry.start_time) %>/>
         <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
-    <% if entry.administrationTiming.present?
-      period = entry.administrationTiming['period'] %>
+    <% if entry.administrationTiming.present? && entry.administrationTiming.key?('scalar') %>
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
-        <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+        <period value="<%= entry.administrationTiming['scalar']%>" <% if entry.administrationTiming['units'] && (entry.administrationTiming['units'] != "") -%>unit="<%= entry.administrationTiming['units']%>"<% end %>/>
       </effectiveTime>
     <% end %>
     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
@@ -38,7 +37,7 @@
       </manufacturedProduct>
     </consumable>
 
-    <%== render(:partial => 'medication_dispense', :collection => entry.fulfillmentHistory, :locals => {:entry => entry, :value_set_map => value_set_map, :value_set_oid => value_set_oid}) %>
+    <%== render(:partial => 'medication_dispense', :locals => {:entry => entry, :filtered_vs_map => filtered_vs_map}) %>
 
   </substanceAdministration>
 

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

@@ -11,6 +11,11 @@
       <low <%= value_or_null_flavor(entry.start_time) %>/>
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
+    <% if entry.administrationTiming.present? && entry.administrationTiming.key?('scalar') %>
+      <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
+        <period value="<%= entry.administrationTiming['scalar']%>" <% if entry.administrationTiming['units'] && (entry.administrationTiming['units'] != "") -%>unit="<%= entry.administrationTiming['units']%>"<% end %>/>
+      </effectiveTime>
+    <% end %>
     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
     <consumable>
       <manufacturedProduct classCode="MANU">
@@ -23,5 +28,6 @@
       </manufacturedProduct>
     </consumable>
     <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
+    <%== render(:partial => 'medication_dispense', :locals => {:entry => entry, :filtered_vs_map => filtered_vs_map}) %>
   </substanceAdministration>
-</entry>
+</entry>

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

@@ -15,14 +15,15 @@
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
         <period nullFlavor="NA"/>
       </effectiveTime>
-    <% elsif entry.administrationTiming.present?
-      period = entry.administrationTiming['period'] %>
+    <% elsif entry.administrationTiming.present? && entry.administrationTiming.key?('scalar')%>
       <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
-        <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+        <period value="<%= entry.administrationTiming['scalar']%>" <% if entry.administrationTiming['units'] && (entry.administrationTiming['units'] != "") -%>unit="<%= entry.administrationTiming['units']%>"<% end %>/>
       </effectiveTime>
     <% end %>
     <% if entry.allowedAdministrations.present? %>
       <repeatNumber value="<%== entry.allowedAdministrations %>" />
+    <% elsif entry.refills.present? %>
+      <repeatNumber value="<%== entry.refills['scalar'] %>" />
     <% end %>
      <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
     <consumable>

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

@@ -13,6 +13,14 @@
       <high <%= value_or_null_flavor(entry.end_time) %>/>
     </effectiveTime>
     <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
+    <%== render(:partial => 'method', :locals => {:entry => entry, :method_oids=>field_oids["METHOD"]}) %>
+    <% if entry.anatomical_location -%>
+      <targetSiteCode code="<%= entry.anatomical_location[:code] %>"
+                      codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.anatomical_location[:codeSystem] || entry.anatomical_location[:code_system]) %>"
+                      <% if entry.anatomical_location.has_key?(:title) -%>
+                        displayName="<%=entry.anatomical_location[:title]%>"
+                      <% end -%>/>
+    <% end -%>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
     <% if entry.respond_to?(:incision_time) && entry.incision_time.present? -%>
     <entryRelationship typeCode="REFR">
@@ -52,4 +60,3 @@
     <% end %>
   </procedure>
 </entry>
-

data/templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.9.cat1.erb

@@ -28,8 +28,8 @@
             </playingDevice>
           </participantRole>
         </participant>
+        <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
       </supply>
     </entryRelationship>
-    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </act>
 </entry>

data/templates/cat1/r5/_admission_source.cat1.erb

@@ -0,0 +1,8 @@
+<% if entry.admissionSource.present? %>
+  <participant typeCode="LOC">
+   <participantRole classCode="SDLOC">
+     <templateId root="2.16.840.1.113883.10.20.24.3.151" extension="2017-08-01"/>
+     <code  code="<%= entry.admissionSource.code %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.admissionSource.code_system) %>"/>
+   </participantRole>
+  </participant>
+<% end %>

data/templates/cat1/r5/_component_value.cat1.erb

@@ -1,5 +1,9 @@
 <% if result['code'] -%>
-  <value xsi:type="CD" code="<%= result['code'].code %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(result['code'].code_system) %>" />
+  <value xsi:type="CD" code="<%= result['code']['code'] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(result['code']['code_system']) %>" />
 <% elsif result['scalar'] %>
-  <value xsi:type="PQ" value="<%= result['scalar'] %>" unit="<%= result['units'] %>"/>
+  <% if result['units'] == 'UnixTime' %>
+  <value xsi:type="TS" <%= value_or_null_flavor(result['scalar']) %>/>
+  <% else %>
+  <value xsi:type="PQ" value="<%= result['scalar'] %>" <% if result['units'] && (result['units'] != "") -%>unit="<%= result['units']%>"<% else %>unit="1"<% end %>/>
+  <% end %>
 <% end %>

data/templates/cat1/r5/_components.cat1.erb

@@ -4,8 +4,22 @@
           <!-- Component -->
           <templateId root="2.16.840.1.113883.10.20.24.3.149" extension="2017-08-01" />
           <id root="1.3.6.1.4.1.115" extension="<%= identifier_for(component) %>"/>
-          <code code="<%= component.code['code'] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(component.code['code_system']) %>" />
-          <%== render(:partial => 'component_value', :locals => {:result => component.result} ) %>
+          <code code="<%= component[:code][:code] %>" codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(component[:code][:code_system]) %>" />
+          <%== render(:partial => 'component_value', :locals => {:result => component[:result]} ) %>
+          <% if (component['referenceRangeHigh'] && !component['referenceRangeHigh']['scalar'].to_s.empty?) || (component['referenceRangeLow'] && !component['referenceRangeLow']['scalar'].to_s.empty?) %>
+          <referenceRange>
+            <observationRange>
+              <value xsi:type="IVL_PQ">
+              <% if component['referenceRangeLow'] %>
+                <low value="<%= component['referenceRangeLow']['scalar'] %>" <% if component['referenceRangeLow']['units'] && (component['referenceRangeLow']['units'] != "") -%>unit="<%= component['referenceRangeLow']['units'] %>"<% else -%>unit="1"<% end -%>/>
+              <% end %>
+              <% if component['referenceRangeHigh'] %>
+                <high value="<%= component['referenceRangeHigh']['scalar'] %>" <% if component['referenceRangeHigh']['units'] && (component['referenceRangeHigh']['units'] != "") -%>unit="<%= component['referenceRangeHigh']['units'] %>"<% else -%>unit="1"<% end -%>/>
+              <% end %>
+              </value>
+            </observationRange>
+          </referenceRange>
+          <% end %>
       </observation>
   </entryRelationship>
 <% end %>

data/templates/cat1/r5/_facility.cat1.erb

@@ -0,0 +1,31 @@
+<% if entry.respond_to?(:facility) && entry.facility.present?
+  entry.facility[:values].each do |facility|
+    start_time = facility[:locationPeriodLow].present? ? DateTime.strptime(facility[:locationPeriodLow], "%m/%d/%Y %I:%M %p").to_i : nil
+    end_time = facility[:locationPeriodHigh].present? ? DateTime.strptime(facility[:locationPeriodHigh], "%m/%d/%Y %I:%M %p").to_i : nil
+  -%>
+<participant typeCode="LOC">
+  <!-- Facility Location template -->
+  <templateId root="2.16.840.1.113883.10.20.24.3.100" extension="2017-08-01"/>
+  <time>
+    <!-- Attribute: facility location arrival datetime -->
+    <low <%= value_or_null_flavor(start_time) %>/>
+    <!-- Attribute: facility location departure datetime -->
+    <high <%= value_or_null_flavor(end_time) %>/>
+  </time>
+  <participantRole classCode="SDLOC">
+    <% if facility[:code].present? -%>
+        <code code="<%= facility[:code][:code] %>"
+          codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(facility[:code][:code_system]) %>"/>
+    <% else -%>
+    <code nullFlavor="UNK"/>
+    <% end -%>
+    <telecom nullFlavor="UNK"/>
+    <% if facility[:display].present? -%>
+    <playingEntity classCode="PLC">
+      <name><%= facility[:display] %></name>
+    </playingEntity>
+    <% end -%>
+  </participantRole>
+</participant>
+<%   end
+   end -%>

data/templates/cat1/r5/_measures.cat1.erb

@@ -58,11 +58,10 @@
                   <versionNumber value="<%= measure.hqmf_version_number %>"/>                  
                 </externalDocument>
               </reference>
-            </organizer>
-            
+
             <% # Only want the epxected values when running from Bonnie
             if patient.respond_to?('expected_values_for_qrda_export') -%>
-            <component>
+
               <%
               #     # Going to assume that any expected_value > 0 is a TRUE
               #     # As per HL7 CDA R2:QRDA I, R1, STU Release 3.1, US Realm, Vol. 2 —Templates and Supporting Material
@@ -70,13 +69,13 @@
               #     # QRDA expects IPOP instead of IPP.
               qrda_expected_values = patient.expected_values_for_qrda_export(measure)
               qrda_expected_values.each do |qev| -%>
+              <component>
                 <observation classCode="OBS" moodCode="EVN" negationInd="<%= qev[:expected_value] == '0' ? 'true' : 'false' %>">
                   <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
                   <value xsi:type="CD"
                     code="<%= qev[:code] == 'IPP' ? 'IPOP' : qev[:code] %>"
                     codeSystem="2.16.840.1.113883.5.4"
-                    codeSystemName="ActCode"
-                    displayName="<%= qev[:display_name] %>"/>
+                    codeSystemName="ActCode"/>
                   <!-- Explicit reference to the eMeasure population (because some eMeasures have multiple Numerators, etc -->
                   <reference typeCode="REFR">
                     <externalObservation classCode="OBS" moodCode="EVN">
@@ -84,9 +83,10 @@
                     </externalObservation>
                   </reference>
                 </observation>
+              </component>
               <% end -%>
-            </component>
             <% end -%>
+            </organizer>
           </entry>
           <% end -%>
         </section>

data/templates/cat1/r5/_medication_dispense.cat1.erb

@@ -1,13 +1,16 @@
-
+<% if entry.supply %>
 <entryRelationship typeCode="REFR">
   <supply classCode="SPLY" moodCode="EVN">
     <!-- Medication Dispense template -->
     <templateId root="2.16.840.1.113883.10.20.22.4.18" extension="2014-06-09"/>
     <id root="1.3.6.1.4.1.115" extension="<%= UUID.generate %>"/>
     <statusCode code="completed"/>
-    <effectiveTime <%= value_or_null_flavor(medication_dispense.dispense_date) %>/>
+    <effectiveTime xsi:type="IVL_TS">
+        <low <%= value_or_null_flavor(entry.start_time) %>/>
+        <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
     <repeatNumber value="1"/>
-    <quantity <%= fulfillment_quantity(entry.codes, medication_dispense, entry.dose) %>/>
+    <quantity value="<%= entry.supply[:scalar] %>" <% if entry.supply[:units] %>unit="<%= entry.supply[:units] %>"<% end %>/>
     <product>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->
@@ -20,3 +23,4 @@
     </product>
   </supply>
 </entryRelationship>
+<% end %>

data/templates/cat1/r5/_method.cat1.erb

@@ -0,0 +1,6 @@
+<% if entry.respond_to?(:method) && entry.method.present? 
+  -%>
+<methodCode  code="<%= entry.method[:code] %>" 
+              codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.method[:codeSystem] || entry.method[:code_system]) %>"
+              />
+<% end -%>

data/templates/cat1/r5/_results.cat1.erb

@@ -3,14 +3,17 @@
    <observation classCode="OBS" moodCode="EVN">
      <!-- Conforms to C-CDA R2 Result Observation (V2) -->
      <templateId root="2.16.840.1.113883.10.20.22.4.2" extension="2015-08-01"/>
-     <!-- Result (QRDA I R3) -->
-     <templateId root="2.16.840.1.113883.10.20.24.3.87" extension="2016-02-01"/>
      <id root="1.3.6.1.4.1.115" extension="<%= identifier_for(value) %>"/>
       <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['*']) %>
       <statusCode code="completed"/>
       <effectiveTime>
+        <% if entry.result_date_time? %>
+        <low <%= value_or_null_flavor(entry.result_date_time) %>/>
+        <high <%= value_or_null_flavor(entry.result_date_time) %>/>
+        <% else %>
         <low <%= value_or_null_flavor(entry.start_time) %>/>
         <high <%= value_or_null_flavor(entry.end_time) %>/>
+        <% end %>
       </effectiveTime>
      <%== render(:partial=> 'result_value', :locals => {:values => [value], :result_oids=>result_oids}) %>
    </observation>

data/templates/cat1/r5/_severity.cat1.erb

@@ -0,0 +1,14 @@
+<%  if entry.severity.present? -%>
+<entryRelationship typeCode="RSON">
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.22.4.8" extension="2014-06-09"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= identifier_for([reason, entry.start_time]) %>" />
+    <code code="SEV" codeSystem="2.16.840.1.113883.5.4" />
+    <statusCode code="completed"/>
+    <value xsi:type="CD"
+         code="<%= entry.severity[:code] %>"
+         codeSystem="<%= HealthDataStandards::Util::CodeSystemHelper.oid_for_code_system(entry.severity[:codeSystem] || entry.severity[:code_system]) %>"
+         />
+  </observation>
+</entryRelationship>
+<% end -%>

data/templates/cat1/r5/_status.cat1.erb

@@ -0,0 +1,17 @@
+<%  status = entry.qmd_status
+
+    if status.present?
+      debugger
+  -%>
+<entryRelationship typeCode="REFR">
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.93"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= identifier_for(status) %>" />
+    <code code="33999-4"
+          codeSystem="2.16.840.1.113883.6.1"
+          displayName="status"
+          codeSystemName="LOINC"/>
+    <%== render(:partial=> 'result_value', :locals => {:values => [status], :result_oids=>status_oids}) %>
+  </observation>
+</entryRelationship>
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -128,14 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -830,15 +844,18 @@ files:
 - templates/cat1/r5/_2.16.840.1.113883.10.20.24.3.9.cat1.erb
 - templates/cat1/r5/_2.16.840.1.113883.10.20.28.3.6.cat1.erb
 - templates/cat1/r5/_address.cat1.erb
+- templates/cat1/r5/_admission_source.cat1.erb
 - templates/cat1/r5/_author.cat1.erb
 - templates/cat1/r5/_author_qdm.cat1.erb
 - templates/cat1/r5/_component_value.cat1.erb
 - templates/cat1/r5/_components.cat1.erb
+- templates/cat1/r5/_facility.cat1.erb
 - templates/cat1/r5/_fulfills.cat1.erb
 - templates/cat1/r5/_id.cat1.erb
 - templates/cat1/r5/_measures.cat1.erb
 - templates/cat1/r5/_medication_details.cat1.erb
 - templates/cat1/r5/_medication_dispense.cat1.erb
+- templates/cat1/r5/_method.cat1.erb
 - templates/cat1/r5/_ordinality.cat1.erb
 - templates/cat1/r5/_organization.cat1.erb
 - templates/cat1/r5/_patient_data.cat1.erb
@@ -848,6 +865,8 @@ files:
 - templates/cat1/r5/_reporting_parameters.cat1.erb
 - templates/cat1/r5/_result_value.cat1.erb
 - templates/cat1/r5/_results.cat1.erb
+- templates/cat1/r5/_severity.cat1.erb
+- templates/cat1/r5/_status.cat1.erb
 - templates/cat1/r5/_telecom.cat1.erb
 - templates/cat1/r5/show.cat1.erb
 - templates/cat3/r1/_address.cat3.erb
@@ -945,7 +964,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A library for generating and consuming various healthcare related formats.