Merge branch 'master' of https://gitee.com/v_cms/zyt

server/app/adminapi/logic/stats/DoctorDailyStatsLogic.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace app\adminapi\logic\stats;
 
+use app\adminapi\logic\stats\YejiStatsLogic;
 use app\common\model\auth\Admin;
 use app\common\service\DataScope\DataScopeService;
 use think\facade\Db;
@@ -14,7 +15,7 @@ use think\facade\Db;
  * 医生范围：<b>admin_role.role_id = 1</b> 且管理员 <b>未软删</b>（delete_time 为空）；再按账号「数据范围」收窄。
  *
  * - 系统/手动开方：tcm_prescription.prescription_date ∈ [start,end]；渠道/标签与业绩渠道列同源 EXISTS / 诊单标签
- * - 成交：订单 create_time、排除履约(4)，按处方 creator_id；渠道/标签同 sumPerformance 口径
+ * - 成交：订单 create_time、排除履约 4/9/10，按处方 creator_id；渠道/标签同 sumPerformance 口径
  * - 挂号：appointment_date ∈ [start,end]；选渠道时挂号 channels 命中字典值；标签渠道时 patient_id ∈ 标签诊单集
  */
 class DoctorDailyStatsLogic
@@ -300,9 +301,9 @@ class DoctorDailyStatsLogic
             ->alias('o')
             ->join('tcm_prescription rx', 'rx.id = o.prescription_id AND rx.delete_time IS NULL', 'INNER')
             ->whereNull('o.delete_time')
-            ->whereBetween('o.create_time', [$startTs, $endTs])
-            ->whereRaw('NOT (o.fulfillment_status <=> 4)')
-            ->whereIn('rx.creator_id', $doctorIds)
+            ->whereBetween('o.create_time', [$startTs, $endTs]);
+        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($q, 'o');
+        $q->whereIn('rx.creator_id', $doctorIds)
             ->where('o.diagnosis_id', '>', 0);
 
         $normCh = self::normalizeAppointmentChannelInts($appointmentChannelValues);