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

Add "frequency" field in Rx

Vijayakrishnan Krishnan 4 роки тому
батько
коміт
f3108ec3d5

+ 1 - 0
app/Http/Controllers/PatientController.php

@@ -47,6 +47,7 @@ class PatientController extends Controller
         $infoLines = ClientInfoLine::where('client_id', $patient->id)
             ->where('category', 'rx')
             ->where('is_removed', false)
+            ->orderBy('content_text', 'asc')
             ->get();
         return view('app.patient.medications', compact('patient', 'infoLines'));
     }

+ 8 - 0
resources/views/app/patient/medications.blade.php

@@ -15,6 +15,9 @@
                     <div class="mb-2">
                         <input type="text" class="form-control form-control-sm" name="strength" value="" placeholder="Strength/Form">
                     </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="frequency" value="" placeholder="Frequency">
+                    </div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
                         <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
@@ -40,6 +43,7 @@
             <tr>
                 <th class="px-2 text-secondary">Medication</th>
                 <th class="px-2 text-secondary">Strength / Form</th>
+                <th class="px-2 text-secondary">Frequency</th>
                 <th class="px-2 text-secondary">Created By</th>
                 <th class="px-2 text-secondary">Created At</th>
                 <th class="px-2 text-secondary delete-column">&nbsp;</th>
@@ -50,6 +54,7 @@
                 <tr>
                     <td class="px-2">{{$line->content_text}}</td>
                     <td class="px-2">{{isset($line->contentDetail()->strength) ? $line->contentDetail()->strength : '-' }}</td>
+                    <td class="px-2">{{isset($line->contentDetail()->frequency) ? $line->contentDetail()->frequency : '-' }}</td>
                     <td class="px-2">{{$line->createdBySession && $line->createdBySession->pro ? $line->createdBySession->pro->displayName() : '-'}}</td>
                     <td class="px-2">{{ friendly_date_time($line->created_at) }}</td>
                     <td class="px-2 text-center delete-column">
@@ -67,6 +72,9 @@
                                 <div class="mb-2">
                                     <input type="text" class="form-control form-control-sm" name="strength" value="{{isset($line->contentDetail()->strength) ? $line->contentDetail()->strength : '' }}" placeholder="Strength/Form">
                                 </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="frequency" value="{{isset($line->contentDetail()->frequency) ? $line->contentDetail()->frequency : '' }}" placeholder="Frequency">
+                                </div>
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
                                     <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>

+ 13 - 0
resources/views/app/patient/partials/rx.blade.php

@@ -24,6 +24,10 @@
                     <input type="text" class="form-control form-control-sm" name="strength" value=""
                            placeholder="Strength/Form">
                 </div>
+                <div class="mb-2">
+                    <input type="text" class="form-control form-control-sm" name="frequency" value=""
+                           placeholder="Frequency">
+                </div>
                 <div class="d-flex align-items-center">
                     <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save</button>
                     <button class="btn btn-sm btn-default mr-2 border" type="button" cancel>Cancel</button>
@@ -102,6 +106,11 @@
                                                    value="{{getVal($line->contentDetail, "strength") }}"
                                                    placeholder="Strength/Form">
                                         </div>
+                                        <div class="mb-2">
+                                            <input type="text" class="form-control form-control-sm" name="frequency"
+                                                   value="{{getVal($line->contentDetail, "frequency") }}"
+                                                   placeholder="Frequency">
+                                        </div>
                                         <div class="d-flex align-items-center">
                                             <button class="btn btn-sm btn-primary mr-2" type="button" submit>Save
                                             </button>
@@ -117,6 +126,10 @@
                                         <span class="text-secondary">/</span>
                                         <span>{{getVal($line->contentDetail, "strength") }}</span>
                                     @endif
+                                    @if(!empty(getVal($line->contentDetail, "frequency")))
+                                        <span class="text-secondary">/</span>
+                                        <span>{{getVal($line->contentDetail, "frequency") }}</span>
+                                    @endif
                                 </span>
                             </div>
                         </td>

+ 2 - 0
storage/sections/medication/default.php

@@ -8,6 +8,8 @@ foreach($infoLines as $category => $lines):
         foreach ($lines as $line):
             $value[] = '<p><b>' . $line->contentText . '</b> ';
             $value[] = @$line->contentDetail->strength;
+            if(@$line->contentDetail->frequency)
+                $value[] = ' / ' . $line->contentDetail->frequency;
             $value[] = '</p>';
         endforeach;
     endif;