show.cat3.erb in health-data-standards-3.2.12

- old
+ new

@@ -10,11 +10,12 @@
   -->
   <realmCode code="US"/>
   <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
   <!-- QRDA Category III Release 1 template ID (this template ID differs from QRDA III comment only template ID). -->
   <templateId root="2.16.840.1.113883.10.20.27.1.1"/>
-  <id root="<%= UUID.generate %>"/>
+  <%== render :partial=>"id", :locals=>{identifier: header.identifier} %>
+  
   <!-- SHALL QRDA III document type code -->
   <code code="55184-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"
     displayName="Quality Reporting Document Architecture Calculated Summary Report"/>
   <!-- SHALL Title, SHOULD have this content -->
   <title>QRDA Calculated Summary Report</title>
@@ -28,57 +29,43 @@
   <recordTarget>
     <patientRole>
       <id nullFlavor="NA"/>
     </patientRole>
   </recordTarget>
+
+  <%== render :partial=>"author", :collection=>header.authors %>
   <!-- SHALL have 1..* author. MAY be device or person. 
     The author of the CDA document in this example is a device at a data submission vendor/registry. -->
-  <author>
-    <time value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
-    <assignedAuthor>
-      <!-- Registry author ID -->
-      <id extension="Cypress" root="MITRE"/>
-      <assignedAuthoringDevice>
-        <softwareName></softwareName>
-      </assignedAuthoringDevice>
-      <representedOrganization>
-        <!-- Represents unique registry organization TIN -->
-        <id root="root" extension="ext"/>
-        <!-- Contains name - specific registry not required-->
-        <name></name>
-      </representedOrganization>
-    </assignedAuthor>
-  </author>
+ 
   <!-- The custodian of the CDA document is the same as the legal authenticator in this 
   example and represents the reporting organization. -->
   <!-- SHALL -->
   <custodian>
     <assignedCustodian>
-      <representedCustodianOrganization>
-        <!-- SHALL have an id - This is an example root -->
-        <id root="root"/>
-        <!-- SHOULD Name not required -->
-        <name>Cypress</name>
-      </representedCustodianOrganization>
+      <%== render :partial=>"id", :collection=>header.custodian.organization.ids, :id=>"identifier" %>
+      <%== render :partial=>"organization", :locals=>{organization: header.custodian.organization} %>
     </assignedCustodian>
   </custodian>
   <!-- The legal authenticator of the CDA document is a single person who is at the 
     same organization as the custodian in this example. This element must be present. -->
   <!-- SHALL -->
   <legalAuthenticator>
     <!-- SHALL -->
-    <time value="<%= Time.now.utc.to_formatted_s(:number) %>"/>
+    <time value="<%= header.legal_authenticator.time.utc.to_formatted_s(:number) %>"/>
     <!-- SHALL -->
     <signatureCode code="S"/>
     <assignedEntity>
       <!-- SHALL ID -->
-      <id root="root"/>
-      <!-- SHALL -->
-      <representedOrganization>
-        <!-- SHALL Id -->
-        <!-- example root -->
-        <id root="root"/>
-      </representedOrganization>
+      <%== render :partial=>"id", :collection=>header.legal_authenticator.ids, :id=>"identifier" %>
+      <%== render :partial=>"address" , :collection=>header.legal_authenticator.addresses %>
+      <assignedPerson>
+        <name>
+           <given><%= header.legal_authenticator.person.given %></given>
+           <family><%= header.legal_authenticator.person.family %></family>
+        </name>
+     </assignedPerson>
+
+      <%== render :partial=>"organization", :locals=>{organization: header.legal_authenticator.organization} %>
     </assignedEntity>
   </legalAuthenticator>
   
 
   <!-- 