diff --git a/app/Http/Controllers/Admin/StatisticsController.php b/app/Http/Controllers/Admin/StatisticsController.php
index 38659b9..d1f382b 100755
--- a/app/Http/Controllers/Admin/StatisticsController.php
+++ b/app/Http/Controllers/Admin/StatisticsController.php
@@ -269,18 +269,18 @@ class StatisticsController extends CommonController
"patients" => function ($query) use ($before_datetime) {
$query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
},
- "oneBalance" => function ($query) use ($before_datetime) {
- $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
- }
+// "oneBalance" => function ($query) use ($before_datetime) {
+// $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->orderBy("id", "desc");
+// }
])
- ->whereHas("oneBalance", function ($query) use ($before_datetime) {
- $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
- })
- ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
- $query
- ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
- ->where("project_id", $project_id);
- })
+// ->whereHas("oneBalance", function ($query) use ($before_datetime) {
+// $query->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")->where("balance", ">", 0)->orderBy("id", "desc");
+// })
+// ->whereHas("orders", function ($query) use ($before_datetime, $project_id) {
+// $query
+// ->whereRaw("UNIX_TIMESTAMP(`created_at`) <= {$before_datetime}")
+// ->where("project_id", $project_id);
+// })
->get();
$laravel_duration = microtime(true) - LARAVEL_START;
diff --git a/resources/views/admin/statistics/customer-balance.blade.php b/resources/views/admin/statistics/customer-balance.blade.php
index ba7daaf..4ebb65c 100755
--- a/resources/views/admin/statistics/customer-balance.blade.php
+++ b/resources/views/admin/statistics/customer-balance.blade.php
@@ -30,9 +30,9 @@
@endforeach
-
+{{-- --}}
@@ -60,7 +60,7 @@
| {{ $item->mobile }} |
{{ $item->patients->count() ? $item->patients->last()->name : "无" }} |
{{ date("Y-m-d H:i:s",$before_datetime) }} |
- {{ $item->oneBalance ? $item->oneBalance->balance : "0" }} |
+ {{ $item->balance }} |
@endforeach