Pārlūkot izejas kodu

cellular-device-manager UI updates (wip)

Vijayakrishnan 3 gadi atpakaļ
vecāks
revīzija
6a1412274b

+ 24 - 4
app/Http/Controllers/PracticeManagementController.php

@@ -1393,12 +1393,32 @@ ORDER BY claim.created_at ASC
 
         $keyNumbers = [];
 
-        $keyNumbers['careMonthsEligibleForBillGeneration'] = CareMonth::where('is_bill_closed', false)
+        $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP40'] = CareMonth::where('is_bill_closed', false)
             ->whereNotNull('company_pro_id')
             ->whereNotNull('company_pro_payer_id')
             ->whereNotNull('company_location_id')
             ->whereRaw('(SELECT count(id) FROM care_month_cm_rm_reason WHERE care_month_id = care_month.id) > 0')
-            ->where('rm_total_time_in_seconds', '>=', 1800)
+            ->where('rm_total_time_in_seconds_by_mcp', '>=', 1800)
+            ->where('rm_total_time_in_seconds', '>=', 4200) // at 4200 (70 minutes, it becomes eligible for plus40)
+            ->count();
+
+        $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP20'] = CareMonth::where('is_bill_closed', false)
+            ->whereNotNull('company_pro_id')
+            ->whereNotNull('company_pro_payer_id')
+            ->whereNotNull('company_location_id')
+            ->whereRaw('(SELECT count(id) FROM care_month_cm_rm_reason WHERE care_month_id = care_month.id) > 0')
+            ->where('rm_total_time_in_seconds_by_mcp', '>=', 1800)
+            ->where('rm_total_time_in_seconds', '<', 4200)
+            ->where('rm_total_time_in_seconds', '>=', 3000) // at 3000 (50 minutes, it becomes eligible for plus20)
+            ->count();
+
+        $keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] = CareMonth::where('is_bill_closed', false)
+            ->whereNotNull('company_pro_id')
+            ->whereNotNull('company_pro_payer_id')
+            ->whereNotNull('company_location_id')
+            ->whereRaw('(SELECT count(id) FROM care_month_cm_rm_reason WHERE care_month_id = care_month.id) > 0')
+            ->where('rm_total_time_in_seconds_by_mcp', '>=', 1800)
+            ->where('rm_total_time_in_seconds', '<', 3000)
             ->count();
 
         $keyNumbers['careMonthsWithoutCompanyProInfo'] = CareMonth::where('is_bill_closed', false)
@@ -1409,9 +1429,9 @@ ORDER BY claim.created_at ASC
             })
             ->count();
 
-        $keyNumbers['careMonthsWithoutRMReasons'] = CareMonth::where('is_bill_closed', false)
+        /*$keyNumbers['careMonthsWithoutRMReasons'] = CareMonth::where('is_bill_closed', false)
             ->whereRaw('(SELECT count(id) FROM care_month_cm_rm_reason WHERE care_month_id = care_month.id) = 0')
-            ->count();
+            ->count();*/
 
         $keyNumbers['careMonthsUnder30RMMinutes'] = CareMonth::where('is_bill_closed', false)
             ->where('rm_total_time_in_seconds', '<', 1800)

+ 31 - 5
resources/views/app/practice-management/rm-launch-and-clean.blade.php

@@ -10,24 +10,50 @@
         <table class="table table-striped table-condensed table-bordered table-sm width-300px">
             <tbody>
             <tr>
-                <td>Care Months Eligible For Bill Generation</td>
-                <td class="text-success font-weight-bold">{{$keyNumbers['careMonthsEligibleForBillGeneration']}}</td>
+                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + NonHCP 40</b></td>
+                <td class="text-success font-weight-bold px-3">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP40']}}</td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP + NonHCP 20</b></td>
+                <td class="text-success font-weight-bold px-3">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP20']}}</td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">Care Months Eligible For <b>RM30 HCP Only</b></td>
+                <td class="text-success font-weight-bold px-3">{{$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}}</td>
             </tr>
             <tr>
                 <td>Care Months Without Company/Pro Info</td>
                 <td class="text-warning-mellow font-weight-bold">{{$keyNumbers['careMonthsWithoutCompanyProInfo']}}</td>
             </tr>
+            {{--
             <tr>
                 <td>Care Months Without RM Reasons</td>
                 <td class="text-warning-mellow font-weight-bold">{{$keyNumbers['careMonthsWithoutRMReasons']}}</td>
             </tr>
+            --}}
             <tr>
                 <td>Care Months Under 30 RM Minutes</td>
                 <td class="text-warning-mellow font-weight-bold">{{$keyNumbers['careMonthsUnder30RMMinutes']}}</td>
             </tr>
             </tbody>
         </table>
-        <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold">Generate Claims</button>
+        <div class="d-flex align-items-center">
+            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP40'] ? '' : 'disabled'}}
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP40'] ? '' : 'perm-disabled'}}
+                    data-ep="rm-admin-launcher-rm30-hcp-plus-40">Generate RM-30 HCP PLUS NONHCP-40 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP40']}})
+            </button>
+            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP20'] ? '' : 'disabled'}}
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP20'] ? '' : 'perm-disabled'}}
+                    data-ep="rm-admin-launcher-rm30-hcp-plus-20">Generate RM-30 HCP PLUS NONHCP-20 ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP_PLUS_NONHCP20']}})
+            </button>
+            <button class="btn btn-sm btn-primary btn-launch px-3 font-weight-bold mr-3"
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'disabled'}}
+                    {{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP'] ? '' : 'perm-disabled'}}
+                    data-ep="rm-admin-launch-rm30-hcp">Generate RM-30 HCP ({{@$keyNumbers['careMonthsEligibleForBillGeneration_RM30_HCP']}})
+            </button>
+        </div>
         <div class="my-3 text-secondary text-sm text-monospace launch-result" style="white-space: pre;">
 
         </div>
@@ -40,7 +66,7 @@
                     .on('click', function () {
                         $('.launch-result').text('Please wait...');
                         $('.btn-launch').prop('disabled', true);
-                        $.get('/api/careMonth/rm-admin-launcher', _data => {
+                        $.get('/api/careMonth/' + $(this).attr('data-ep'), _data => {
                             if(!hasResponseError(_data)) {
                                 if(_data.data && _data.data.length) {
                                     $('.launch-result').text(_data.data.join("\n"));
@@ -48,7 +74,7 @@
                             }
                         }, 'json')
                         .then(() => {
-                            $('.btn-launch').prop('disabled', false);
+                            $('.btn-launch:not([perm-disabled])').prop('disabled', false);
                         });
                     });
             }