소스 검색

Show care team details in summary HTML

Vijayakrishnan 3 년 전
부모
커밋
bd9e920335

+ 1 - 1
resources/views/app/patient/point-based-partials/care-team.blade.php

@@ -29,7 +29,7 @@ $careTeamMembers = \App\Models\Point::getPointsOfCategory($patient, "CARE_TEAM_M
         @foreach($careTeamMembers as $careTeamMember)
             <div class="mb-1">
                 <b><?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?></b>
-                <?= !!@($careTeamMember->data->spacialty) ? '/&nbsp;' . @($careTeamMember->data->spacialty) . '<br>' : '' ?>
+                <?= !!@($careTeamMember->data->specialty) ? '/&nbsp;' . @($careTeamMember->data->specialty) . '<br>' : '' ?>
                 <?= !!@($careTeamMember->data->organization) ? '/&nbsp;' . @($careTeamMember->data->organization) . '<br>' : '' ?>
             </div>
         @endforeach

+ 1 - 1
resources/views/app/patient/segment-templates/intake_care_team/edit.blade.php

@@ -39,7 +39,7 @@ $careTeamMembers = Point::getIntakePointsOfCategory($patient, 'CARE_TEAM_MEMBER'
                         <div class="d-flex align-items-baseline">
                             <div class="<?= $careTeamMember->is_removed ? 'strike-through' : '' ?>">
                                 <b><?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?></b>
-                                <?= !!@($careTeamMember->data->spacialty) ? '/&nbsp;' . @($careTeamMember->data->spacialty) : '' ?>
+                                <?= !!@($careTeamMember->data->specialty) ? '/&nbsp;' . @($careTeamMember->data->specialty) : '' ?>
                                 <?= !!@($careTeamMember->data->organization) ? '/&nbsp;' . @($careTeamMember->data->organization) : '' ?>
                                 <br>
                                 <?= !!@($careTeamMember->data->phone) ? 'Ph: ' . @($careTeamMember->data->phone) : '' ?>

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

@@ -24,11 +24,11 @@ $plural = 'Care team members';
                 @endif
                     <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                         <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
-                        <?= !!@($point->data->spacialty) ? '/&nbsp;' . @($point->data->spacialty) . '<br>' : '' ?>
-                        <?= !!@($point->data->organization) ? '/&nbsp;' . @($point->data->organization) . '<br>' : '' ?>
-                        <?= !!@($point->data->phone) ? 'Ph: ' . @($point->data->phone) . '<br>' : '' ?>
-                        <?= !!@($point->data->fax) ? '/&nbsp;Fax: ' . @($point->data->fax) . '<br>' : '' ?>
-                        <?= !!@($point->data->date) ? 'Date: ' . @($point->data->date) : '' ?>
+                        <?= !!@($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>
                 <?php if ($point->is_removed): ?>
                     @if($point->removal_reason_category === 'DURING_VISIT')
@@ -37,7 +37,11 @@ $plural = 'Care team members';
                         <span class="ml-2 text-sm text-secondary">Removed on intake</span>
                     @endif
                 <?php elseif ($point->added_in_note_id === $note->id): ?>
-                    <span class="ml-2 text-sm text-success">* Added on intake</span>
+                    <?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>
             <?php $review = $point->childReviewAddedInNote($note); ?>

+ 1 - 1
resources/views/app/patient/segment-templates/plan_care_team/edit.blade.php

@@ -41,7 +41,7 @@ $intakeOrVisit = 'PLAN';
                         <div class="d-flex align-items-baseline">
                             <div class="<?= $careTeamMember->is_removed ? 'strike-through' : '' ?>">
                                 <b><?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?></b>
-                                <?= !!@($careTeamMember->data->spacialty) ? '/&nbsp;' . @($careTeamMember->data->spacialty) : '' ?>
+                                <?= !!@($careTeamMember->data->specialty) ? '/&nbsp;' . @($careTeamMember->data->specialty) : '' ?>
                                 <?= !!@($careTeamMember->data->organization) ? '/&nbsp;' . @($careTeamMember->data->organization) : '' ?>
                                 <br>
                                 <?= !!@($careTeamMember->data->phone) ? 'Ph: ' . @($careTeamMember->data->phone) : '' ?>

+ 6 - 1
resources/views/app/patient/segment-templates/plan_care_team/summary.blade.php

@@ -28,7 +28,12 @@ $plural = 'Care team members';
                     <?php $numRelevant++; ?>
                 @endif
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
+                    <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>
                 <?php if ($point->is_removed): ?>
                     @if($point->removal_reason_category === 'DURING_VISIT')