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

app/Http/Controllers/Admin/OrdersController.php

@@ -77,9 +77,9 @@ class OrdersController extends CommonController
 
         $data = $data->paginate(10);
         foreach ($data as $order) {
+            $order = $order->refreshTotal();
             $factors = json_decode($order->factors,true);
             $order->department = (collect($factors)->where('factor_name','所在科室')->first()->factor_item_name)??'';
-            $order = $order->refreshTotal();
         }
         return view($this->bladePath . ".index", compact("data", "project_id", "month", "project"));
     }