Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Http/Controllers/PracticeManagementController.php

@@ -1732,6 +1732,7 @@ SELECT claim.uid AS uid,
        claim.status,
        client.uid AS client_uid,
        client.cell_number AS client_phone,
+       client.phone_home AS client_phone_home,
        (client.name_last || ' ' || client.name_first) AS client ,
        client.chart_number AS client_chart_number,
        cp.id AS claim_pro_id,
@@ -2165,7 +2166,7 @@ ORDER BY claim.created_at DESC
 
     public function currentMbClaim(Request $request, $claimUid) {
         $claim = Claim::where('uid', $claimUid)->first();
-        return json_encode(MBClaim::where('claim_version_id', $claim->currentVersion->id)->first());
+        return json_encode(MBClaim::where('claim_version_id', $claim->currentVersion->id)->where('status', '!=', 'CANCELLED')->first());
     }
 
     public function currentClaimLines(Request $request, $claimUid) {

app/Models/Client.php

@@ -106,10 +106,10 @@ class Client extends Model
     public function prescriptions()
     {
         return $this->hasMany(Erx::class, 'client_id', 'id')
-            ->where(function ($q) {
+            /*->where(function ($q) {
                 $q->whereNull('pro_declared_status')
                     ->orWhere('pro_declared_status', '<>', 'CANCELLED');
-            })
+            })*/
             ->orderBy('created_at', 'desc')
             ->orderByRaw('note_id DESC NULLS LAST');
     }

app/Models/Pro.php

@@ -352,7 +352,11 @@ class Pro extends Model
 
     function get_patients_count_as_mcp() {
         $query = Client::whereNull('shadow_pro_id');
-        return $query->where('mcp_pro_id', $this->id)->count();
+        return $query->where('mcp_pro_id', $this->id)
+            ->where(function ($q) {
+                $q->whereNull('client_engagement_status_category')
+                    ->orWhere('client_engagement_status_category', '<>', 'DUMMY');
+            })->count();
     }
 
     function get_new_patients_awaiting_visit_count_as_mcp() {

resources/views/app/admin/patients-table-extended.blade.php

@@ -11,6 +11,12 @@
             <th class="border-0 width-90px">#</th>
             <th class="border-0">Name</th>
             <th class="border-0">Created</th>
+            @if($pro->pro_type == 'ADMIN')
+                <th class="border-0">MCP</th>
+                <th class="border-0">NA</th>
+                <th class="border-0">Initiative</th>
+                <th class="border-0">Source</th>
+            @endif
             <th class="border-0">DOB</th>
             <th class="border-0">Age</th>
             <th class="border-0">Sex</th>
@@ -35,14 +41,8 @@
             {{-- <th class="border-0 d-none">Last Weight-In</th>--}}
             {{-- <th class="border-0 d-none">Last BP</th>--}}
             <th class="border-0">Assigned On</th>
-
-            @if($pro->pro_type == 'ADMIN')
-                <th class="border-0">MCP</th>
-                <th class="border-0">NA</th>
-                <th class="border-0">Initiative</th>
-                <th class="border-0">Source</th>
-            @endif
-            <th class="border-0">Email Address</th>
+            
+	    <th class="border-0">Email Address</th>
             <th class="border-0">Mailing Address State</th>
         </tr>
         </thead>
@@ -65,6 +65,12 @@
                         By <span>{{$patient->creator ? $patient->creator->displayName() : '-'}}</span>
                     </div>
                 </td>
+		@if($pro->pro_type == 'ADMIN')
+                    <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
+                    <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
+                    <td>{{$patient->initiative}}</td>
+                    <td>{{$patient->source}}</td>
+                @endif
                 <td>{{ friendly_date_time($patient->dob, false) }}</td>
                 <td>{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
                 <td>{{ $patient->sex }}</td>
@@ -309,12 +315,6 @@
                 </td>
                 <td>{{count($patient->cellularMeasurements)}}</td>
                 <td>{{$patient->getMcpAssignedOn()}}</td>
-                @if($pro->pro_type == 'ADMIN')
-                    <td>{{@$patient->mcp ? $patient->mcp->displayName() : '--'}}</td>
-                    <td>{{@$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '--'}}</td>
-                    <td>{{$patient->initiative}}</td>
-                    <td>{{$patient->source}}</td>
-                @endif
                 <td>{{$patient->email_address}}</td>
                 <td>{{$patient->mailing_address_state}}</td>
             </tr>
@@ -367,4 +367,4 @@
 
         addMCInitializer('admin-patients-list-extended', init, '#admin-patients-list-extended');
     }).call(window);
-</script>
+</script>

resources/views/app/patient/note/dashboard.blade.php

@@ -161,6 +161,46 @@
                 <div class="d-inline border-left pl-2">
                     @include('app.practice-management.visit-templates.change-note-visit-template')
                 </div>
+                    @if($note->visit_template_id)
+                        <div moe relative class="d-inline border-left pl-2 ml-2">
+                            <a start show>Clone</a>
+                            <form url="/api/visit/clone" class="mcp-theme-1" left
+                                  redir="/patients/view/{{$patient->uid}}/notes/view/[data]">
+                                <input type="hidden" name="visitToCloneUid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <label for="" class="text-sm text-secondary mb-1">Effective Date</label>
+                                    <input type="date" name="effectiveDate" class="form-control input-sm" value="{{get_current_date($pro->display_timezone)}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label for="" class="text-secondary text-sm mb-1">New/Follow-up</label>
+                                    <div class="d-flex align-items-baseline py-1">
+                                        <label class="mr-3 my-0 d-inline-flex align-items-center c-pointer">
+                                            <input type="radio" name="newOrFuOrNa" value="NEW" required>
+                                            <span class="ml-1 text-dark">New</span>
+                                        </label>
+                                        <label class="my-0 d-inline-flex align-items-center c-pointer">
+                                            <input type="radio" name="newOrFuOrNa" value="FU" required checked>
+                                            <span class="ml-1 text-dark">Follow-Up</span>
+                                        </label>
+                                    </div>
+                                </div>
+
+                                <div class="mb-2">
+                                    <label for="" class="text-sm text-secondary mb-1">Method</label>
+                                    <select name="noteContactMethod" id="" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="VIDEO">Video</option>
+                                        <option value="AUDIO">Audio</option>
+                                        <option value="IN_CLINIC">In Clinic</option>
+                                        <option value="HOUSE_CALL">House Call</option>
+                                    </select>
+                                </div>
+                                <div class="m-0">
+                                    <button submit class="btn btn-primary btn-sm">submit</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
                 @endif
             </div>
             <div class="px-2 border-left border-right">
@@ -209,7 +249,7 @@
 
             <div class="px-2 border-right">
                 <div class="d-flex">
-                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
+                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->displayName()}}</span>
                     @if($pro->pro_type === 'ADMIN')
                     <div moe class="ml-2">
                         <a href="" show start><i class="fa fa-edit"></i></a>
@@ -734,7 +774,7 @@
                     </div>
                 </div>
 
-                <div class="row border-bottom">
+                <div class="row border-bottom mx-0">
                     <div class="col-4 pr-0">
                         <div class="p-3 screen-only" data-non-segment-section="CM Setup">
                             <div class="d-flex align-items-center mb-3">
@@ -2133,6 +2173,7 @@
                                                                                 <option value="NEW" {{$mbClaim->status === 'NEW' ? 'selected' : ''}}>New</option>
                                                                                 <option value="PROCESSING" {{$mbClaim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
                                                                                 <option value="SUBMITTED" {{$mbClaim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+                                                                                <option value="CANCELLED" {{$mbClaim->status === 'CANCELLED' ? 'selected' : ''}}>Cancelled</option>
                                                                             </select>
                                                                         </div>
                                                                         <div class="form-group">
@@ -2372,6 +2413,38 @@
                             <span>Handouts</span>
                         </div>
                     </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <a native="" target="_top"
+                           class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                           data-non-segment-target="Prescriptions" href="#">ERx</a>
+                    </div>
+                    @if($pro->pro_type === 'ADMIN')
+                        <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                            <a native="" target="_top"
+                               class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                               data-non-segment-target="HCP Bills" href="#">HCP Bills</a>
+                        </div>
+                        <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                            <a native="" target="_top"
+                               class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                               data-non-segment-target="NA Bills" href="#">NA Bills</a>
+                        </div>
+                    @else
+                        @if($note->hcpPro && $pro->id === $note->hcpPro->id)
+                            <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                                <a native="" target="_top"
+                                   class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                                   data-non-segment-target="HCP Bills" href="#">Bills</a>
+                            </div>
+                        @endif
+                        @if($note->allyPro && $pro->id === $note->allyPro->id)
+                            <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                                <a native="" target="_top"
+                                   class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                                   data-non-segment-target="NA Bills" href="#">Bills</a>
+                            </div>
+                        @endif
+                    @endif
                 </div>
                 @endif
 
@@ -2487,6 +2560,26 @@
                         $('.visit-segment[data-segment-template-name="disclaimers"]').find('.refresh-segment').trigger('click');
                         fastReload();
                     });
+                    $(document)
+                        .off('click.scroll-to-non-segment', '[data-non-segment-target]')
+                        .on('click.scroll-to-non-segment', '[data-non-segment-target]', function() {
+                            closeStagPopup(true);
+                            let section = $('div[data-non-segment-section="' + $(this).attr('data-non-segment-target') + '"]').first();
+                            if(section.length) {
+                                section[0].scrollIntoView({
+                                    behavior: "smooth",
+                                    block: "center",
+                                    inline: "center"
+                                });
+                                section.addClass('spot-highlight');
+                                setTimeout(() => {
+                                    section.removeClass('spot-highlight');
+                                }, 1500);
+                                $('.note-tree-node.active').removeClass('active');
+                                $(this).closest('.note-tree-node').addClass('active');
+                            }
+                            return false;
+                        });
                 }
                 addMCInitializer('soap-visit', init, '#note-single-header');
             })();

