Ver Fonte

Omega - plan meds, allergies, probs, goals and care team

Vijayakrishnan há 3 anos atrás
pai
commit
ee61588402
40 ficheiros alterados com 719 adições e 58 exclusões
  1. 12 6
      resources/views/app/patient/note/dashboard_script.blade.php
  2. 0 2
      resources/views/app/patient/segment-templates/intake_allergies/summary.blade.php
  3. 0 2
      resources/views/app/patient/segment-templates/intake_care_team/summary.blade.php
  4. 0 2
      resources/views/app/patient/segment-templates/intake_goals/summary.blade.php
  5. 0 2
      resources/views/app/patient/segment-templates/intake_medications/summary.blade.php
  6. 0 2
      resources/views/app/patient/segment-templates/intake_problems/summary.blade.php
  7. 0 2
      resources/views/app/patient/segment-templates/intake_supplements/summary.blade.php
  8. 71 1
      resources/views/app/patient/segment-templates/omega_allergies/summary.blade.php
  9. 66 1
      resources/views/app/patient/segment-templates/omega_care_team/summary.blade.php
  10. 61 1
      resources/views/app/patient/segment-templates/omega_goals/summary.blade.php
  11. 67 1
      resources/views/app/patient/segment-templates/omega_medications/summary.blade.php
  12. 0 0
      resources/views/app/patient/segment-templates/omega_plan_allergies/edit.blade.php
  13. 80 0
      resources/views/app/patient/segment-templates/omega_plan_allergies/summary.blade.php
  14. 0 0
      resources/views/app/patient/segment-templates/omega_plan_care_team/edit.blade.php
  15. 75 0
      resources/views/app/patient/segment-templates/omega_plan_care_team/summary.blade.php
  16. 0 0
      resources/views/app/patient/segment-templates/omega_plan_goals/edit.blade.php
  17. 70 0
      resources/views/app/patient/segment-templates/omega_plan_goals/summary.blade.php
  18. 0 0
      resources/views/app/patient/segment-templates/omega_plan_medications/edit.blade.php
  19. 76 0
      resources/views/app/patient/segment-templates/omega_plan_medications/summary.blade.php
  20. 0 0
      resources/views/app/patient/segment-templates/omega_plan_problems/edit.blade.php
  21. 71 0
      resources/views/app/patient/segment-templates/omega_plan_problems/summary.blade.php
  22. 62 1
      resources/views/app/patient/segment-templates/omega_problems/summary.blade.php
  23. 0 2
      resources/views/app/patient/segment-templates/plan_allergies/summary.blade.php
  24. 0 2
      resources/views/app/patient/segment-templates/plan_care_team/summary.blade.php
  25. 0 2
      resources/views/app/patient/segment-templates/plan_free_text_v2/allergies.blade.php
  26. 0 2
      resources/views/app/patient/segment-templates/plan_free_text_v2/care_team.blade.php
  27. 0 2
      resources/views/app/patient/segment-templates/plan_free_text_v2/goals.blade.php
  28. 0 2
      resources/views/app/patient/segment-templates/plan_free_text_v2/medications.blade.php
  29. 0 2
      resources/views/app/patient/segment-templates/plan_free_text_v2/problems.blade.php
  30. 0 2
      resources/views/app/patient/segment-templates/plan_goals/summary.blade.php
  31. 0 2
      resources/views/app/patient/segment-templates/plan_medications/summary.blade.php
  32. 0 2
      resources/views/app/patient/segment-templates/plan_problems/summary.blade.php
  33. 0 2
      resources/views/app/patient/segment-templates/plan_supplements/summary.blade.php
  34. 0 2
      resources/views/app/patient/segment-templates/subjective_general_v2/allergies.blade.php
  35. 0 2
      resources/views/app/patient/segment-templates/subjective_general_v2/care_team.blade.php
  36. 0 2
      resources/views/app/patient/segment-templates/subjective_general_v2/goals.blade.php
  37. 0 2
      resources/views/app/patient/segment-templates/subjective_general_v2/medications.blade.php
  38. 0 2
      resources/views/app/patient/segment-templates/subjective_general_v2/problems.blade.php
  39. 7 2
      resources/views/app/patient/wizard-partials/common-script.blade.php
  40. 1 1
      resources/views/app/practice-management/visit-templates/visit-template-segment-templates/create.blade.php

+ 12 - 6
resources/views/app/patient/note/dashboard_script.blade.php

