|
@@ -93,7 +93,7 @@ class McpController extends Controller
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
- $patients = $patients->orderBy('created_at', 'DESC')->paginate(20);
|
|
|
+ $patients = $patients->orderBy('created_at', 'DESC')->paginate(50);
|
|
|
return view('app.mcp.patients', compact('patients', 'filters'));
|
|
|
}
|
|
|
|
|
@@ -103,9 +103,9 @@ class McpController extends Controller
|
|
|
$notes = Note::query();
|
|
|
$notes = $notes->where('hcp_pro_id', $this->performer->pro->id);
|
|
|
$this->filterMultiQuery($request, $notes, 'effective_time', 'date_category', 'date_value_1', 'date_value_2');
|
|
|
- $this->filterSimpleQuery($request, $notes, 'new_or_fu_or_na', 'new_or_fu_or_na');
|
|
|
+ $this->filterSimpleQuery($request, $notes, 'new_or_fu_or_na', 'new_or_fu_or_na');
|
|
|
$notes = $notes->orderBy('created_at', 'DESC')->paginate(20);
|
|
|
-
|
|
|
+
|
|
|
|
|
|
return view('app.mcp.notes', compact('notes','filters'));
|
|
|
}
|
|
@@ -136,7 +136,7 @@ class McpController extends Controller
|
|
|
|
|
|
public function clients_bdt_devices(Request $request){
|
|
|
$filters = $request->all();
|
|
|
-
|
|
|
+
|
|
|
$devices = ClientBDTDevice::select('client_bdt_device.*')
|
|
|
->join('client', 'client.id', '=', 'client_bdt_device.client_id')
|
|
|
->where('client.mcp_pro_id', $this->performer->pro->id);
|
|
@@ -154,7 +154,7 @@ class McpController extends Controller
|
|
|
|
|
|
public function memos(Request $request){
|
|
|
$filters = $request->all();
|
|
|
-
|
|
|
+
|
|
|
$memos = ClientMemo::select('client_memo.*')
|
|
|
->join('client', 'client.id', '=', 'client_memo.client_id')
|
|
|
->where('client.mcp_pro_id', $this->performer->pro->id);
|
|
@@ -198,7 +198,7 @@ class McpController extends Controller
|
|
|
$filters = $request->all();
|
|
|
$supplyOrders = SupplyOrder::select('supply_order.*')->where('supply_order.signed_by_pro_id', $this->performer->pro->id);
|
|
|
$this->filterMultiQuery($request, $supplyOrders, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
|
|
|
- $status = $request->get('status');
|
|
|
+ $status = $request->get('status');
|
|
|
if($status){
|
|
|
if($status == 'CLEARED_FOR_SHIPMENT'){
|
|
|
$supplyOrders = $supplyOrders->where('is_cleared_for_shipment', true);
|
|
@@ -207,16 +207,16 @@ class McpController extends Controller
|
|
|
}elseif($status == 'CANCELLED'){
|
|
|
$supplyOrders = $supplyOrders->where('is_cancelled', true);
|
|
|
}else{
|
|
|
- $supplyOrders = $supplyOrders->join('shipment', 'shipment.id', '=', 'supply_order.shipment_id')->where('shipment.status', $status);
|
|
|
+ $supplyOrders = $supplyOrders->join('shipment', 'shipment.id', '=', 'supply_order.shipment_id')->where('shipment.status', $status);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
$supplyOrders = $supplyOrders->orderBy('created_at', 'DESC')->paginate(20);
|
|
|
return view('app.mcp.supply_orders', compact('supplyOrders', 'filters'));
|
|
|
}
|
|
|
|
|
|
public function client_messages(Request $request)
|
|
|
- {
|
|
|
+ {
|
|
|
$filters = $request->all();
|
|
|
|
|
|
$clientMessages = ClientSMS::select('client_sms.*')
|