Merge branch 'master' into dev-vj

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

@@ -51,7 +51,11 @@
                                     onchange="calculateBillAmount(this)">
                                 <option value=""> -- select -- </option>
                                 <?php for ($i = 5; $i <= $maxMinutes; $i+=5) { ?>
-                                <option value="{{ $i/60 }}" {{ $i === 30 ? 'selected' : '' }}>{{ $i }} minutes</option>
+                                    @if($i == 20) {
+                                        <option value="{{ 21/60 }}" selected>{{ 21 }} minutes</option>
+                                    @else 
+                                        <option value="{{ $i/60 }}">{{ $i }} minutes</option>         
+                                    @endif
                                 <?php } ?>
                             </select>
                         </div>
@@ -87,7 +91,11 @@
                         onchange="calculateBillAmount(this)">
                     <option value=""> -- select -- </option>
                     <?php for ($i = 5; $i <= $maxMinutes; $i+=5) { ?>
-                        <option value="{{ $i/60 }}" {{ $i === 30 ? 'selected' : '' }}>{{ $i }} minutes</option>
+                        @if($i == 20) {
+                            <option value="{{ 21/60 }}" selected>{{ 21 }} minutes</option>
+                        @else 
+                            <option value="{{ $i/60 }}">{{ $i }} minutes</option>         
+                        @endif
                     <?php } ?>
                 </select>
             </div>

resources/views/layouts/patient.blade.php

@@ -393,7 +393,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											</div>
 										</div>
 										<div class=separators>
-											<div>{{friendly_date_time($patient->dob, false,null, true)}} ({{$patient->age_in_years}}
+											<div>{{friendly_date($patient->dob, false,null, true)}} ({{$patient->age_in_years}}
 												y.o {{$patient->sex}})
 											</div>
 											@if($patient->getPrimaryCoverage() &&  $patient->getPrimaryCoverageStatus() === 'YES')

sample.json

@@ -1,55 +1,169 @@
 {
-    "created_at": "2020-07-31T16:14:00Z",
-    "eligible_id": "9CV9QVPUUDCQ8E",
+    "created_at": "2022-01-18T12:51:22Z",
+    "eligible_id": "3GSG50JUTCF43",
     "known_issues": [],
     "date_of_death": null,
-    "last_name": "FRANKLIN",
-    "first_name": "BENJAMIN",
-    "middle_name": "J",
-    "member_id": "333333333A",
+    "last_name": "SHAH",
+    "first_name": "RASIKLAL",
+    "middle_name": "R",
+    "member_id": "3U26R07JQ63",
     "group_id": null,
     "group_name": null,
-    "dob": "1967-09-09",
+    "dob": "1931-10-14",
     "gender": "M",
     "address": {
-        "street_line_1": "1842 Union Street",
+        "street_line_1": "8572 263RD ST",
         "street_line_2": null,
-        "city": "San Francisco",
-        "state": "OH",
-        "zip": "94123"
+        "city": "FLORAL PARK",
+        "state": "NY",
+        "zip": "110011138"
     },
     "payer_name": "CMS",
-    "payer_id": "00431","p
-    lan_number":"","eligibilty_dates":{"start":"2019-02-27","end":null},"eligibility_dates":{"start":"2019-02-27","end":null},"inactivity_dates":{"start":null,"end":null},"plan_types":{"MA":"Medicare Part A (Hospital)","MB":"Medicare Part B (
-    Professional Services)","MC":"Medicare Part C (Advantage)","MD":"Medicare Part D (Prescription drugs)","PR":"Primary insurance (Medicare Secondary, This Insurance is Primary)"},"plan_details":{"MA":{"active":true,"start_date":"1994-01-01",
-    "end_date": null,
-    "deductible": 1288.0,
-    "deductible_remaining": 1288.0,
-    "insurance_type": "MA",
-    "insurance_type_label": "Medicare Part A",
-    "coinsurance_percent": null,
-    "copayment": null,
-    "info_valid_until": "2020-12-31",
-    "info_valid_till": "2020-12-31","
-    comments":[]},"MB":{"active":true,"start_date":"1994-01-01","end_date":null,"deductible":166.0,"deductible_remaining":23.93,"insurance_type":"MB","insurance_type_label":"Medicare Part B","coinsurance_percent":20,"copayment":null,"info_val
-    id_until":"2020-12-31","info_valid_till":"2020-12-31","comments":[]},"MC":{"active":false,"payer_name":null,"insurance_type":null,"insurance_type_label":null,"mco_bill_option_code":null,"mco_bill_option_label":null,"locked":null,"policy_n
-    umber":null,"effective_date":null,"termination_date":null,"contacts":null,"address":{"street_line_1":null,"street_line_2":null,"city":null,"state":null,"zip":null},"comments":[]},"MD":{"active":true,"payer_name":"FRANKLIN","policy_number": "123123123",
-    "effective_date": "2019-01-01",
-    "termination_date": null,
-    "contacts": [
+    "payer_id": "00431",
+    "plan_number": "",
+    "eligibilty_dates": {
+        "start": "2022-01-18",
+        "end": null
+    },
+    "eligibility_dates": {
+        "start": "2022-01-18",
+        "end": null
+    },
+    "inactivity_dates": {
+        "start": null,
+        "end": null
+    },
+    "plan_types": {
+        "MA": "Medicare Part A (Hospital)",
+        "MB": "Medicare Part B (Professional Services)",
+        "MC": "Medicare Part C (Advantage)",
+        "MD": "Medicare Part D (Prescription drugs)",
+        "PR": "Primary insurance (Medicare Secondary, This Insurance is Primary)"
+    },
+    "plan_details": {
+        "MA": {
+            "active": true,
+            "start_date": "2004-07-01",
+            "end_date": null,
+            "deductible": 0.0,
+            "deductible_remaining": null,
+            "insurance_type": "QM",
+            "insurance_type_label": "Qualified Medicare Beneficiary",
+            "coinsurance_percent": null,
+            "copayment": null,
+            "info_valid_until": "2022-12-31",
+            "info_valid_till": "2022-12-31",
+            "comments": [
+                "0-Beneficiary insured due to age OASI"
+            ]
+        },
+        "MB": {
+            "active": true,
+            "start_date": "1996-10-01",
+            "end_date": null,
+            "deductible": 0.0,
+            "deductible_remaining": null,
+            "insurance_type": "QM",
+            "insurance_type_label": "Qualified Medicare Beneficiary",
+            "coinsurance_percent": 0,
+            "copayment": null,
+            "info_valid_until": "2022-12-31",
+            "info_valid_till": "2022-12-31",
+            "comments": [
+                "0-Beneficiary insured due to age OASI"
+            ]
+        },
+        "MC": {
+            "active": false,
+            "payer_name": null,
+            "insurance_type": null,
+            "insurance_type_label": null,
+            "mco_bill_option_code": null,
+            "mco_bill_option_label": null,
+            "locked": null,
+            "policy_number": null,
+            "effective_date": null,
+            "termination_date": null,
+            "contacts": null,
+            "address": {
+                "street_line_1": null,
+                "street_line_2": null,
+                "city": null,
+                "state": null,
+                "zip": null
+            },
+            "comments": []
+        },
+        "MD": {
+            "active": true,
+            "payer_name": "CIGNA HEALTH AND LIFE INSURANCE COMPANY",
+            "policy_number": "S5617",
+            "effective_date": "2016-01-01",
+            "termination_date": null,
+            "contacts": [
+                {
+                    "contact_type": "telephone",
+                    "contact_value": "8002226700"
+                },
+                {
+                    "contact_type": "url",
+                    "contact_value": "www.cignamedicare.com"
+                }
+            ],
+            "address": {
+                "street_line_1": "900 Cottage Grove Rd",
+                "street_line_2": "B4SRS",
+                "city": "Hartford",
+                "state": "CT",
+                "zip": "06152"
+            },
+            "comments": []
+        },
+        "PR": []
+    },
+    "requested_service_types": [
         {
-            "contact_type": "telephone",
-            "contact_value": "8887116798"
+            "type": "30",
+            "type_label": "Health Benefit Plan Coverage",
+            "plan_type": "MA",
+            "active": true,
+            "start_date": "2004-07-01",
+            "end_date": null,
+            "deductible": 0.0,
+            "deductible_remaining": null,
+            "insurance_type": "QM",
+            "insurance_type_label": "Qualified Medicare Beneficiary",
+            "coinsurance_percent": null,
+            "copayment": null,
+            "info_valid_until": "2022-12-31",
+            "info_valid_till": "2022-12-31"
         },
         {
-            "contact_type": "url",
-            "contact_value": "www.FirstHealthPartD.com"
+            "type": "30",
+            "type_label": "Health Benefit Plan Coverage",
+            "plan_type": "MB",
+            "active": true,
+            "start_date": "1996-10-01",
+            "end_date": null,
+            "deductible": 0.0,
+            "deductible_remaining": null,
+            "insurance_type": "QM",
+            "insurance_type_label": "Qualified Medicare Beneficiary",
+            "coinsurance_percent": 0,
+            "copayment": null,
+            "info_valid_until": "2022-12-31",
+            "info_valid_till": "2022-12-31"
         }
     ],
-    "address": {
-        "street_line_1":"1842 U
-    nion Street","street_line_2":null,"city":"San Francisco","state":"IL","zip":"94123"},"comments":[]},"PR":[]},"requested_service_types":[{"type":"30","type_label":"Health Benefit Plan Coverage","plan_type":"MA","active":true,"start_date":"
-    1994-01-01","end_date":null,"deductible":1288.0,"deductible_remaining":1288.0,"insurance_type":"MA","insurance_type_label":"Medicare Part A","coinsurance_percent":null,"copayment":null,"info_valid_until":"2020-12-31","info_valid_till":"20
-    20-12-31"},{"type":"30","type_label":"Health Benefit Plan Coverage","plan_type":"MB","active":true,"start_date":"1994-01-01","end_date":null,"deductible":166.0,"deductible_remaining":23.93,"insurance_type":"MB","insurance_type_label":"Med
-    icare Part B","coinsurance_percent":20,"copayment":null,"info_valid_until":"2020-12-31","info_valid_till":"2020-12-31"}],"requested_procedure_codes":[],"history":{"plan_details":{"MA":[],"MB":[],"MC":[],"MD":[],"PR":[]},"requested_service
-    _types":[]}}
+    "requested_procedure_codes": [],
+    "history": {
+        "plan_details": {
+            "MA": [],
+            "MB": [],
+            "MC": [],
+            "MD": [],
+            "PR": []
+        },
+        "requested_service_types": []
+    }
+}