@@ -121,41 +121,47 @@
                         if(editParent.is('[data-segment-template-name="plan_allergies"]') ||
                             editParent.is('[data-segment-template-name="intake_allergies"]') ||
                             editParent.is('[data-segment-template-name="allergies"]') ||
-                            editParent.is('[data-segment-template-name="omega_allergies"]')) {
+                            editParent.is('[data-segment-template-name="omega_allergies"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_allergies"]')) {
                             $('.note-bottom-toolbar .allergies-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_problems"]') ||
                             editParent.is('[data-segment-template-name="intake_problems"]') ||
                             editParent.is('[data-segment-template-name="problems"]') ||
-                            editParent.is('[data-segment-template-name="omega_problems"]')) {
+                            editParent.is('[data-segment-template-name="omega_problems"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_problems"]')) {
                             $('.note-bottom-toolbar .problems-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_medications"]') ||
                             editParent.is('[data-segment-template-name="intake_medications"]') ||
                             editParent.is('[data-segment-template-name="medications"]') ||
-                            editParent.is('[data-segment-template-name="omega_medications"]')) {
+                            editParent.is('[data-segment-template-name="omega_medications"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_medications"]')) {
                             $('.note-bottom-toolbar .medications-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_goals"]') ||
                             editParent.is('[data-segment-template-name="intake_goals"]') ||
                             editParent.is('[data-segment-template-name="goals"]') ||
-                            editParent.is('[data-segment-template-name="omega_goals"]')) {
+                            editParent.is('[data-segment-template-name="omega_goals"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_goals"]')) {
                             $('.note-bottom-toolbar .goals-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_care_team"]') ||
                             editParent.is('[data-segment-template-name="intake_care_team"]') ||
                             editParent.is('[data-segment-template-name="care_team"]') ||
-                            editParent.is('[data-segment-template-name="omega_care_team"]')) {
+                            editParent.is('[data-segment-template-name="omega_care_team"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_care_team"]')) {
                             $('.note-bottom-toolbar .careteam-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_supplements"]') ||
                             editParent.is('[data-segment-template-name="intake_supplements"]') ||
-                            editParent.is('[data-segment-template-name="omega_supplements"]')) {
+                            editParent.is('[data-segment-template-name="omega_supplements"]') ||
+                            editParent.is('[data-segment-template-name="omega_plan_supplements"]')) {
                             $('.note-bottom-toolbar .supplements-center-trigger').trigger('click');
                             return false;
                         }

+ 0 - 2
resources/views/app/patient/segment-templates/intake_allergies/summary.blade.php

@@ -44,8 +44,6 @@ $plural = 'Allergies';
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
                             <span>{!! $review->data->value !!}</span>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>	
                 <div class="pl-3">

+ 0 - 2
resources/views/app/patient/segment-templates/intake_care_team/summary.blade.php

@@ -41,8 +41,6 @@ $plural = 'Care team members';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/intake_goals/summary.blade.php

@@ -36,8 +36,6 @@ $plural = 'Goals';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">                

+ 0 - 2
resources/views/app/patient/segment-templates/intake_medications/summary.blade.php

@@ -41,8 +41,6 @@ $plural = 'Medications';
 					<div class="d-flex align-items-baseline">
 						<span>{!! $review->data->value !!}</span>
 					</div>
-				<?php elseif(false && $rel): ?>
-					<div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
 				<?php endif; ?>
 			</div>
 			<div class="pl-3 d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/intake_problems/summary.blade.php

@@ -36,8 +36,6 @@ $plural = 'Problems';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review-critical text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>HPI missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/intake_supplements/summary.blade.php

@@ -43,8 +43,6 @@ $numRelevant = 0;
                 <div class="text-secondary font-weight-bold">Subjective</div>
                 <div>{!! $review->data->value !!}</div>
             </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

+ 71 - 1
resources/views/app/patient/segment-templates/omega_allergies/summary.blade.php

