|
@@ -375,23 +375,23 @@ class PracticeManagementController extends Controller
|
|
{
|
|
{
|
|
$proUid = $proUid ? $proUid : $request->get('pro-uid');
|
|
$proUid = $proUid ? $proUid : $request->get('pro-uid');
|
|
$performerPro = $this->performer->pro;
|
|
$performerPro = $this->performer->pro;
|
|
- $pro = null;
|
|
|
|
|
|
+ $targetPro = null;
|
|
$allPros = null;
|
|
$allPros = null;
|
|
$expectedForHcp = null;
|
|
$expectedForHcp = null;
|
|
if($performerPro->pro_type == 'ADMIN'){
|
|
if($performerPro->pro_type == 'ADMIN'){
|
|
$allPros = Pro::all();
|
|
$allPros = Pro::all();
|
|
- $pro = Pro::where('uid', $proUid)->first();
|
|
|
|
|
|
+ $targetPro = Pro::where('uid', $proUid)->first();
|
|
}else{
|
|
}else{
|
|
- $pro = $performerPro;
|
|
|
|
|
|
+ $targetPro = $performerPro;
|
|
}
|
|
}
|
|
$notes = [];
|
|
$notes = [];
|
|
- if($pro){
|
|
|
|
- $expectedForHcp = DB::select(DB::raw("SELECT coalesce(SUM(hcp_expected_payment_amount),0) as expected_pay FROM bill WHERE hcp_pro_id = :targetProID AND is_signed_by_hcp IS TRUE AND is_cancelled = false"), ['targetProID' => $pro->id])[0]->expected_pay;
|
|
|
|
- $notes = Note::where('hcp_pro_id', $pro->id)->orderBy('effective_dateest', 'desc')->paginate();
|
|
|
|
|
|
+ if($targetPro){
|
|
|
|
+ $expectedForHcp = DB::select(DB::raw("SELECT coalesce(SUM(hcp_expected_payment_amount),0) as expected_pay FROM bill WHERE hcp_pro_id = :targetProID AND is_signed_by_hcp IS TRUE AND is_cancelled = false"), ['targetProID' => $targetPro->id])[0]->expected_pay;
|
|
|
|
+ $notes = Note::where('hcp_pro_id', $targetPro->id)->orderBy('effective_dateest', 'desc')->paginate();
|
|
}else{
|
|
}else{
|
|
$notes = Note::orderBy('effective_dateest', 'desc')->paginate();
|
|
$notes = Note::orderBy('effective_dateest', 'desc')->paginate();
|
|
}
|
|
}
|
|
- return view('app.practice-management.billing-manager', compact('notes', 'allPros', 'expectedForHcp'));
|
|
|
|
|
|
+ return view('app.practice-management.billing-manager', compact('notes', 'allPros', 'expectedForHcp', 'targetPro'));
|
|
}
|
|
}
|
|
|
|
|
|
public function claims(Request $request)
|
|
public function claims(Request $request)
|