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

app/Exports/OrdersExport.php

@@ -22,6 +22,7 @@ class OrdersExport implements FromCollection
             $res[] = [
                 "订单编号" => " ".$row->serial,
                 "所属项目/医院" => $row->project->name,
+                "科室" => $row->department,
                 "客户姓名" => $row->customer->name ?: $row->patient->name,
                 "联系电话" => " ".$row->customer->mobile,
                 "被护理人" => $row->patient->name,

app/Http/Controllers/Admin/OrdersController.php

@@ -72,6 +72,10 @@ class OrdersController extends CommonController
 
         if (request()->is_export) {
             $data = $data->get();
+            foreach ($data as $order) {
+                $factors = json_decode($order->factors,true);
+                $order->department = (collect($factors)->where('factor_name','所在科室')->first()['factor_item_name'])??'';
+            }
             return Excel::download(new OrdersExport($data), "订单导出.xlsx");
         }