Browse Source

Med reconciliation table updates

Vijayakrishnan 3 năm trước cách đây
mục cha
commit
601707357b

+ 4 - 4
resources/views/app/patient/medications-reconcile.blade.php

@@ -27,8 +27,8 @@ $medications = $points;
         <thead>
         <tr>
             <th class="text-secondary bg-light border-bottom-0 w-25">Medication</th>
-            <th class="text-secondary bg-light border-bottom-0 w-25">Previous Subjective</th>
-            <th class="text-secondary bg-light border-bottom-0 w-25">Previous Plan</th>
+            <th class="text-secondary bg-light border-bottom-0 w-25">Pre-existing Plan</th>
+            <th class="text-secondary bg-light border-bottom-0 w-25">Current Subjective</th>
             <th class="text-secondary bg-light border-bottom-0 w-25">New Subjective</th>
         </tr>
         </thead>
@@ -64,10 +64,10 @@ $medications = $points;
             <tr>
                 <td class="bg-light font-weight-bold">{{$medication->data->name}}</td>
                 <td class="bg-light">
-                    @include('app/patient/wizard-partials/show-review', ['point' => $medication, 'review' => $mostRecentReviewBeforeThisNote])
+                    @include('app/patient/wizard-partials/show-plan', ['point' => $medication, 'plan' => $mostRecentPlanBeforeThisNote])
                 </td>
                 <td class="bg-light">
-                    @include('app/patient/wizard-partials/show-plan', ['point' => $medication, 'plan' => $mostRecentPlanBeforeThisNote])
+                    @include('app/patient/wizard-partials/show-review', ['point' => $medication, 'review' => $mostRecentReviewBeforeThisNote])
                 </td>
                 <td class="p-0 bg-white">
                     <div note-rte slim-rte ignore-changes

+ 2 - 2
resources/views/app/patient/wizard-partials/show-plan.blade.php

@@ -27,8 +27,8 @@
             <a class="text-sm copy-to-new-subjective" href="#">Copy to new subjective</a>
         </div>
     @else
-        <span class="text-secondary text-sm">None</span>
+        <span class="text-secondary text-sm">-</span>
     @endif
 @else
-    <span class="text-secondary text-sm">None</span>
+    <span class="text-secondary text-sm">-</span>
 @endif

+ 2 - 2
resources/views/app/patient/wizard-partials/show-review.blade.php

@@ -27,8 +27,8 @@
             <a class="text-sm copy-to-new-subjective" href="#">Copy to new subjective</a>
         </div>
     @else
-        <span class="text-secondary text-sm">None</span>
+        <span class="text-secondary text-sm">-</span>
     @endif
 @else
-    <span class="text-secondary text-sm">None</span>
+    <span class="text-secondary text-sm">-</span>
 @endif