@@ -1 +1,71 @@
-@include('app.patient.allergies-center', ['patient' => $patient, 'note' => $note, 'summaryView' => true])
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'ALLERGY', $note);
+$tracker = Point::getGlobalSingletonOfCategory($patient, 'NO_KNOWN_TRACKER');
+$numRelevant = 0;
+$plural = 'Allergies';
+?>
+
+<?php if($tracker && @($tracker->data->no_known_drug_allergies)): ?>
+    <div class="text-secondary mb-2"><span>-</span></div>
+<?php endif; ?>
+<?php if($tracker && @($tracker->data->no_known_allergies_of_any_type)): ?>
+    <div class="text-secondary mb-2"><span>-</span></div>
+<?php endif; ?>
+
+<?php if(!$tracker || !@($tracker->data->no_known_allergies_of_any_type)): ?>
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+<table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+	<?php $rel = $point->relevanceToNote($note); ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                    
+                </div>
+		    </td>
+            <td class="width-300px">
+                <div class="pl-3">
+                    <?php $review = $point->childReviewAddedInNote($note); ?>
+                    <?php if(!!$review): ?>
+                            <span>{!! $review->data->value !!}</span>
+                    <?php endif; ?>
+                </div>	
+                <div class="pl-3">
+                    <?php if ($point->is_removed): ?>
+                            @if($point->removal_reason_category === 'DURING_VISIT')
+                                <span class="text-sm text-secondary">Removed during visit</span>
+                            @elseif($point->removal_reason_category === 'ON_INTAKE')
+                                <span class="text-sm text-secondary">Removed on intake</span>
+                            @endif
+                        <?php elseif ($point->added_in_note_id === $note->id): ?>
+                            <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                                <span class="text-sm text-success">* Diagnosed during visit</span>
+                            <?php else: ?>
+                                <span class="text-sm text-info">* Added on intake</span>
+                            <?php endif;?>
+                        <?php endif; ?>
+                </div>	
+
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+</table>
+<?php endif; ?>
+<?php endif; ?>

+ 66 - 1
resources/views/app/patient/segment-templates/omega_care_team/summary.blade.php

@@ -1 +1,66 @@
-@include('app.patient.careteam-center', ['patient' => $patient, 'note' => $note, 'summaryView' => true])
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'CARE_TEAM_MEMBER', $note);
+$numRelevant = 0;
+$plural = 'Care team members';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
+                    <?= !!@($point->data->organization) ? '/&nbsp;' . @($point->data->organization) . '' : '' ?><br>
+                    <?= !!@($point->data->phone) ? 'Ph: ' . @($point->data->phone) . '' : '' ?>
+                    <?= !!@($point->data->fax) ? '&nbsp;/&nbsp;Fax: ' . @($point->data->fax) . '<br>' : '' ?>
+                    <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php $review = $point->childReviewAddedInNote($note); ?>
+                    <?php if(!!$review): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $review->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Added during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+<?php endif; ?>

+ 61 - 1
resources/views/app/patient/segment-templates/omega_goals/summary.blade.php

@@ -1 +1,61 @@
-@include('app.patient.goals-center', ['patient' => $patient, 'note' => $note, 'summaryView' => true])
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'GOAL', $note);
+$numRelevant = 0;
+$plural = 'Goals';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php $review = $point->childReviewAddedInNote($note); ?>
+                    <?php if(!!$review): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $review->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">                
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+<?php endif; ?>

+ 67 - 1
resources/views/app/patient/segment-templates/omega_medications/summary.blade.php

@@ -1 +1,67 @@
-@include('app.patient.medications-center', ['patient' => $patient, 'note' => $note, 'summaryView' => true])
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
+$tracker = Point::getGlobalSingletonOfCategory($patient, 'NO_KNOWN_TRACKER');
+$numRelevant = 0;
+$plural = 'Medications';
+?>
+
+<?php if($tracker && @($tracker->data->no_known_medications)): ?>
+    <div class="text-secondary"><span>-</span></div>
+<?php endif; ?>
+<?php if(!$tracker || !@($tracker->data->no_known_medications)): ?>
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+	<table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+	<tr>
+		<td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+			@if($rel)
+				<?php $numRelevant++; ?>
+				{{ $j }}.*
+			@else
+				{{ $j }}.
+			@endif
+		</td>
+		<td class="px-2 width-300px">
+			<div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+				<?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+			</div>
+		</td>
+		<td class="width-300px">
+			<div class="pl-3">
+				<?php $review = $point->childReviewAddedInNote($note); ?>
+				<?php if(!!$review): ?>
+					<div class="d-flex align-items-baseline">
+						<span>{!! $review->data->value !!}</span>
+					</div>
+				<?php endif; ?>
+			</div>
+			<div class="pl-3 d-flex align-items-baseline">
+				<?php if ($point->is_removed): ?>
+					@if($point->removal_reason_category === 'DURING_VISIT')
+						<span class="text-sm text-secondary">Removed during visit</span>
+					@elseif($point->removal_reason_category === 'ON_INTAKE')
+						<span class="text-sm text-secondary">Removed on intake</span>
+					@endif
+				<?php elseif ($point->added_in_note_id === $note->id): ?>
+					<?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+						<span class="text-sm text-success">* Prescribed during visit</span>
+					<?php else: ?>
+						<span class="text-sm text-info">* Added on intake</span>
+					<?php endif;?>
+				<?php endif; ?>
+			</div>
+		</td>
+		<td></td>
+	</tr>
+    <?php endforeach; ?>
+	</table>
+<?php endif; ?>
+<?php endif; ?>

