From 99daa80b87a95d69392006b5a80c9f3f3d655262 Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Wed, 27 Sep 2023 15:54:06 +0800
Subject: [PATCH] 1

---
 app/Exports/OrdersExport.php                    | 1 +
 app/Http/Controllers/Admin/OrdersController.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/Exports/OrdersExport.php b/app/Exports/OrdersExport.php
index ead439a..1ae007d 100644
--- a/app/Exports/OrdersExport.php
+++ b/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,
diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 21f825b..4ceedf0 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/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");
         }