templates/_conditions.c32.erb in health-data-standards-0.7.1 vs templates/_conditions.c32.erb in health-data-standards-0.8.0

@@ -22,11 +22,11 @@
         <statusCode code="completed"/>
         <% else -%>
         <statusCode code="active"/>
         <% end -%>
         <effectiveTime>
-          <low value="<%= Time.at(entry.time).utc.to_formatted_s(:number) %>"/>
+          <low <%= value_or_null_flavor(entry.as_point_in_time) %>/>
         </effectiveTime>
         <entryRelationship typeCode="SUBJ" inversionInd="false">
           <observation classCode="OBS" moodCode="EVN">
             <templateId root="1.3.6.1.4.1.19376.1.5.3.1.4.5" assigningAuthorityName="IHE PCC"/>
             <templateId root="2.16.840.1.113883.10.20.1.28" assigningAuthorityName="CCD"/>
@@ -36,10 +36,10 @@
             <text>
               <reference value="#conditions-desc-<%= i %>"/>
             </text>
             <statusCode code="completed"/>
             <effectiveTime>
-              <low value="<%= Time.at(entry.time).utc.to_formatted_s(:number) %>"/>
+              <low <%= value_or_null_flavor(entry.as_point_in_time) %>/>
             </effectiveTime>
             <%== code_display(entry, {'tag_name' => 'value', 'extra_content' => 'xsi:type="CD"', 'preferred_code_sets' => ['SNOMED-CT']}) %>
             <% if entry.status -%>
             <entryRelationship typeCode="REFR">
               <observation classCode="OBS" moodCode="EVN">