|
@@ -1137,7 +1137,7 @@ WHERE cl.shadow_pro_id IS NULL
|
|
|
->count();
|
|
|
$ERxsPendingSignature = Erx::where('pro_declared_status', '<>', 'CANCELLED')
|
|
|
->where('has_hcp_pro_signed', '<>', true)->get();
|
|
|
-
|
|
|
+
|
|
|
|
|
|
$numERx = count($ERxsPendingSignature);
|
|
|
|
|
@@ -1386,7 +1386,7 @@ WHERE cl.shadow_pro_id IS NULL
|
|
|
{
|
|
|
$performer = $this->performer();
|
|
|
$pro = $performer->pro;
|
|
|
-
|
|
|
+
|
|
|
if($pro->pro_type === 'ADMIN'){
|
|
|
return $this->dashboard_ADMIN($request);
|
|
|
}elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment) {
|
|
@@ -1400,9 +1400,9 @@ WHERE cl.shadow_pro_id IS NULL
|
|
|
}elseif($pro->is_considered_for_dna){
|
|
|
return $this->dashboard_DNA($request);
|
|
|
}elseif($pro->is_considered_for_rd_assignment){
|
|
|
- return redirect()->route('rd.dashboard');
|
|
|
+ return redirect()->route('rd.dashboard');
|
|
|
}else{
|
|
|
- return redirect()->route('ca.dashboard');
|
|
|
+ return redirect()->route('ca.dashboard');
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2115,7 +2115,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
|
|
|
$filters = $request->all();
|
|
|
|
|
|
$filterDate = @$filters['cm_start_date'] ? @$filters['cm_start_date'] . '-01' : null;
|
|
|
-
|
|
|
+
|
|
|
$cmStartDate = $filterDate ?? date('Y-m-01');
|
|
|
|
|
|
$careMonths = CareMonth::query();
|