Переглянути джерело

Removed during/on-a-prev visit text update in summaries

Vijayakrishnan 2 роки тому
батько
коміт
aa94900143

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

@@ -46,7 +46,11 @@ $plural = 'Allergies';
                     <span class="text-nowrap">
                         <?php if ($point->is_removed): ?>
                             @if($point->removal_reason_category === 'DURING_VISIT')
-                                <span class="text-sm text-secondary">Removed during visit</span>
+                                @if ($point->removed_in_note_id === $note->id)
+                                    <span class="text-sm text-secondary">Removed during visit</span>
+                                @else
+                                    <span class="text-sm text-secondary">Removed on a previous visit</span>
+                                @endif
                             @elseif($point->removal_reason_category === 'ON_INTAKE')
                                 <span class="text-sm text-secondary">Historic</span>
                             @endif

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

@@ -43,7 +43,11 @@ $plural = 'Care team members';
                         <span class="text-nowrap pl-2">
                         <?php if ($point->is_removed): ?>
                             @if($point->removal_reason_category === 'DURING_VISIT')
-                                <span class="text-sm text-secondary">Removed during visit</span>
+                                @if ($point->removed_in_note_id === $note->id)
+                                    <span class="text-sm text-secondary">Removed during visit</span>
+                                @else
+                                    <span class="text-sm text-secondary">Removed on a previous visit</span>
+                                @endif
                             @elseif($point->removal_reason_category === 'ON_INTAKE')
                                 <span class="text-sm text-secondary">Historic</span>
                             @endif

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

@@ -36,7 +36,11 @@ $plural = 'Goals';
                     <span class="text-nowrap">
                         <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
-                            <span class="text-sm text-secondary">Removed during visit</span>
+                            @if ($point->removed_in_note_id === $note->id)
+                                <span class="text-sm text-secondary">Removed during visit</span>
+                            @else
+                                <span class="text-sm text-secondary">Removed on a previous visit</span>
+                            @endif
                         @elseif($point->removal_reason_category === 'ON_INTAKE')
                             <span class="text-sm text-secondary">Historic</span>
                         @endif

+ 10 - 6
resources/views/app/patient/segment-templates/omega_medications/summary.blade.php

@@ -62,16 +62,20 @@ $plural = 'Medications';
 				<span class="text-nowrap">
 				<?php if ($point->is_removed): ?>
 				@if($point->removal_reason_category === 'DURING_VISIT')
-					<span class="text-sm text-secondary">Removed during visit</span>
+					@if ($point->removed_in_note_id === $note->id)
+						<span class="text-sm text-secondary">Removed during visit</span>
+					@else
+						<span class="text-sm text-secondary">Removed on a previous visit</span>
+					@endif
 				@elseif($point->removal_reason_category === 'ON_INTAKE')
 					<span class="text-sm text-secondary">Historic</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">Added during visit</span>
-				<?php else: ?>
-					<span class="text-sm text-info">Added on intake</span>
-				<?php endif;?>
+					<?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+						<span class="text-sm text-success">Added during visit</span>
+					<?php else: ?>
+						<span class="text-sm text-info">Added on intake</span>
+					<?php endif;?>
 				<?php endif; ?>
 				</span>
 			</div>

+ 17 - 13
resources/views/app/patient/segment-templates/omega_problems/summary.blade.php

@@ -21,19 +21,23 @@ $plural = 'Problems';
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?><?= !!@($point->data->icd) ? ' / ' . @($point->data->icd) : '' ?>:
                 </span>
 		        <span class="text-nowrap">
-                   <?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">Historic</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">* Added during visit</span>
-                        <?php else: ?>
-                            <span class="text-sm text-info">* Added on intake</span>
-                        <?php endif;?>
-                   <?php endif; ?>
+                <?php if ($point->is_removed): ?>
+                    @if($point->removal_reason_category === 'DURING_VISIT')
+                        @if ($point->removed_in_note_id === $note->id)
+                            <span class="text-sm text-secondary">Removed during visit</span>
+                        @else
+                            <span class="text-sm text-secondary">Removed on a previous visit</span>
+                        @endif
+                    @elseif($point->removal_reason_category === 'ON_INTAKE')
+                        <span class="text-sm text-secondary">Historic</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">* Added during visit</span>
+                    <?php else: ?>
+                        <span class="text-sm text-info">* Added on intake</span>
+                    <?php endif;?>
+                <?php endif; ?>
                 </span>
             </span>
            <div class="ml-3 mb-1">