更新

server/app/adminapi/logic/firstvisit/FirstVisitDoctorDashboardLogic.php

@@ -109,7 +109,7 @@ class FirstVisitDoctorDashboardLogic
                 'selected_doctor_name' => $selectedDoctorName,
                 'doctor_count' => count($rows),
                 'appointment_rule' => '总挂号包含已预约、已取消、已完成和已过号；面诊取状态为已完成的挂号',
-                'performance_rule' => '诊单按订单创建时间统计，排除履约已取消、拒收和退款，金额归属处方开方医生',
+                'performance_rule' => '诊单按订单创建时间统计，排除已取消、拒收、全额退款及部分退款，金额归属处方开方医生',
             ],
             'filters' => [
                 'departments' => $doctorSelf ? [] : DeptLogic::getAllDataScoped($adminId, $adminInfo),
@@ -396,7 +396,7 @@ class FirstVisitDoctorDashboardLogic
                     strtotime($startDate . ' 00:00:00'),
                     strtotime($endDate . ' 23:59:59'),
                 ]);
-            YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, 'o');
+            YejiStatsLogic::applyPrescriptionOrderEffectiveAmountQuery($query, 'o');
             if ($assistantIds !== null) {
                 $query->whereIn('o.creator_id', $assistantIds);
             }