+ 0 - 0
resources/views/app/patient/segment-templates/omega_plan_allergies/edit.blade.php


+ 80 - 0
resources/views/app/patient/segment-templates/omega_plan_allergies/summary.blade.php

@@ -0,0 +1,80 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getPlanPointsOfCategory($patient, 'ALLERGY', $note);
+$tracker = Point::getGlobalSingletonOfCategory($patient, 'NO_KNOWN_TRACKER');
+$numRelevant = 0;
+$numVisible = 0;
+$plural = 'Allergies';
+?>
+
+<?php if($tracker && @($tracker->data->no_known_drug_allergies)): ?>
+    <div class="text-secondary mb-2"><span>-</span></div>
+<?php endif; ?>
+<?php if($tracker && @($tracker->data->no_known_allergies_of_any_type)): ?>
+    <div class="text-secondary mb-2"><span>-</span></div>
+<?php endif; ?>
+
+<?php if(!$tracker || !@($tracker->data->no_known_allergies_of_any_type)): ?>
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <?php $plan = $point->lastChildPlan; ?>
+        <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $numVisible++; ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+    @if(!$numVisible)
+        <div class="d-flex align-items-baseline mr-1">
+            <span class="text-secondary">-</span>
+        </div>
+    @endif
+<?php endif; ?>
+<?php endif; ?>

+ 0 - 0
resources/views/app/patient/segment-templates/omega_plan_care_team/edit.blade.php


+ 75 - 0
resources/views/app/patient/segment-templates/omega_plan_care_team/summary.blade.php

@@ -0,0 +1,75 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getPlanPointsOfCategory($patient, 'CARE_TEAM_MEMBER', $note);
+$numRelevant = 0;
+$numVisible = 0;
+$plural = 'Care team members';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <?php $plan = $point->lastChildPlan; ?>
+        <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $numVisible++; ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
+                    <?= !!@($point->data->organization) ? '/&nbsp;' . @($point->data->organization) . '' : '' ?><br>
+                    <?= !!@($point->data->phone) ? 'Ph: ' . @($point->data->phone) . '' : '' ?>
+                    <?= !!@($point->data->fax) ? '&nbsp;/&nbsp;Fax: ' . @($point->data->fax) . '<br>' : '' ?>
+                    <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div class="pl-3">
+                    <?php if(!!$plan): ?>
+                        <div class="mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="pl-3 d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="mt-1 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="mt-1 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="mt-1 text-sm text-success">* Added during visit</span>
+                        <?php else: ?>
+                            <span class="mt-1 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+    @if(!$numVisible)
+        <div class="d-flex align-items-baseline mr-1">
+            <span class="text-secondary">-</span>
+        </div>
+    @endif
+<?php endif; ?>

+ 0 - 0
resources/views/app/patient/segment-templates/omega_plan_goals/edit.blade.php


+ 70 - 0
resources/views/app/patient/segment-templates/omega_plan_goals/summary.blade.php

@@ -0,0 +1,70 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getPlanPointsOfCategory($patient, 'GOAL', $note);
+$numRelevant = 0;
+$numVisible = 0;
+$plural = 'Goals';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <?php $plan = $point->lastChildPlan; ?>
+        <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $numVisible++; ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+    @if(!$numVisible)
+        <div class="d-flex align-items-baseline mr-1">
+            <span class="text-secondary">-</span>
+        </div>
+    @endif
+<?php endif; ?>

+ 0 - 0
resources/views/app/patient/segment-templates/omega_plan_medications/edit.blade.php


+ 76 - 0
resources/views/app/patient/segment-templates/omega_plan_medications/summary.blade.php

