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

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

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace app\adminapi\logic\stats;
 
 use app\adminapi\logic\dept\DeptLogic;
+use app\adminapi\logic\stats\YejiStatsLogic;
 use app\adminapi\logic\tcm\DiagnosisLogic;
 use app\common\model\finance\AccountCost;
 use app\common\service\DataScope\DataScopeService;
@@ -1041,8 +1042,9 @@ class ConversionLogic
             ->alias('po')
             ->leftJoin('tcm_diagnosis dg', 'dg.id = po.diagnosis_id')
             ->whereNull('po.delete_time')
-            ->where('po.create_time', 'between', [$startTimestamp, $endTimestamp])
-            ->where('po.fulfillment_status', '<>', 4)
+            ->where('po.create_time', 'between', [$startTimestamp, $endTimestamp]);
+        YejiStatsLogic::applyPrescriptionOrderNotCancelledForPerformanceQuery($businessQuery, 'po');
+        $businessQuery
             ->fieldRaw("{$businessSourceExpr} AS source_admin_id, SUM(po.amount) AS total_amount")
             ->group($businessSourceExpr);