resources/views/app/patient/notes.blade.php

@@ -207,11 +207,11 @@
                     </td>
                 @endif
                 <td>
-                    {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
+                    {{$note->hcpPro ? $note->hcpPro->displayName(): '-'}}
                 </td>
                 @if($pro->pro_type == 'ADMIN')
                 <td>
-                    {{$note->allyPro ? $note->allyPro->name_display: '-'}}
+                    {{$note->allyPro ? $note->allyPro->displayName(): '-'}}
                 </td>
                 @endif
                 <td>

resources/views/app/patient/prescriptions/list.blade.php

@@ -33,24 +33,30 @@
                 <tr>
                     <th class="border-0 text-secondary width-150px">Created</th>
                     <th class="border-0 text-secondary" :class="currentPrescription ? 'width-200px' : ''">Clinical</th>
+                    <th v-if="!currentPrescription">Prescriber</th>
+                    <th v-if="!currentPrescription">Status</th>
+                    <th v-if="!currentPrescription">Sign</th>
+                    <th v-if="!currentPrescription">Client Status</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr v-for="(prescription, index) in prescriptions" :class="currentPrescription && currentPrescription.id === prescription.id ? 'bg-aliceblue' : ''">
                     <td class="width-150px" :class="currentPrescription && currentPrescription.id === prescription.id ? 'row-selection-highlight' : ''">
-                        <a href="#" v-on:click.prevent="currentPrescription=prescription; setAddMode('')"
-                           class="text-nowrap"
-                           :class="currentPrescription && currentPrescription.id === prescription.id ? 'font-weight-bold' : ''">
-                            @{{prescription.created_at_friendly_short}}
-                        </a>
-                        <div class="mt-1">
-                            <b class="text-sm">@{{prescription.erx_category}}</b>
-                            /
-                            <span class="text-sm">@{{prescription.hcpProDisplayName}}</span>
+                        <div :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
+                            <a href="#" v-on:click.prevent="setCurrentPrescription(prescription, '');"
+                               class="text-nowrap"
+                               :class="currentPrescription && currentPrescription.id === prescription.id ? 'font-weight-bold' : ''">
+                                @{{prescription.created_at_friendly_short}}
+                            </a>
+                            <div class="mt-1">
+                                <b class="text-sm">@{{prescription.erx_category}}</b>
+                                /
+                                <span class="text-sm">@{{prescription.hcpProDisplayName}}</span>
+                            </div>
+                            @if(@$note)
+                                <div v-if="prescription.note_id === {{$note->id}}" class="text-sm text-info mt-1 text-nowrap">* From this note</div>
+                            @endif
                         </div>
-                        @if(@$note)
-                            <div v-if="prescription.note_id === {{$note->id}}" class="text-sm text-info mt-1 text-nowrap">* From this note</div>
-                        @endif
                         <div v-if="prescription.pro_declared_status === 'CANCELLED'" class="text-sm text-secondary font-weight-bold mt-1 text-sm d-flex align-items-baseline">
                             <i class="fa fa-ban mr-1 text-sm"></i>
                             CANCELLED
@@ -62,7 +68,7 @@
                             <a v-if="!prescription.has_hcp_pro_signed" class="mr-2" href="#" v-on:click.prevent="editClinicalDetails(prescription)"><i class="fa fa-edit on-hover-opaque"></i></a>
                             <span v-else class="mr-2" title="Cannot edit. Prescription already signed."><i class="fa fa-edit on-hover-opaque text-secondary"></i></span>
                             --}}
