Forráskód Böngészése

Note UI - RHS segments show review and plan

Vijayakrishnan 3 éve
szülő
commit
00936f2fd4

+ 10 - 5
resources/views/app/patient/segment-templates/allergies/summary.blade.php

@@ -28,6 +28,8 @@ $plural = 'Allergies';
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $review = $point->lastChildReview; ?>
+        <?php if($review && @($review->data)) $review->data = json_decode($review->data); ?>
         <?php $numVisible++; ?>
         <tr>
             <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
@@ -45,12 +47,15 @@ $plural = 'Allergies';
             </td>
             <td class="px-2 width-300px">
                 <div>
+                    <?php if(!!$review): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Subj:</b><span>{!! $review->data->value !!}</span>
+                    </div>
+                    <?php endif; ?>
                     <?php if(!!$plan): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $plan->data->value !!}</span>
-                        </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Plan:</b><span>{!! $plan->data->value !!}</span>
+                    </div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 10 - 5
resources/views/app/patient/segment-templates/goals/summary.blade.php

@@ -19,6 +19,8 @@ $plural = 'Goals';
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $review = $point->lastChildReview; ?>
+        <?php if($review && @($review->data)) $review->data = json_decode($review->data); ?>
         <?php $numVisible++; ?>
         <tr>
             <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
@@ -36,12 +38,15 @@ $plural = 'Goals';
             </td>
             <td class="px-2 width-300px">
                 <div>
+                    <?php if(!!$review): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Subj:</b><span>{!! $review->data->value !!}</span>
+                    </div>
+                    <?php endif; ?>
                     <?php if(!!$plan): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $plan->data->value !!}</span>
-                        </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Plan:</b><span>{!! $plan->data->value !!}</span>
+                    </div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 8 - 3
resources/views/app/patient/segment-templates/medications/summary.blade.php

@@ -24,6 +24,8 @@ $plural = 'Medications';
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $review = $point->lastChildReview; ?>
+        <?php if($review && @($review->data)) $review->data = json_decode($review->data); ?>
         <?php $numVisible++; ?>
         <tr>
             <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
@@ -41,12 +43,15 @@ $plural = 'Medications';
             </td>
             <td class="px-2 width-300px">
                 <div>
+                    <?php if(!!$review): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Subj:</b><span>{!! $review->data->value !!}</span>
+                    </div>
+                    <?php endif; ?>
                     <?php if(!!$plan): ?>
                     <div class="pl-3 mt-1 d-flex align-items-baseline">
-                        <span>{!! $plan->data->value !!}</span>
+                        <b class="text-secondary mr-1">Plan:</b><span>{!! $plan->data->value !!}</span>
                     </div>
-                    <?php elseif($rel): ?>
-                    <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">                

+ 10 - 5
resources/views/app/patient/segment-templates/problems/summary.blade.php

@@ -19,6 +19,8 @@ $plural = 'Problems';
         <?php $rel = $point->relevanceToNote($note); ?>
         <?php $plan = $point->lastChildPlan; ?>
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $review = $point->lastChildReview; ?>
+        <?php if($review && @($review->data)) $review->data = json_decode($review->data); ?>
         <?php $numVisible++; ?>
         <tr>
             <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
@@ -36,12 +38,15 @@ $plural = 'Problems';
             </td>
             <td class="px-2 width-300px">
                 <div>
+                    <?php if(!!$review): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Subj:</b><span>{!! $review->data->value !!}</span>
+                    </div>
+                    <?php endif; ?>
                     <?php if(!!$plan): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $plan->data->value !!}</span>
-                        </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-plan text-warning-mellow text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Plan missing</div>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <b class="text-secondary mr-1">Plan:</b><span>{!! $plan->data->value !!}</span>
+                    </div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">