更新

2026-05-22 11:15:59 +08:00
parent 49c8c95966
commit 22ec53c070
6 changed files with 331 additions and 64 deletions
@@ -107,7 +107,10 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        $this->applyServiceChannelFilter($query);
        $this->applySupplyModeFilter($query);
        if (!$this->shouldBypassListVisibilityForDiagnosisEdit()) {
-            $this->applyCreatorOrOwnPrescriptionVisibility($query);
+            // 业绩看板按部门点「合计业绩」/复诊下钻：部门或数据域内医助筛选已收口，勿再叠「仅本人订单」
+            if (!$this->shouldSkipCreatorOnlyForYejiDrawer()) {
+                $this->applyCreatorOrOwnPrescriptionVisibility($query);
+            }
            $this->applyDataScopeForPrescriptionOrder($query);
        }
        // 业绩看板侧栏等：不展示履约 4/9/10，与 stats 业绩口径一致
@@ -323,6 +326,50 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        return $diagnosisPatientId > 0 && $diagnosisPatientId === $patientId;
    }

+    /**
+     * 业绩看板侧栏：按部门行点合计业绩/接诊诊单（assistant_dept_id），组长等应看到组内全员订单。
+     */
+    private function isYejiDrawerDeptPerformanceScope(): bool
+    {
+        if ((int) ($this->params['yeji_order_drawer'] ?? 0) !== 1) {
+            return false;
+        }
+        if ((int) ($this->params['yeji_drawer_match_table_performance'] ?? 0) === 1) {
+            return true;
+        }
+
+        return isset($this->params['assistant_dept_id']) && (int) $this->params['assistant_dept_id'] > 0;
+    }
+
+    /**
+     * 业绩看板侧栏：部门业绩或复诊下钻查看数据域内其他医助订单时，跳过「仅本人可见」。
+     */
+    private function shouldSkipCreatorOnlyForYejiDrawer(): bool
+    {
+        if ($this->isYejiDrawerDeptPerformanceScope()) {
+            return true;
+        }
+        if ((int) ($this->params['yeji_order_drawer'] ?? 0) !== 1) {
+            return false;
+        }
+        if ((int) ($this->params['yeji_er_center_revisit_only'] ?? 0) !== 1) {
+            return false;
+        }
+        $assistantId = (int) ($this->params['assistant_id'] ?? 0);
+        if ($assistantId <= 0 || $assistantId === (int) $this->adminId) {
+            return false;
+        }
+        if (!$this->dataScopeShouldApply()) {
+            return true;
+        }
+        $visibleIds = $this->getDataScopeVisibleAdminIds();
+        if ($visibleIds === null) {
+            return true;
+        }
+
+        return in_array($assistantId, $visibleIds, true);
+    }
+
    /**
     * 医助角色统计：仅「订单创建人=本人」计入
     */
@@ -341,7 +388,9 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
        $query = PrescriptionOrder::where($this->searchWhereWithoutCreateTimeRange())->whereNull('delete_time');
        $this->applyDoctorAssistantFilters($query);
        $this->applyPatientKeywordFilter($query);
-        if (PrescriptionOrderLogic::canViewOrderListStatsAllScope($this->adminInfo)) {
+        if ($this->shouldSkipCreatorOnlyForYejiDrawer()) {
+            $this->applyDataScopeForPrescriptionOrder($query);
+        } elseif (PrescriptionOrderLogic::canViewOrderListStatsAllScope($this->adminInfo)) {
            $this->applyDataScopeForPrescriptionOrder($query);
        } else {
            $assistantRid = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);