-                            <div v-if="prescription.clinical_detail_json" class="d-inline-flex align-items-baseline">
+                            <div v-if="prescription.clinical_detail_json" class="d-inline-flex align-items-baseline" :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
                                 <div class="" v-if="prescription.erx_category === 'DRUG'">
                                     <div class="d-flex align-items-baseline mb-1" v-for="drug in prescription.clinical_detail_json.items">
                                         <span class="mr-2">@{{drug.medication ?? '-'}}</span>
@@ -96,6 +102,32 @@
                             <div v-else>-</div>
                         </div>
                     </td>
+                    <td v-if="!currentPrescription">
+                        <div :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
+                            @{{ prescription.hcpProDisplayName }}
+                        </div>
+                    </td>
+                    <td v-if="!currentPrescription">
+                        <div :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
+                            @{{ sanitizeStatus(prescription.pro_declared_status) }}
+                        </div>
+                    </td>
+                    <td v-if="!currentPrescription">
+                        <div :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
+                            <div v-if="prescription.has_hcp_pro_signed" class="d-inline-flex align-items-baseline">
+                                <i class="text-secondary fa fa-check mr-1"></i>
+                                <span class="text-secondary">Signed</span>
+                            </div>
+                            <div v-else>
+                                -
+                            </div>
+                        </div>
+                    </td>
+                    <td v-if="!currentPrescription">
+                        <div :class="prescription.pro_declared_status === 'CANCELLED' ? 'on-hover-opaque' : ''">
+                            @{{ sanitizeStatus(prescription.client_declared_status) }}
+                        </div>
+                    </td>
                 </tr>
                 </tbody>
             </table>
