更新

server/app/adminapi/lists/tcm/PrescriptionOrderLists.php

@@ -6,6 +6,7 @@ namespace app\adminapi\lists\tcm;
 
 use app\adminapi\lists\BaseAdminDataLists;
 use app\adminapi\logic\dept\DeptLogic;
+use app\adminapi\logic\stats\YejiStatsLogic;
 use app\adminapi\logic\tcm\PrescriptionOrderLogic;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
@@ -101,11 +102,12 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         $this->applySupplyModeFilter($query);
         $this->applyCreatorOrOwnPrescriptionVisibility($query);
         $this->applyDataScopeForPrescriptionOrder($query);
-        // 业绩看板侧栏等：不展示履约已取消(4)，与 stats 业绩统计口径一致
+        // 业绩看板侧栏等：不展示履约已取消(4)，与看板合计业绩 NULL 安全口径一致
         if ((int) ($this->params['exclude_fulfillment_cancelled'] ?? 0) === 1) {
-            $query->where('fulfillment_status', '<>', 4);
+            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, '');
         }
         $this->applyYejiErCenterRevisitOrderFilter($query);
+        YejiStatsLogic::applyYejiDrawerChannelFilterToPrescriptionOrderQuery($query, $this->params);
     }
 
     /**
@@ -281,8 +283,10 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
 
     /**
      * 统计用查询骨架：不含 create_time 区间；其它筛选项 + 统计专用数据域（不重复 where）
+     *
+     * @param bool $applyYejiDrawerChannel 是否应用业绩侧栏渠道收窄（合计业绩统计须传 false）
      */
-    private function buildBaseQueryForStats(): Query
+    private function buildBaseQueryForStats(bool $applyYejiDrawerChannel = true): Query
     {
         $query = PrescriptionOrder::where($this->searchWhereWithoutCreateTimeRange())->whereNull('delete_time');
         $this->applyDoctorAssistantFilters($query);
@@ -302,9 +306,12 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                 $this->applyDataScopeForPrescriptionOrder($query);
             }
         }
-        // 与列表 applyPermissionAndExtraFilters 一致：业绩侧栏传 exclude 时不统计已取消行
+        // 与看板「合计业绩」一致：NULL 安全剔除履约已取消(4)，勿用 `<>` 以免误丢 NULL 状态行
         if ((int) ($this->params['exclude_fulfillment_cancelled'] ?? 0) === 1) {
-            $query->where('fulfillment_status', '<>', 4);
+            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, '');
+        }
+        if ($applyYejiDrawerChannel) {
+            YejiStatsLogic::applyYejiDrawerChannelFilterToPrescriptionOrderQuery($query, $this->params);
         }
 
         return $query;
@@ -461,6 +468,10 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         }
         unset($item);
 
+        if ((int) ($this->params['yeji_order_drawer'] ?? 0) === 1) {
+            PrescriptionOrderLogic::appendLinkedAppointmentsToListRows($lists);
+        }
+
         return $lists;
     }
 
@@ -495,6 +506,11 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         if ($yejiConsult !== null) {
             $base['stats_yeji_consult_count'] = $yejiConsult;
         }
+        $yejiDrawerTotal = $this->computeYejiDrawerPerformanceTotalForExtend();
+        if ($yejiDrawerTotal !== null) {
+            $base['stats_yeji_drawer_total_performance_amount']      = $yejiDrawerTotal['amount'];
+            $base['stats_yeji_drawer_total_performance_order_count'] = $yejiDrawerTotal['order_count'];
+        }
 
         return $base;
     }
@@ -570,6 +586,37 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         return [date('Y-m-d', $t0), date('Y-m-d', $t1)];
     }
 
+    /**
+     * 侧栏已选渠道时：「合计业绩」金额与订单数（与看板列同口径，不限渠道收窄）
+     *
+     * @return array{amount: float, order_count: int}|null
+     */
+    private function computeYejiDrawerPerformanceTotalForExtend(): ?array
+    {
+        if ((int) ($this->params['yeji_order_drawer'] ?? 0) !== 1) {
+            return null;
+        }
+        if (trim((string) ($this->params['channel_code'] ?? '')) === '') {
+            return null;
+        }
+        [$t0, $t1] = $this->resolveStatsTimeWindow();
+        if ($t0 <= 0 || $t1 <= 0) {
+            return null;
+        }
+        if ($t1 < $t0) {
+            $tmp = $t0;
+            $t0  = $t1;
+            $t1  = $tmp;
+        }
+        $q = $this->buildBaseQueryForStats(false)->whereBetween('create_time', [$t0, $t1]);
+        // 全量「合计业绩」与看板列同口径：始终剔除履约已取消(4)，不依赖 exclude 参数
+        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, '');
+        $amount = round((float) (clone $q)->sum('amount'), 2);
+        $count  = (int) (clone $q)->count();
+
+        return ['amount' => $amount, 'order_count' => $count];
+    }
+
     /**
      * 重点看板计数（基于“当前筛选（去除审核/履约状态）”后的全量命中）
      *