Bläddra i källkod

Merge branch 'dev' into dev-vj

Vijayakrishnan 3 år sedan
förälder
incheckning
d1ac2318c7

+ 15 - 4
resources/views/app/patient/segment-templates/covid_follow-up/summary.blade.php

@@ -263,15 +263,26 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
 
     <div class="mb-2">
         <label class="mb-1">Asked patient top three wishes for health. They replied:</label>
-        <div class="mt-1">1. {{@$contentData ['top_wish_1']}}</div>
-        <div class="mt-1">2. {{@$contentData ['top_wish_2']}}</div>
-        <div class="mt-1">3. {{@$contentData ['top_wish_3']}}</div>
+        @if(!@$contentData['top_wish_1'] && !@$contentData['top_wish_2'] && !@$contentData['top_wish_3'])
+        <?= segment_template_summary_value_display('') ?>
+        @ndif
+        <ol class="mt-1">
+            @if(@$contentData['top_wish_1'])
+            <li>{{@$contentData['top_wish_1']}}</li>   
+            @endif
+            @if(@$contentData['top_wish_2'])
+            <li>{{@$contentData['top_wish_2']}}</li>   
+            @endif
+            @if(@$contentData['top_wish_3'])
+            <li>{{@$contentData['top_wish_3']}}</li>   
+            @endif
+        </ol>
     </div>
     <hr class="my-3">
 
     <div class="mb-2">
         <label class="mb-1">Next follow-up for:</label>
-        {{@$contentData ['follow_up_for']}}
+        <?= segment_template_summary_value_display(@$contentData['follow_up_for']) ?>
     </div>
 
     @if(@$contentData['ans_hypertension_rpm_education'])