@@ -105,7 +137,7 @@
                 <h3 class="font-size-16 m-0">
                     <b class="mr-1 font-size-16">@{{ currentPrescription.erx_category }} ERx <span class="ml-2">@{{ currentPrescription.created_at_friendly_short }}</span></b>
                 </h3>
-                <a class="ml-auto" href="#" v-on:click.prevent="currentPrescription=null">
+                <a class="ml-auto" href="#" v-on:click.prevent="setCurrentPrescription(null);">
                     <i class="fa fa-times-circle on-hover-opaque"></i>
                 </a>
             </div>
@@ -192,8 +224,8 @@
                     </div>
 
                     @if(@$note)
-                    <div class="" v-if="!currentPrescription.has_hcp_pro_signed">
-                        <a href="#" class="d-block mb-1" v-on:click.prevent="setAddMode('existing')">+ Existing</a>
+                    <div class="d-flex align-items-center mt-3" v-if="!currentPrescription.has_hcp_pro_signed">
+                        <a href="#" class="d-block mb-1 mr-2" v-on:click.prevent="setAddMode('existing')">+ Existing</a>
                         <a href="#" class="d-block mb-1" v-on:click.prevent="setAddMode('new')">+ New</a>
                     </div>
                     @endif
@@ -374,11 +406,13 @@
             </div>
             <div class="pb-2 d-flex align-items-start" v-if="currentPrescription.has_hcp_pro_signed">
                 <span class="min-width-140px text-secondary text-sm">PDF</span>
