更新

2026-05-12 17:26:11 +08:00
parent c644f2554f
commit 796ca12fb8
10 changed files with 172 additions and 68 deletions
@@ -77,6 +77,23 @@ class CustomerLists extends BaseAdminDataLists implements ListsSearchInterface
            }
        }

+        // 添加时间：与 lists 排序口径一致（external_first_add_time 优先，0 则 create_time）
+        $addStart = trim((string) ($this->params['add_time_start'] ?? ''));
+        $addEnd = trim((string) ($this->params['add_time_end'] ?? ''));
+        $effExpr = 'COALESCE(NULLIF(external_first_add_time, 0), create_time)';
+        if ($addStart !== '') {
+            $t = strtotime($addStart . ' 00:00:00');
+            if ($t !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' >= ?', [$t]);
+            }
+        }
+        if ($addEnd !== '') {
+            $t = strtotime($addEnd . ' 23:59:59');
+            if ($t !== false) {
+                $query->whereRaw($effExpr . ' > 0 AND ' . $effExpr . ' <= ?', [$t]);
+            }
+        }
+
        return $query;
    }

@@ -107,7 +107,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
            $this->applyCreatorOrOwnPrescriptionVisibility($query);
            $this->applyDataScopeForPrescriptionOrder($query);
        }
-        // 业绩看板侧栏等：不展示履约已取消(4)，与 stats 业绩统计口径一致
+        // 业绩看板侧栏等：不展示履约 4/9/10，与 stats 业绩口径一致
        if ((int) ($this->params['exclude_fulfillment_cancelled'] ?? 0) === 1) {
            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, '');
        }
@@ -378,7 +378,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                $this->applyDataScopeForPrescriptionOrder($query);
            }
        }
-        // 与看板「合计业绩」一致：NULL 安全剔除履约已取消(4)，勿用 `<>` 以免误丢 NULL 状态行
+        // 与看板「合计业绩」一致：NULL 安全剔除履约 4/9/10
        if ((int) ($this->params['exclude_fulfillment_cancelled'] ?? 0) === 1) {
            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, '');
        }
@@ -570,13 +570,13 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
            'stats_order_amount'                 => $s['order_amount'],
            'stats_order_amount_not_cancelled'  => $s['order_amount_not_cancelled'],
            'stats_order_amount_cancelled'      => $s['order_amount_cancelled'],
-            /** 业绩：业务订单金额，剔除履约已取消(fulfillment_status=4)，其余状态全部计入 */
-            'stats_order_amount_performance'    => $s['order_amount_not_cancelled'],
+            /** 业绩：业务订单金额，剔除履约已取消/拒收/退款(4/9/10)，NULL 与其它状态计入 */
+            'stats_order_amount_performance'    => $s['order_amount_performance'] ?? $s['order_amount_not_cancelled'],
            'stats_linked_pay_amount'            => $s['linked_pay_amount'],
            'stats_linked_pay_amount_not_cancelled' => $s['linked_pay_amount_not_cancelled'],
            'stats_linked_pay_amount_cancelled'  => $s['linked_pay_amount_cancelled'],
-            /** 业绩-关联实付：剔除履约已取消订单的关联支付金额 */
-            'stats_linked_pay_amount_performance' => $s['linked_pay_amount_not_cancelled'],
+            /** 业绩-关联实付：剔除履约 4/9/10 订单的关联支付金额 */
+            'stats_linked_pay_amount_performance' => $s['linked_pay_amount_performance'] ?? $s['linked_pay_amount_not_cancelled'],
            'stats_time_start'                   => $s['label_start'],
            'stats_time_end'                      => $s['label_end'],
            /** 统计口径：all=支付审核白名单全量；assistant=医助仅诊单协助业绩；restricted=与列表同域 */
@@ -693,7 +693,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
            $t1  = $tmp;
        }
        $q = $this->buildBaseQueryForStats(false)->whereBetween('create_time', [$t0, $t1]);
