From 0680a70c79e6cf47bed11160568b936ec09447ed Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Tue, 2 May 2023 19:14:11 +0800
Subject: [PATCH] up

---
 app/Http/Controllers/Admin/StatisticsController.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php
index 03cf23f..968f673 100755
--- a/app/Http/Controllers/Admin/StatisticsController.php
+++ b/app/Http/Controllers/Admin/StatisticsController.php
@@ -70,7 +70,12 @@ class StatisticsController extends CommonController
 
         DB::enableQueryLog();
         $paramedics = (new Paramedic())->where(function ($query) use ($project_id, $month) {
-            $query->where("project_id", $project_id);
+            $order_item_paramedic_ids = (new OrderItems())
+                ->whereRaw("(DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}' or DATE_FORMAT(`paid_at`,'%Y-%m') = '{$month}')")
+                ->whereHas("order", function ($query) use ($project_id) {
+                    $query->where("project_id", $project_id);
+                })->pluck("paramedic_id")->toArray();
+            $query->where("project_id", $project_id)->orWhereIn("id", $order_item_paramedic_ids);
         })->with(["orderItems" => function ($query) use ($month) {
             $query->whereRaw("(DATE_FORMAT(`service_date`,'%Y-%m') = '{$month}' or DATE_FORMAT(`paid_at`,'%Y-%m') = '{$month}')")
                 ->where("total", ">", 0)