health-data-standards 3.6.1 → 3.7.0

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

@@ -0,0 +1,38 @@
+<entry>
+  <act classCode="ACT" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Medication, Administered template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.42" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="416118004" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Administration"/>
+    <statusCode code="completed"/>
+    <effectiveTime xsi:type="IVL_TS">
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <entryRelationship typeCode="COMP">
+      <substanceAdministration classCode="SBADM" moodCode="EVN">
+        <!-- Medication Activity (consolidation) template -->
+        <templateId root="2.16.840.1.113883.10.20.22.4.16" extension="2014-06-09"/>
+        <id root="<%= UUID.generate %>"/>
+        <text><%= entry.description %></text>
+        <statusCode code="completed"/>
+        <effectiveTime xsi:type="IVL_TS">
+          <low <%= value_or_null_flavor(entry.start_time) %>/>
+          <high <%= value_or_null_flavor(entry.end_time) %>/>
+        </effectiveTime>
+        <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
+        <consumable>
+          <manufacturedProduct classCode="MANU">
+            <!-- Medication Information (consolidation) template -->
+            <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
+            <id root="<%= UUID.generate %>"/>
+            <manufacturedMaterial>
+              <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['RxNorm', 'CVX', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+            </manufacturedMaterial>
+          </manufacturedProduct>
+        </consumable>
+      </substanceAdministration>
+    </entryRelationship>
+    <%== render(:partial => 'reason', :locals => {:entry => entry,:reason_oids=>field_oids["REASON"]}) %>
+  </act>
+</entry>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.43.cat1.erb

@@ -0,0 +1,24 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- consolidation CDA Allergy observation template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.7" extension="2014-06-09"/>
+    <!--  Medication Allergy -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.43" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="ASSERTION" displayName="Assertion" codeSystem="2.16.840.1.113883.5.4" codeSystemName="ActCode"/>
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+    </effectiveTime>
+    <value code="62014003" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Adverse drug effect" xsi:type="CD"/>
+
+    <participant typeCode="CSM">
+      <participantRole classCode="MANU">
+        <playingEntity classCode="MMAT">
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <name><%= entry.description %></name>
+        </playingEntity>
+      </participantRole>
+    </participant>
+  </observation>
+</entry>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.44.cat1.erb

@@ -0,0 +1,25 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- consolidation CDA Allergy observation template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.7" extension="2014-06-09"/>
+    <!--  Medication Allergy -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.44" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="ASSERTION" displayName="Assertion" codeSystem="2.16.840.1.113883.5.4" codeSystemName="ActCode"/>
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <value code="416098002" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Drug allergy" xsi:type="CD"/>
+
+    <participant typeCode="CSM">
+      <participantRole classCode="MANU">
+        <playingEntity classCode="MMAT">
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map,'preferred_code_sets' => ['RxNorm', 'SNOMED-CT', 'CVX'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <name><%= entry.description %></name>
+        </playingEntity>
+      </participantRole>
+    </participant>
+  </observation>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.45.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.45.cat1.erb}

@@ -2,9 +2,9 @@
   <!--Medication dispensed -->
   <supply classCode="SPLY" moodCode="EVN">
     <!--  Medication Dispensed template -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.45"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.45" extension="2014-12-01"/>
     <!-- Medication Dispense template -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.18"/>
+    <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="<%= entry.id %>"/>
     <text><%= entry.description %></text>
     <statusCode code="completed"/>
@@ -15,12 +15,12 @@
     <product>
       <manufacturedProduct classCode="MANU">
         <!-- Medication Information (consolidation) template -->
-        <templateId root="2.16.840.1.113883.10.20.22.4.23"/>
+        <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
         <id root="<%= UUID.generate %>"/>
         <manufacturedMaterial>
-          <%== code_display(entry, 'preferred_code_sets' =>["RxNorm"], 'value_set_map' => value_set_map, 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <%== code_display(entry, 'preferred_code_sets' =>["RxNorm"], 'value_set_map' => filtered_vs_map, 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
         </manufacturedMaterial>
       </manufacturedProduct>
     </product>
   </supply>
-</entry>
+</entry>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.46.cat1.erb

@@ -0,0 +1,30 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <!-- consolidation CDA Allergy Observation template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.7" extension="2014-06-09"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.46" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="ASSERTION" 
+          displayName="Assertion" 
+          codeSystem="2.16.840.1.113883.5.4" 
+          codeSystemName="ActCode"/>
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+    </effectiveTime>
+    <value xsi:type="CD" 
+           code="59037007" 
+           displayName="Drug intolerance"
+           codeSystem="2.16.840.1.113883.6.96" 
+           codeSystemName="SNOMED CT"/>
+
+    <participant typeCode="CSM">
+      <participantRole classCode="MANU">
+        <playingEntity classCode="MMAT">
+          <%== code_display(entry,'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT', 'CVX'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+          <name><%= entry.description %></name>
+        </playingEntity>
+      </participantRole>
+    </participant>
+  </observation>
+</entry>

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

@@ -0,0 +1,47 @@
+<entry>
+  <!--Medication Order -->
+  <substanceAdministration classCode="SBADM" moodCode="RQO" <%== negation_indicator(entry) %>>
+    <templateId root="2.16.840.1.113883.10.20.22.4.42" extension="2014-06-09"/>
+    <!-- Medication, Order template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.47" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <text><%= entry.description %></text>
+    <statusCode code="active"/>
+    <effectiveTime xsi:type="IVL_TS">
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <% if entry.negationInd %>
+      <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
+        <period nullFlavor="NA"/>
+      </effectiveTime>
+    <% elsif entry.administrationTiming.present?
+      period = entry.administrationTiming['period'] %>
+      <effectiveTime xsi:type="PIVL_TS" institutionSpecified="true" operator="A">
+        <period value="<%= period['value']%>" unit="<%= period['unit']%>"/>
+      </effectiveTime>
+    <% end %>
+    <% if entry.allowedAdministrations.present? %>
+      <repeatNumber value="<%== entry.allowedAdministrations %>" />
+    <% end %>
+     <%== render(:partial => 'medication_details', :locals => {:entry => entry, :route_oids=>field_oids["ROUTE"]}) %>
+    <consumable>
+      <manufacturedProduct classCode="MANU">
+        <!-- Medication Information (consolidation) template -->
+        <templateId root="2.16.840.1.113883.10.20.22.4.23" extension="2014-06-09"/>
+        <id root="<%= UUID.generate %>"/>
+        <manufacturedMaterial>
+          <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['RxNorm', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        </manufacturedMaterial>
+      </manufacturedProduct>
+    </consumable>
+    <author>
+      <templateId root="2.16.840.1.113883.10.20.22.4.119"/>
+      <time <%= value_or_null_flavor(entry.start_time) %>/>
+      <assignedAuthor>
+        <id root="<%= UUID.generate %>"/>
+      </assignedAuthor>
+    </author>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
+  </substanceAdministration>
+</entry>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.51.cat1.erb

@@ -0,0 +1,14 @@
+<entry>
+  <!-- Clinical Trial Participant -->
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.51" extension="2014-12-01"/>
+    <id root="<%= UUID.generate %>"/>
+    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"/>
+    <statusCode code="active"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <%== code_display(entry, {'tag_name' => 'value', 'value_set_map' => filtered_vs_map,'preferred_code_sets' => ['SNOMED-CT', 'LOINC', 'ICD-9-CM', 'ICD-10-CM'], 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"#{value_set_oid}\""}) %>
+  </observation>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.54.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.54.cat1.erb}

@@ -2,16 +2,16 @@
   <!-- Patient characteristic expired -->
   <observation classCode="OBS" moodCode="EVN">
     <!-- Consolidation Deceased Observation templateId -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.79"/>
+    <templateId root="2.16.840.1.113883.10.20.22.4.79" extension="2014-06-09"/>
     <!-- Patient Characteristic Expired -->
-    <templateId root="2.16.840.1.113883.10.20.24.3.54"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.54" extension="2014-12-01"/>
     <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
     <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4" codeSystemName="HL7ActCode"/>
     <statusCode code="completed"/>
     <effectiveTime>
       <low <%= value_or_null_flavor(entry.start_time) %>/>
     </effectiveTime>
-    <value code="419099009" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Dead" sdtc:valueSet="2.16.840.1.113883.3.666.5.539" xsi:type="CD"/>
+    <value code="419099009" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED CT" displayName="Dead" xsi:type="CD"/>
     <% if entry.respond_to? :code 
        # Currently, Record does not support coded cause of death, but this should allow it to work
        # when Record supports it.
@@ -29,4 +29,4 @@
     </entryRelationship>
     <% end -%>
   </observation>
-</entry>
+</entry>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.55.cat1.erb

@@ -0,0 +1,18 @@
+<entry>
+  <!-- Patient Characteristic Payer -->
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.55"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="48768-6" codeSystemName="LOINC" codeSystem="2.16.840.1.113883.6.1" displayName="Payment source"/> 
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <!-- Attribute: Start Datetime -->
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <% if entry.end_time %>
+        <high value="<%= time_if_not_nil(entry.end_time) %>" />
+      <% end %>
+    </effectiveTime>
+    <%== code_display(entry, 'preferred_code_sets' =>["SOP","Source of Payment Typology"] , 'tag_name' => 'value', 'extra_content' => "xsi:type=\"CD\" sdtc:valueSet=\"2.16.840.1.114222.4.11.3591\"") %>
+
+  </observation>            
+</entry>

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

@@ -0,0 +1,23 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
+<entry>
+  <!-- Physical Exam Finding -->
+  <observation classCode="OBS" moodCode="EVN">
+    <!--  Result observation template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.2" extension="2014-06-09"/>
+    <!-- Physical Exam, Finding template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.57" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>    
+    <text><%= entry.description %></text>
+    <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 => [value], :result_oids=>result_oids}) %>
+  </observation>
+</entry>
+<% end %>

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

@@ -0,0 +1,22 @@
+<% vals = entry.values.empty? ? [nil] : entry.values
+   vals.each do |value|
+ %>
+<entry>
+  <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Procedure Activity Procedure (Consolidation) template -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.13" extension="2014-06-09"/>
+    <!-- Physical Exam, Performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.59" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['SNOMED-CT', 'ICD-9-CM', 'ICD-10-CM', 'LOINC'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <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 => [value], :result_oids=>result_oids}) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
+  </observation>
+</entry>
+<% end %>

data/templates/cat1/r3/_2.16.840.1.113883.10.20.24.3.62.cat1.erb

@@ -0,0 +1,36 @@
+<entry>
+  <observation classCode="OBS" moodCode="EVN">
+    <templateId root="2.16.840.1.113883.10.20.24.3.62" extension="2014-12-01"/>
+    <templateId root="2.16.840.1.113883.10.20.24.3.104" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <code code="ASSERTION" 
+          codeSystem="2.16.840.1.113883.5.4"
+          codeSystemName="ActCode"
+          displayName="Assertion"/>  
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+    </effectiveTime>
+    <value xsi:type="CD"
+           code="102460003"
+           codeSystem="2.16.840.1.113883.6.96"
+           codeSystemName="SNOMED CT"
+           displayName="Decreased tolerance"/>
+    <entryRelationship typeCode="CAUS" inversionInd="true">
+      <procedure classCode="PROC" moodCode="EVN">
+        <!--  Procedure performed template -->
+        <templateId root="2.16.840.1.113883.10.20.24.3.64" extension="2014-12-01"/>
+        <!-- Procedure Activity Procedure-->
+        <templateId root="2.16.840.1.113883.10.20.22.4.14" extension="2014-06-09"/>
+        <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+        <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+        <text><%= entry.description %></text>
+        <statusCode code="completed"/>
+        <effectiveTime>
+          <low <%= value_or_null_flavor(entry.start_time) %>/>
+          <high <%= value_or_null_flavor(entry.end_time) %>/>
+        </effectiveTime>
+      </procedure>
+    </entryRelationship>
+  </observation>
+</entry>

data/templates/cat1/{_2.16.840.1.113883.10.20.24.3.63.cat1.erb → r3/_2.16.840.1.113883.10.20.24.3.63.cat1.erb}

@@ -1,18 +1,16 @@
 <entry>
   <procedure classCode="PROC" moodCode="RQO" <%== negation_indicator(entry) %>>
     <!-- Consolidated Plan of Care Activity Procedure TemplateId (Implied Template) -->
-    <templateId root="2.16.840.1.113883.10.20.22.4.41"/> 
+    <templateId root="2.16.840.1.113883.10.20.22.4.41" extension="2014-06-09"/> 
     <!-- QRDA Procedure, Order TemplateId --> 
-    <templateId root="2.16.840.1.113883.10.20.24.3.63"/> 
+    <templateId root="2.16.840.1.113883.10.20.24.3.63" extension="2014-12-01"/> 
     <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', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
     <text><%= entry.description %></text>
-    <statusCode code="new"/>
-    <!-- Attribute: method--> 
-    <methodCode nullFlavor="UNK"/>
-    
+    <statusCode code="active"/>
     <!-- Attribute: datetime --> 
     <author>
+      <templateId root="2.16.840.1.113883.10.20.22.4.119"/>
       <time <%= value_or_null_flavor(entry.start_time) %>/> 
       <assignedAuthor>
         <id nullFlavor="NA"/>
@@ -20,4 +18,4 @@
     </author>
     <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
   </procedure>
-</entry>
+</entry>

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

@@ -0,0 +1,51 @@
+<entry>
+  <procedure classCode="PROC" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!--  Procedure performed template -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.64" extension="2014-12-01"/>
+    <!-- Procedure Activity Procedure-->
+    <templateId root="2.16.840.1.113883.10.20.22.4.14" extension="2014-06-09"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map, 'preferred_code_sets' => ['LOINC', 'SNOMED-CT', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <statusCode code="completed"/>
+    <effectiveTime>
+      <low <%= value_or_null_flavor(entry.start_time) %>/>
+      <high <%= value_or_null_flavor(entry.end_time) %>/>
+    </effectiveTime>
+    <%== render(:partial => 'ordinality', :locals => {:entry => entry, :ordinality_oids=>field_oids["ORDINAL"]}) %>
+    <%== 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">
+        <templateId root="2.16.840.1.113883.10.20.24.3.89"/>
+        <id root="1.3.6.1.4.1.115" extension="<%= identifier_for([entry.id, entry.incision_time]) %>" />
+        <code code="34896006" 
+              codeSystem="2.16.840.1.113883.6.96"
+              codeSystemName="SNOMED CT" 
+              displayName="incision"/>
+              <effectiveTime <%= value_or_null_flavor(entry.incision_time) %>/>
+      </procedure>
+    </entryRelationship>
+    <% end -%>
+
+    <% entry.values.each do |value| %>
+      <entryRelationship typeCode="REFR">
+       <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="2014-06-09"/>
+         <!-- Result (QRDA I R3) -->
+         <templateId root="2.16.840.1.113883.10.20.24.3.87" extension="2014-12-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' => ['LOINC', 'SNOMED-CT', 'CPT', 'ICD-9-PCS', 'ICD-10-PCS'], '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 => [value]}) %>
+        
+       </observation>
+     </entryRelationship>
+   <% end %>
+  </procedure>
+</entry>

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

@@ -0,0 +1,23 @@
+<% vals = entry.values.empty? ? [nil] : entry.values 
+   vals.each do |value| 
+ %>   
+<entry>
+  <observation classCode="OBS" moodCode="EVN" <%== negation_indicator(entry) %>>
+    <!-- Consolidation Assessment Scale Observation templateId -->
+    <templateId root="2.16.840.1.113883.10.20.22.4.69"/>
+    <!-- Risk Category Assessment -->
+    <templateId root="2.16.840.1.113883.10.20.24.3.69" extension="2014-12-01"/>
+    <id root="1.3.6.1.4.1.115" extension="<%= entry.id %>"/>
+    <%== code_display(entry, 'value_set_map' => filtered_vs_map,'preferred_code_sets' => ['LOINC', 'SNOMED-CT'], 'extra_content' => "sdtc:valueSet=\"#{value_set_oid}\"") %>
+    <text><%= entry.description %></text>
+    <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 => [value], :result_oids=>result_oids} ) %>
+    <%== render(:partial => 'reason', :locals => {:entry => entry, :reason_oids=>field_oids["REASON"]}) %>
+  </observation>
+</entry>
+<% end %>