Merge branch 'master' of /data/git/tiantian2

4 years ago · a13ffddc43
parent 0aa9314fa1 4d5cb4fc35
commit a13ffddc43
1 changed files with 1 additions and 1 deletions
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@ -292,7 +292,7 @@ class OrdersController extends CommonController
        $group_by_paramedic = [];
        foreach ($paramedic_items as $k => $items) {
            $items = $items->sortBy("id");
-            $paramedic = Paramedic::find($k);
+            $paramedic = Paramedic::find($k)->withTrashed();
            $group_by_paramedic[] = [
                "paramedic_id" => $k,
                "paramedic_name" => $paramedic->name,