@@ -0,0 +1,76 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getPlanPointsOfCategory($patient, 'MEDICATION', $note);
+$tracker = Point::getGlobalSingletonOfCategory($patient, 'NO_KNOWN_TRACKER');
+$numRelevant = 0;
+$numVisible = 0;
+$plural = 'Medications';
+?>
+
+<?php if($tracker && @($tracker->data->no_known_medications)): ?>
+    <div class="text-secondary"><span>-</span></div>
+<?php endif; ?>
+<?php if(!$tracker || !@($tracker->data->no_known_medications)): ?>
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+        <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <?php $plan = $point->lastChildPlan; ?>
+        <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $numVisible++; ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php if(!!$plan): ?>
+                    <div class="pl-3 mt-1 d-flex align-items-baseline">
+                        <span>{!! $plan->data->value !!}</span>
+                    </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">                
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+    @if(!$numVisible)
+        <div class="d-flex align-items-baseline mr-1">
+            <span class="text-secondary">-</span>
+        </div>
+    @endif
+<?php endif; ?>
+<?php endif; ?>

+ 0 - 0
resources/views/app/patient/segment-templates/omega_plan_problems/edit.blade.php


+ 71 - 0
resources/views/app/patient/segment-templates/omega_plan_problems/summary.blade.php

@@ -0,0 +1,71 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getPlanPointsOfCategory($patient, 'PROBLEM', $note);
+$numRelevant = 0;
+$numVisible = 0;
+$plural = 'Problems';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php if($point->is_removed && $point->is_removed_due_to_entry_error) continue; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+        <?php $plan = $point->lastChildPlan; ?>
+        <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+        <?php $numVisible++; ?>
+        <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php if(!!$plan): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $plan->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+            <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+    @if(!$numVisible)
+        <div class="d-flex align-items-baseline mr-1">
+            <span class="text-secondary">-</span>
+        </div>
+    @endif
+<?php endif; ?>
+

+ 62 - 1
resources/views/app/patient/segment-templates/omega_problems/summary.blade.php

@@ -1 +1,62 @@
-@include('app.patient.problems-center', ['patient' => $patient, 'note' => $note, 'summaryView' => true])
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'PROBLEM', $note);
+$numRelevant = 0;
+$plural = 'Problems';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+       <tr>
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    {{ $j }}.*
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2 width-300px">
+                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                </div>
+            </td>
+            <td class="px-2 width-300px">
+                <div>
+                    <?php $review = $point->childReviewAddedInNote($note); ?>
+                    <?php if(!!$review): ?>
+                        <div class="pl-3 mt-1 d-flex align-items-baseline">
+                            <span>{!! $review->data->value !!}</span>
+                        </div>
+                    <?php endif; ?>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <?php if ($point->is_removed): ?>
+                        @if($point->removal_reason_category === 'DURING_VISIT')
+                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                        @elseif($point->removal_reason_category === 'ON_INTAKE')
+                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                        @endif
+                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                            <span class="ml-2 text-sm text-success">* Diagnosed during visit</span>
+                        <?php else: ?>
+                            <span class="ml-2 text-sm text-info">* Added on intake</span>
+                        <?php endif;?>
+                    <?php endif; ?>
+                </div>
+            </td>
+           <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+<?php endif; ?>
+

+ 0 - 2
resources/views/app/patient/segment-templates/plan_allergies/summary.blade.php

@@ -49,8 +49,6 @@ $plural = 'Allergies';
                         <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>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_care_team/summary.blade.php

@@ -45,8 +45,6 @@ $plural = 'Care team members';
                         <div class="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>
                     <?php endif; ?>
                 </div>
                 <div class="pl-3 d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_free_text_v2/allergies.blade.php

@@ -41,8 +41,6 @@ $plural = 'Allergies';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $plan->data->value !!}</span>
                         </div>
