更新

server/app/adminapi/logic/order/OrderLogic.php

@@ -730,7 +730,7 @@ class OrderLogic
      * @param array $params order_type(-1全部已支付类型合计,0退款,1挂号费,2问诊费,3药品费用,4首付,5尾款,6其他), days(0今天,7,30)
      * @return array
      */
-    public static function orderStats(array $params = [])
+    public static function orderStats(array $params = [], int $adminId = 0, ?array $adminInfo = null)
     {
         $allPaidOrderTypes = [1, 2, 3, 4, 5, 6];
         $orderType = array_key_exists('order_type', $params) ? (int) $params['order_type'] : 1;
@@ -740,6 +740,11 @@ class OrderLogic
         $orderTypeName = $orderType === -1 ? '全部（已支付）' : self::$orderTypeNames[$orderType];
         $days = isset($params['days']) ? (int)$params['days'] : 7;
 
+        // 数据范围：当前用户可见 admin id 集合；null 表示全部
+        $visibleAdminIds = ($adminInfo !== null && $adminId > 0)
+            ? \app\common\service\DataScope\DataScopeService::getVisibleAdminIds($adminId, $adminInfo)
+            : null;
+
         $endTime = !empty($params['end_time']) ? strtotime($params['end_time']) : time();
         if ($days === 0) {
             $startTime = strtotime(date('Y-m-d'));
@@ -764,6 +769,13 @@ class OrderLogic
         } else {
             $query->where('order_type', $orderType)->where('status', 2);
         }
+        if ($visibleAdminIds !== null) {
+            if ($visibleAdminIds === []) {
+                $query->whereRaw('0 = 1');
+            } else {
+                $query->whereIn('creator_id', $visibleAdminIds);
+            }
+        }
         $orderRows = $query
             ->field('creator_id, count(*) as cnt, sum(amount) as total_amount')
             ->group('creator_id')
@@ -822,6 +834,13 @@ class OrderLogic
         } else {
             $todayQuery->where('order_type', $orderType)->where('status', 2);
         }
+        if ($visibleAdminIds !== null) {
+            if ($visibleAdminIds === []) {
+                $todayQuery->whereRaw('0 = 1');
+            } else {
+                $todayQuery->whereIn('creator_id', $visibleAdminIds);
+            }
+        }
         $todayRows = $todayQuery
             ->field('creator_id, count(*) as cnt, sum(amount) as total_amount')
             ->group('creator_id')
@@ -850,6 +869,9 @@ class OrderLogic
         }
         usort($todayRanking, fn($a, $b) => $b['count'] <=> $a['count']);
 
+        // 数据范围启用时（非 root/全部范围），无可见成员的部门不渲染
+        $hideEmptyDept = $visibleAdminIds !== null;
+
         $deptData = [];
         $assignedIds = [];
         foreach ($depts as $deptId => $deptName) {
@@ -866,6 +888,9 @@ class OrderLogic
                     'amount' => number_format((float)($amounts[$adminId] ?? 0), 2, '.', ''),
                 ];
             }
+            if ($hideEmptyDept && $members === []) {
+                continue;
+            }
             $deptTotal = array_sum(array_column($members, 'count'));
             $deptAmount = array_sum(array_map(fn($m) => (float)$m['amount'], $members));
             $deptData[] = [