-                <div class="">
+                <div class="d-flex align-items-baseline">
                     <a class="pdf-viewer-trigger d-block mb-1" native target="_blank"
                        :href="'/prescription-download-as-pdf/' + currentPrescription.uid">View</a>
+                    <span class="mx-2 text-sm text-secondary">|</span>
                     <a native target="_blank" class="d-block mb-1"
                        :href="'/prescription-download-as-pdf/' + currentPrescription.uid">Download</a>
+                    <span class="mx-2 text-sm text-secondary">|</span>
                     <a href="#" class="d-block mb-1"
                        v-on:click.prevent="transmit(currentPrescription)">Transmit</a>
                 </div>
@@ -726,7 +760,6 @@ GROUP BY erx_category");
                         }, 'json');
                     },
 
-                    // new eRx (only for popup-list)
                     newERx: function(_type) {
                         if(!!this.numUnsigned[_type]) {
                             toastr.error('There is already an unsigned ERx of type ' + _type + ' in this note.');
@@ -820,6 +853,7 @@ GROUP BY erx_category");
                                 showStagPopup('new-prescription-popup-' + _type, true);
                                 $('[stag-popup-key="new-prescription-popup-' + _type + '"] [stag-suggest-initialized]').removeAttr('stag-suggest-initialized');
                                 initStagSuggest();
+                                this.initICDAutoSuggest();
                             });
                         }
                         return false;
