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

app/Http/Controllers/PracticeManagementController.php

@@ -1046,24 +1046,25 @@ class PracticeManagementController extends Controller
         }
 
         $claims = DB::select(DB::raw("
-SELECT claim.uid as uid,
-       DATE(claim.created_at) as created,
+SELECT claim.uid AS uid,
+       DATE(claim.created_at) AS created,
        claim.status,
-       client.uid as client_uid,
-       (client.name_last || ' ' || client.name_first) as client ,
-       client.chart_number as client_chart_number,
-       cp.id as claim_pro_id,
-       (cp.name_last || ' ' || cp.name_first) as claim_pro,
-       sp.id as status_pro_id,
-       (sp.name_last || ' ' || sp.name_first) as status_pro,
-       note.uid as note_uid,
+       client.uid AS client_uid,
+       client.cell_number AS client_phone,
+       (client.name_last || ' ' || client.name_first) AS client ,
+       client.chart_number AS client_chart_number,
+       cp.id AS claim_pro_id,
+       (cp.name_last || ' ' || cp.name_first) AS claim_pro,
+       sp.id AS status_pro_id,
+       (sp.name_last || ' ' || sp.name_first) AS status_pro,
+       note.uid AS note_uid,
        note.method,
        -- claim.status_updated_at,
        (DATE(claim.status_updated_at) || ' ' || 
             LPAD(EXTRACT(hour FROM claim.status_updated_at)::text, 2, '0') || ':' || 
-            LPAD(EXTRACT(minute FROM claim.status_updated_at)::text, 2, '0')) as status_updated_at,
-       (SELECT string_agg(claim_line.cpt, ', ') FROM claim_line where claim_id = claim.id) as cpts,
-       (SELECT count(claim_line_icd.id) FROM claim_line_icd where claim_line_id IN (SELECT id FROM claim_line WHERE claim_id = claim.id)) as icds,
+            LPAD(EXTRACT(minute FROM claim.status_updated_at)::text, 2, '0')) AS status_updated_at,
+       (SELECT string_agg(claim_line.cpt, ', ') FROM claim_line where claim_id = claim.id) AS cpts,
+       (SELECT COUNT(claim_line_icd.id) FROM claim_line_icd WHERE claim_line_id IN (SELECT id FROM claim_line WHERE claim_id = claim.id)) AS icds,
        ROUND(claim.expected_total, 3) as expected_total
 FROM claim
     join client on claim.client_id = client.id
@@ -1080,6 +1081,7 @@ AND (client.name_first ILIKE :q OR
      client.mcn ILIKE :q)
 AND (claim.created_at >= :from AND claim.created_at <= :to)
 " . ($hcpPro ? "AND claim.pro_id = :hcp" : '') . "
+AND claim.id IN (SELECT mb_claim.claim_id FROM mb_claim)
 ORDER BY claim.created_at ASC
 --OFFSET 0 LIMIT 15
 "), $params);

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

@@ -322,7 +322,6 @@
                             this.currentMBClaim = null;
                             this.currentClaimLines = null;
                             $.get('/claims/current-mb-claim/' + claim.uid, (_data) => {
-                                _data = null;
                                 if(!_data || _data === 'null') {
                                     alert('Please generate a submission for this claim');
                                     return false;