-        // 全量「合计业绩」与看板列同口径：始终剔除履约已取消(4)，不依赖 exclude 参数
+        // 全量「合计业绩」与看板列同口径：始终剔除履约 4/9/10，不依赖 exclude 参数
        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
        $amount = round((float) (clone $q)->sum('amount'), 2);
        $count  = (int) (clone $q)->count();
@@ -715,7 +715,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($pendingRxQuery, '');

        return [
-            // 处方审核待处理（不含履约已取消）
+            // 处方审核待处理（不含履约 4/9/10）
            'pending_rx' => (int) $pendingRxQuery->where('prescription_audit_status', 0)->count(),
            // 支付审核待处理（前提：处方已通过）
            'pending_pay' => (int) (clone $query)->where('prescription_audit_status', 1)->where('payment_slip_audit_status', 0)->count(),
@@ -761,8 +761,8 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        }

        $q = $this->buildBaseQueryForStats()->whereBetween('create_time', [$t0, $t1]);
-        $orderTotal     = round((float) (clone $q)->sum('amount'), 2);
-        $orderCancelled = round((float) (clone $q)->where('fulfillment_status', 4)->sum('amount'), 2);
+        $orderTotal       = round((float) (clone $q)->sum('amount'), 2);
+        $orderCancelled   = round((float) (clone $q)->where('fulfillment_status', 4)->sum('amount'), 2);
        $orderNotCancelled = round($orderTotal - $orderCancelled, 2);

        $idsAll = (clone $q)->column('id');
@@ -770,7 +770,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
            return $id > 0;
        }));
        if ($idsAll === []) {
-            return $this->statsExtendPayload(
+            $empty = $this->statsExtendPayload(
                $orderTotal,
                $orderNotCancelled,
                $orderCancelled,
@@ -780,6 +780,12 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                $l0,
                $l1
            );
+            $qPerfEmpty = clone $q;
+            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($qPerfEmpty, '');
+            $empty['order_amount_performance']        = round((float) $qPerfEmpty->sum('amount'), 2);
+            $empty['linked_pay_amount_performance'] = 0.0;
+
+            return $empty;
        }
        $idsCancel = (clone $q)->where('fulfillment_status', 4)->column('id');
        $idsCancel = array_values(array_filter(array_map('intval', $idsCancel), static function (int $id): bool {
@@ -791,7 +797,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        $linkedNotCancelled = $this->sumLinkedPayForPrescriptionOrderIds($idsNotCancelled);
        $linkedCancelled    = $this->sumLinkedPayForPrescriptionOrderIds($idsCancel);

-        return $this->statsExtendPayload(
+        $base = $this->statsExtendPayload(
            $orderTotal,
            $orderNotCancelled,
            $orderCancelled,
@@ -801,6 +807,21 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
            $l0,
            $l1
        );
+
+        $qPerf = clone $q;
+        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($qPerf, '');
+        $base['order_amount_performance'] = round((float) $qPerf->sum('amount'), 2);
+
+        $idsExcludedPerf = (clone $q)
+            ->whereIn('fulfillment_status', YejiStatsLogic::PRESCRIPTION_ORDER_FULFILLMENT_EXCLUDED_FROM_PERFORMANCE)
+            ->column('id');
+        $idsExcludedPerf = array_values(array_filter(array_map('intval', $idsExcludedPerf), static function (int $id): bool {
+            return $id > 0;
+        }));
+        $idsPerf = array_values(array_diff($idsAll, $idsExcludedPerf));
+        $base['linked_pay_amount_performance'] = $this->sumLinkedPayForPrescriptionOrderIds($idsPerf);
+
+        return $base;
    }

    /**
@@ -808,7 +829,11 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
     */
    private function statsZeroPayload(): array
    {
-        return $this->statsExtendPayload(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, '', '');
+        $z = $this->statsExtendPayload(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, '', '');
+        $z['order_amount_performance']        = 0.0;
+        $z['linked_pay_amount_performance'] = 0.0;
+
+        return $z;
    }

    /**