浏览代码

Note updates (type, method, billing defaults & limits)

Vijayakrishnan 4 年之前
父节点
当前提交
43e31af6ed

+ 19 - 4
resources/views/app/patient/note/_create-bill.blade.php

@@ -24,14 +24,29 @@
             @endif
             @endif
         </div>
         </div>
 
 
+        <?php
+            $maxMinutes = 120;
+            if($note->new_or_fu_or_na === 'NEW') {
+                $maxMinutes = 90;
+            }
+            else if($note->new_or_fu_or_na === 'FU') {
+                if($note->method === 'Video') {
+                    $maxMinutes = 75;
+                }
+                else if($note->method === 'Audio') {
+                    $maxMinutes = 45;
+                }
+            }
+        ?>
+
         @if($noteRates && count($noteRates) && count($noteRates) === 1)
         @if($noteRates && count($noteRates) && count($noteRates) === 1)
             @if(strpos(strtolower($noteRates[0]->code), "treatment services") !== FALSE)
             @if(strpos(strtolower($noteRates[0]->code), "treatment services") !== FALSE)
                 <div class="mb-2">
                 <div class="mb-2">
                     <select name="numberOfUnits" class="form-control form-control-sm"
                     <select name="numberOfUnits" class="form-control form-control-sm"
                             onchange="calculateBillAmount(this)">
                             onchange="calculateBillAmount(this)">
                         <option value=""> -- select -- </option>
                         <option value=""> -- select -- </option>
-                        <?php for ($i = 5; $i <= 120; $i+=5) { ?>
-                        <option value="{{ $i/60 }}">{{ $i }} minutes</option>
+                        <?php for ($i = 5; $i <= $maxMinutes; $i+=5) { ?>
+                        <option value="{{ $i/60 }}" {{ $i === 30 ? 'selected' : '' }}>{{ $i }} minutes</option>
                         <?php } ?>
                         <?php } ?>
                     </select>
                     </select>
                 </div>
                 </div>
@@ -53,8 +68,8 @@
             <select name="numberOfUnits" class="form-control form-control-sm"
             <select name="numberOfUnits" class="form-control form-control-sm"
                     onchange="calculateBillAmount(this)">
                     onchange="calculateBillAmount(this)">
                 <option value=""> -- select -- </option>
                 <option value=""> -- select -- </option>
-                <?php for ($i = 5; $i <= 120; $i+=5) { ?>
-                    <option value="{{ $i/60 }}">{{ $i }} minutes</option>
+                <?php for ($i = 5; $i <= $maxMinutes; $i+=5) { ?>
+                    <option value="{{ $i/60 }}" {{ $i === 30 ? 'selected' : '' }}>{{ $i }} minutes</option>
                 <?php } ?>
                 <?php } ?>
             </select>
             </select>
         </div>
         </div>

+ 55 - 1
resources/views/app/patient/note/dashboard.blade.php

@@ -117,7 +117,7 @@
                 </div>
                 </div>
             </div>--}}
             </div>--}}
 
 
-            <div class="px-2">
+            <div class="px-2 border-right">
                 <div class="d-flex">
                 <div class="d-flex">
                     <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
                     <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
                     @if(!$note->is_signed_by_hcp)
                     @if(!$note->is_signed_by_hcp)
@@ -142,6 +142,60 @@
                     @endif
                     @endif
                 </div>
                 </div>
             </div>
             </div>
+
+            <div class="px-2 border-right">
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Type:</span> {{$note->new_or_fu_or_na ? $note->new_or_fu_or_na : '-'}}</span>
+                    @if(!$note->is_signed_by_hcp)
+                        <div moe class="ml-auto">
+                            <a href="" show start><i class="fa fa-edit"></i></a>
+                            <form url="/api/note/updateNewOrFuOrNa">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <select name="newOrFuOrNa" class="form-control form-control-sm" required>
+                                        <option value="">-- select --</option>
+                                        <option value="NEW" {{ $note->new_or_fu_or_na === "NEW" ? "selected" : "" }}>New</option>
+                                        <option value="FU" {{ $note->new_or_fu_or_na === "FU" ? "selected" : "" }}>Follow-up</option>
+                                        <option value="NA" {{ $note->new_or_fu_or_na === "NA" ? "selected" : "" }}>N/A</option>
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+            </div>
+
+            <div class="px-2">
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Method:</span> {{$note->method ? $note->method : '-'}}</span>
+                    @if(!$note->is_signed_by_hcp && $note->new_or_fu_or_na !== 'NEW')
+                        <div moe class="ml-auto">
+                            <a href="" show start><i class="fa fa-edit"></i></a>
+                            <form url="/api/note/updateMethod">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <select name="method" class="form-control form-control-sm" required>
+                                        <option value="">-- select --</option>
+                                        <option value="Video" {{ $note->method === "Video" ? "selected" : "" }}>Video</option>
+                                        <option value="Audio" {{ $note->method === "Audio" ? "selected" : "" }}>Audio</option>
+                                        <option value="In-Clinic" {{ $note->method === "In-Clinic" ? "selected" : "" }}>In-Clinic</option>
+                                        <option value="House Call" {{ $note->method === "House Call" ? "selected" : "" }}>House Call</option>
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+            </div>
+
             <div class="ml-auto d-flex align-items-start">
             <div class="ml-auto d-flex align-items-start">
                 <div class="pr-2">
                 <div class="pr-2">
                     <div>
                     <div>

+ 4 - 2
resources/views/app/patient/notes.blade.php

@@ -27,7 +27,7 @@
         <thead>
         <thead>
         <tr>
         <tr>
             <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
             <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-            <th class="px-2 text-secondary border-bottom-0">Title</th>
+            <th class="px-2 text-secondary border-bottom-0">New / FU</th>
             <th class="px-2 text-secondary border-bottom-0">HCP</th>
             <th class="px-2 text-secondary border-bottom-0">HCP</th>
             <th class="px-2 text-secondary border-bottom-0">Signed</th>
             <th class="px-2 text-secondary border-bottom-0">Signed</th>
             <th class="px-2 text-secondary border-bottom-0 w-50">Content</th>
             <th class="px-2 text-secondary border-bottom-0 w-50">Content</th>
@@ -45,7 +45,7 @@
                     <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                     <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                 </td>
                 </td>
                 <td class="px-2">
                 <td class="px-2">
-                    {{ $note->title }}
+                    {{ $note->new_or_fu_or_na }}
                 </td>
                 </td>
                 <td class="px-2">
                 <td class="px-2">
                     {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                     {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
@@ -83,8 +83,10 @@
                 <td class="px-2">
                 <td class="px-2">
                     <div class="d-flex align-items-center">
                     <div class="d-flex align-items-center">
                         <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">Open</a>
                         <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">Open</a>
+                        @if($note->new_or_fu_or_na !== 'NEW')
                         <span class="px-2 text-secondary">|</span>
                         <span class="px-2 text-secondary">|</span>
                         <a href="#" class="text-primary trigger-clone" data-uid="{{$note->uid}}">Clone</a>
                         <a href="#" class="text-primary trigger-clone" data-uid="{{$note->uid}}">Clone</a>
+                        @endif
                     </div>
                     </div>
                 </td>
                 </td>
             </tr>
             </tr>