-                    <?php elseif(false && $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">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_free_text_v2/care_team.blade.php

@@ -44,8 +44,6 @@ $plural = 'Care team members';
                         <div class="mt-1 d-flex align-items-baseline">
                             <span>{!! $plan->data->value !!}</span>
                         </div>
-                    <?php elseif(false && $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="pl-3 d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_free_text_v2/goals.blade.php

@@ -39,8 +39,6 @@ $plural = 'Goals';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $plan->data->value !!}</span>
                         </div>
-                    <?php elseif(false && $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">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_free_text_v2/medications.blade.php

@@ -41,8 +41,6 @@ $plural = 'Medications';
                     <div class="pl-3 mt-1 d-flex align-items-baseline">
                         <span>{!! $plan->data->value !!}</span>
                     </div>
-                    <?php elseif(false && $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">                

+ 0 - 2
resources/views/app/patient/segment-templates/plan_free_text_v2/problems.blade.php

@@ -39,8 +39,6 @@ $plural = 'Problems';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $plan->data->value !!}</span>
                         </div>
-                    <?php elseif(false && $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">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_goals/summary.blade.php

@@ -40,8 +40,6 @@ $plural = 'Goals';
                         <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>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_medications/summary.blade.php

@@ -45,8 +45,6 @@ $plural = 'Medications';
                     <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>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">                

+ 0 - 2
resources/views/app/patient/segment-templates/plan_problems/summary.blade.php

@@ -40,8 +40,6 @@ $plural = 'Problems';
                         <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>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/plan_supplements/summary.blade.php

@@ -58,8 +58,6 @@ $numVisible = 0;
                 <div class="text-secondary font-weight-bold">Plan</div>
                 <div>{!! $review->data->value !!}</div>
             </div>
-            <?php elseif($rel): ?>
-            <div class="relevant-without-plan text-danger 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>
 

+ 0 - 2
resources/views/app/patient/segment-templates/subjective_general_v2/allergies.blade.php

@@ -43,8 +43,6 @@ $plural = 'Allergies';
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
                             <span>{!! $review->data->value !!}</span>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>	
                 <div class="pl-3">

+ 0 - 2
resources/views/app/patient/segment-templates/subjective_general_v2/care_team.blade.php

@@ -40,8 +40,6 @@ $plural = 'Care team members';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/subjective_general_v2/goals.blade.php

@@ -35,8 +35,6 @@ $plural = 'Goals';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif(false && $rel): ?>
-                        <div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">                

+ 0 - 2
resources/views/app/patient/segment-templates/subjective_general_v2/medications.blade.php

@@ -36,8 +36,6 @@ $plural = 'Medications';
 					<div class="d-flex align-items-baseline">
 						<span>{!! $review->data->value !!}</span>
 					</div>
-				<?php elseif(false && $rel): ?>
-					<div class="relevant-without-review text-warning-mellow mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
 				<?php endif; ?>
 			</div>
 			<div class="pl-3 d-flex align-items-baseline">

+ 0 - 2
resources/views/app/patient/segment-templates/subjective_general_v2/problems.blade.php

@@ -35,8 +35,6 @@ $plural = 'Problems';
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
                             <span>{!! $review->data->value !!}</span>
                         </div>
-                    <?php elseif($rel): ?>
-                        <div class="relevant-without-review-critical text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>HPI missing</div>
                     <?php endif; ?>
                 </div>
                 <div class="d-flex align-items-baseline">

+ 7 - 2
resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -323,6 +323,7 @@ parentSegment.find('#frm-add-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
@@ -362,6 +363,7 @@ parentSegment.find('.frm-edit-{{$label}}')
         @if(1 || $patient->core_note_id !== $note->id)
 
         let reviewContent = parsed && parsed.reviewValue ? parsed.reviewValue : '';
+        let planContent = parsed && parsed.planValue ? parsed.planValue : '';
 
         /*let compareWith = false;
         if(form.find('.disallow-if-review-same-as')) {
@@ -375,8 +377,6 @@ parentSegment.find('.frm-edit-{{$label}}')
             }
         }
 
-        let planContent = parsed && parsed.planValue ? parsed.planValue : '';
-
         compareWith = false;
         if(form.find('.disallow-if-plan-same-as')) {
             compareWith = $.trim(form.find('.disallow-if-plan-same-as').text());
@@ -452,6 +452,7 @@ parentSegment.find('.frm-edit-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
@@ -472,6 +473,7 @@ parentSegment.find('.frm-upsert-review-plan-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
@@ -626,6 +628,7 @@ parentSegment.find('.toggle-relevance')
                     $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                    $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
@@ -642,6 +645,7 @@ parentSegment.find('.toggle-relevance')
                         $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                        $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
@@ -681,6 +685,7 @@ parentSegment.find('.tracker-input')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="omega_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="omega_plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');

+ 1 - 1
resources/views/app/practice-management/visit-templates/visit-template-segment-templates/create.blade.php

@@ -8,7 +8,7 @@
 					<label>Segment Template<sup class="text-danger">*</sup></label>
 					<select name="segmentTemplateUid" class="form-control" select-2 required>
 						<option value=""></option>
-						<option v-for="t in segmentTemplates" v-bind:value="t.uid">@{{ t.default_display_title }}</option>
+						<option v-for="t in segmentTemplates" v-bind:value="t.uid">@{{ t.default_display_title }} (@{{ t.internal_name }})</option>
 					</select>
 				</div>
 				@if(@$position)