@@ -840,6 +874,12 @@ GROUP BY erx_category");
                         });
                     },
                     addTest: function(_item) {
+                        for (let i = 0; i < _item.tests.length; i++) {
+                            if(!_item.tests[i].desc) {
+                                toastr.error('One or more existing tests are empty/invalid!');
+                                return false;
+                            }
+                        }
                         _item.tests.push({
                             desc: ''
                         });
@@ -848,7 +888,14 @@ GROUP BY erx_category");
                         });
                     },
                     addICD: function(_item) {
+                        for (let i = 0; i < _item.icds.length; i++) {
+                            if(!_item.icds[i].code) {
+                                toastr.error('One or more existing icds are empty/invalid!');
+                                return false;
+                            }
+                        }
                         _item.icds.push({
+                            code: '',
                             desc: ''
                         });
                         Vue.nextTick(() => {
@@ -1231,6 +1278,7 @@ GROUP BY erx_category");
 
                     // sane display status
                     sanitizeStatus: function(_s) {
+                        if(!_s) return '-';
                         _s = _s.toLowerCase().replaceAll('_', ' ');
                         _s = _s[0].toUpperCase() + _s.substr(1);
                         return _s;
@@ -1388,6 +1436,8 @@ GROUP BY erx_category");
                         this.currentPrescription = temp;
                         this.setCurrentPrescription(temp);
 
+                        showMask();
+
                         // save erx
                         $.post('/api/erx/updateClinicalDetail', {
                             uid: this.currentPrescription.uid,
@@ -1418,8 +1468,15 @@ GROUP BY erx_category");
                             }
                         }, 'json');
                     },
-                    setCurrentPrescription: function(_prescription) {
+                    setCurrentPrescription: function(_prescription, _addMode = false) {
                         this.currentPrescription = _prescription;
+                        if(_addMode !== false) {
+                            this.setAddMode(_addMode);
+                        }
+
+                        @if(@$note)
+                        localStorage['currentErx_{{$note->id}}'] = _prescription ? _prescription.id : -1;
+                        @endif
                     },
                     setAddMode: function(_mode) {
                         let self = this;
@@ -1492,6 +1549,8 @@ GROUP BY erx_category");
                                             refills: form.find('[name="refills"]').val(),
                                         };
 
+                                        showMask();
+
                                         $.post(form.attr('action'), form.serialize(), _data => {
                                             if (!hasResponseError(_data)) {
                                                 hideMask();
@@ -1539,7 +1598,8 @@ GROUP BY erx_category");
                                 dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
                                 itemIndex = $(this).attr('data-item-index'),
                                 icdIndex = $(this).attr('data-icd-index'),
-                                category = $(this).attr('data-category');
+                                category = $(this).attr('data-category'),
+                                existing = $(this).closest('[stag-popup-key]').length === 0;
                             $(elem).attr('id', dynID);
                             new window.Def.Autocompleter.Search(dynID,
                                 'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
@@ -1550,8 +1610,14 @@ GROUP BY erx_category");
                             );
                             window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
                                 let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
-                                self['currentPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].code = acData[0].code;
-                                self['currentPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].desc = acData[0].data['name'];
+                                if(existing) {
+                                    self['currentPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].code = acData[0].code;
+                                    self['currentPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].desc = acData[0].data['name'];
+                                }
+                                else {
+                                    self['newPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].code = acData[0].code;
+                                    self['newPrescription_' + category].clinicalDetailJson.items[itemIndex].icds[icdIndex].desc = acData[0].data['name'];
+                                }
                                 return false;
                             });
                             $(elem).attr('ac-initialized', 1);
@@ -1577,6 +1643,17 @@ GROUP BY erx_category");
                         }
                     });
 
+                    @if(@$note)
+                    if(!!localStorage['currentErx_{{$note->id}}']) {
+                        for(let x in this.prescriptions) {
+                            if(this.prescriptions[x].id === +(localStorage['currentErx_{{$note->id}}'])) {
+                                this.currentPrescription = this.prescriptions[x];
+                                break;
+                            }
+                        }
+                    }
+                    @endif
+
                     $('[stag-popup-key="logistics-popup"] .facility-search').off('stag-suggest-selected');
                     $('[stag-popup-key="logistics-popup"] .facility-search').on('stag-suggest-selected', (_e, _input, _data) => {
                         if(self.currentPrescriptionLogistics && self.currentPrescriptionLogistics.logisticsDetailJson) {

resources/views/app/patient/prescriptions/pro-status-form.blade.php

@@ -14,6 +14,7 @@
                 <option value="SENT">Sent</option>
                 <option value="RECEIVED_BY_CLIENT">Received by client</option>
                 <option value="RECEIPT_CONFIRMED_BY_FACILITY">Receipt confirmed by facility</option>
+                <option value="CANCELLED">Cancelled</option>
             </select>
         </div>
         <div class="mb-2">

resources/views/app/patient/segment-templates/covid_intake/edit.blade.php

@@ -227,10 +227,9 @@ if ($point->lastChildReview && $point->lastChildReview->data) {
         </div>
         <div class="mb-2 ml-3">
             <ul>
-                <li>So as you might know, last week Governor Hogan declared a state of emergency.</li>
-                <li>Right now, there are more individuals hospitalized in Maryland due to COVID-19 than at any previous point in the entire pandemic.</li>
+		<li>Recent surge in cases.</li>
                 <li>
-                    So self-monitoring your vitals is more important than ever these days because even though vaccines are really effective, there’s an ongoing risk of getting COVID even after vaccination.
+                    Self-monitoring your vitals is more important than ever these days because even though vaccines are really effective, there’s an ongoing risk of getting COVID even after vaccination.
                     <ul>
                         <li>It’s likely that COVID is going to become ‘endemic’ like the flu, where the virus is here to stay and change season to season.</li>
                         <li>So you do need a long-term strategy to protect yourself in addition to vaccines.</li>

resources/views/app/patient/segment-templates/ros/edit.blade.php

@@ -237,10 +237,10 @@ for ($i = 0; $i < count($fields); $i++) {
             <input type="hidden" name="data" value='{!! json_encode($contentData) !!}'>
 
             <div id="edit-ros-container">
-                <div class="d-flex align-items-center mb-3">
+                <label class="d-flex align-items-center mb-3">
                     <input type="checkbox" class="my-0 mr-2" v-model="declaration">
                     <span>Except for the systems documented in the HPI or detailed below, all other systems were reviewed and negative.</span>
-                </div>
+                </label>
                 <div class="d-flex align-items-start flex-wrap custom-items-container">
                     @for ($i = 0; $i < count($fields); $i++)
                         <div class="w-33">

resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -360,7 +360,7 @@ parentSegment.find('.frm-edit-{{$label}}')
 
         let reviewContent = parsed && parsed.reviewValue ? parsed.reviewValue : '';
 
-        let compareWith = false;
+        /*let compareWith = false;
         if(form.find('.disallow-if-review-same-as')) {
             compareWith = $.trim(form.find('.disallow-if-review-same-as').text());
             if(compareWith && reviewContent) {
@@ -384,7 +384,7 @@ parentSegment.find('.frm-edit-{{$label}}')
                     return false;
                 }
             }
-        }
+        }*/
 
         if(parsed.planValue) delete parsed.planValue;
         if(parsed.reviewValue) delete parsed.reviewValue;

resources/views/app/practice-management/process-claims.blade.php

@@ -151,7 +151,7 @@
                                         </div>
                                         <div class="d-flex align-items-center">
                                             <span class="text-secondary text-sm min-width-140px text-right pr-3">Phone</span>
-                                            <span class="click-to-copy" title="Click to copy">@{{ claim.client_phone }}</span>
+                                            <span class="click-to-copy" title="Click to copy">@{{ claim.client_phone }}   @{{ claim.client_phone_home }}</span>
                                         </div>
                                     </div>
 

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -119,9 +119,10 @@
                                 @else
                                     Admin.
                                 @endif
+                               
                                 @if($row->is_verified)
                                     @if(!request()->input('t') || request()->input('t') === 'hcp')
-                                        @if(!!$row->hcp_company_pro_id)
+                                        @if(!$row->hcp_company_pro_id)
                                             <div class="mt-1 text-danger text-sm">
                                                 <i class="fa fa-exclamation-triangle"></i>
                                                 <span class="">Company pro not set!</span>

resources/views/app/stat-tree/stat-trees/sub/edit.blade.php

@@ -1380,7 +1380,6 @@
                             $(document)
                                 .off('click', '.mv-delete-pro-trigger')
                                 .on('click', '.mv-delete-pro-trigger', function() {
-                                    debugger
                                     let proUids = '{{request()->input('multi-pro-uids')}}'.split(',').filter(_x => _x !== $(this).attr('data-pro-uid'));
                                     fastLoad('/practice-management/stat-trees/view/{{$statTree->uid}}/edit?multi-pro=1&multi-pro-uids=' + proUids.join(','));
                                     return false;