ZYT/zyt
2
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
Your Name
2026-05-07 11:50:48 +08:00
parent 9d405ebed9
commit c4dd196e72
6 changed files with 842 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/app/adminapi/controller/stats/YejiStatsController.php
+1 -1
View File
@@ -105,7 +105,7 @@ class YejiStatsController extends BaseAdminController
return $this->data(YejiStatsLogic::assistantLeaderboards($params, $this->adminId, $this->adminInfo));
}
/** 「未归属中心」行：按订单创建人拆解业绩（与「合计业绩」未归属部分同口径） */
/** 「未归属中心」行：按诊单医助拆解业绩（与表格补差、合计业绩诊单医助归属一致） */
public function unassignedBreakdown()
{
@set_time_limit(120);
server/app/adminapi/lists/tcm/PrescriptionOrderLists.php
+52 -5
View File
@@ -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];
}
/**
* 重点看板计数（基于“当前筛选（去除审核/履约状态）”后的全量命中）
*
server/app/adminapi/logic/doctor/AppointmentLogic.php
+2 -1
View File
@@ -243,7 +243,8 @@ class AppointmentLogic extends BaseLogic
'appointment_time' => $appointmentTime,
'appointment_type' => $params['appointment_type'] ?? 'video',
'remark' => $params['remark'] ?? '',
'channels' => $params['channel_source'] ?? '',
// 表字段为 channel_source（与字典 type_value=channels 的 value 一致）；勿再写入不存在的 channels 列
'channel_source' => trim((string) ($params['channel_source'] ?? '')),
'status' => 1,
'create_time' => time(),
'update_time' => time(),
server/app/adminapi/logic/stats/YejiStatsLogic.php
+256 -158
View File
@@ -5,8 +5,10 @@ declare(strict_types=1);
namespace app\adminapi\logic\stats;
use app\adminapi\logic\dept\DeptLogic;
use app\common\model\tcm\PrescriptionOrder;
use app\common\service\DataScope\DataScopeService;
use app\common\service\qywx\MediaChannelService;
use think\db\Query;
use think\facade\Db;
/**
@@ -19,7 +21,7 @@ use think\facade\Db;
* - 复诊统计 = 仅**名称含「二中心」的部门及其组织架构下级**：区间内业务单按患者 create_time 排序，第 1 笔不计，第 2 笔起分列「复诊2」「复诊3」…；口径同业绩单条件；按诊单医助在组织树内归属 rollup（含下级），与 dept 模块 ErCenter 复诊算法一致
* - 接诊诊单 = 已完成挂号 status=3，**与 admin 挂号列表条数同口径**（appointment_date、诊单未软删），不限医助角色、不要求 assistant_id 非 0；
* 部门归属：优先 COALESCE(挂号.assistant_id, 诊单.assistant_id) 映射到展示「中心」，否则回退接诊医生 doctor_id；仍无法归属则计入「未归属中心」行。
* - {渠道}成交单 = 选定渠道时与 {渠道}业绩同源：区间内 **非取消业务订单条数**（仅剔除 fulfillment_status=4；NULL 与其它状态计入，按 create_time 归日）；dict(channels) 与 tag/creator 两套口径均按订单计，非挂号条数。
* - {渠道}成交单 = 选定渠道时与 {渠道}业绩同源：区间内 **非取消业务订单条数**（仅剔除 fulfillment_status=4；NULL 与其它状态计入，按 create_time 归日）；dict(channels) 与 tag 口径均按订单计（tag 时按诊单医助收窄），非挂号条数。
* - 合计业绩 = 区间内 zyt_tcm_prescription_order.amount 求和（排除已取消(4) 与软删），按 dg.assistant_id 归属到「中心」展示部门；
* 无法归属到任一展示部门的金额单列「未归属中心」行；合计行 = 与列表同条件的全表 SUM（不限部门）
* · 时间窗与业绩条件与列表 stats_order_amount_performance 一致；列表若另有患者/单号等筛选或账号数据域收窄，金额可能仍不同
@@ -311,7 +313,7 @@ class YejiStatsLogic
);
$performance = $perfBoth['all'];
$channelPerformance = $perfBoth['scoped'];
// 成交单数（全量）：与合计业绩同 WHERE，按 creator_id 归属部门，合计用全表 COUNT
// 成交单数（全量）：与合计业绩同 WHERE，按诊单医助归属部门，合计用全表 COUNT
$dealOrderByDept = self::aggregateDealOrderCount($startTs, $endTs, $adminToPrimary, null, null);
$globalDealOrderCount = self::countGlobalDealOrders($startTs, $endTs);
@@ -485,7 +487,7 @@ class YejiStatsLogic
. ($dataScopeRestricted
? ' 当前账号受角色「数据范围」限制，仅统计可见成员及其归属展示中心；合计与表格一致，不含权限范围外数据。'
: '');
$baseNoteNoChannel = '业绩口径：除履约已取消(4)外全部计入（与订单列表 stats_order_amount_performance 一致）。无法归入「中心」展示部门的创建人业绩计入「未归属中心」行；合计=全表 SUM。**投放成本**按进线占比分摊至各部门。';
$baseNoteNoChannel = '业绩口径：除履约已取消(4)外全部计入（与订单列表 stats_order_amount_performance 一致）。无法归入「中心」展示部门的诊单医助业绩（及无诊单医助的订单）计入「未归属中心」行；合计=全表 SUM。**投放成本**按进线占比分摊至各部门。';
return [
'start_date' => $startDate,
@@ -1440,7 +1442,7 @@ class YejiStatsLogic
/**
* 接诊诊单聚合：返回两组按部门归属的接诊计数。
* - all: 区间内 status=3 挂号条数按部门归属（与列表计数一致），不含「仅 role_id=2」等额外限制。
* - scoped: 选定渠道时「{渠道}成交单」= **非取消业务订单条数**（与 {渠道}业绩同源）：有 dict(channels) 走诊单医助+EXISTS 口径；否则走 tag（diagnosis_id IN / creator_id IN）与 aggregatePerformance 完全一致。
* - scoped: 选定渠道时「{渠道}成交单」= **非取消业务订单条数**（与 {渠道}业绩同源）：有 dict(channels) 走诊单医助+EXISTS 口径；否则走 tag（diagnosis_id IN / **诊单医助** IN）与 aggregatePerformance 完全一致。
* 未选渠道时 scoped == all（不再额外查一次）。
*
* @param int[] $appointmentChannelValues dict_data value 整型列表（通常 1=自媒体1）
@@ -1483,7 +1485,7 @@ class YejiStatsLogic
);
}
} elseif ($tagDiagIds !== null || $tagAssistantIds !== null) {
$scopedByDept = self::aggregateDealOrderCountByTagScope(
$scopedByDept = self::aggregateDealOrderCount(
$startTs,
$endTs,
$adminToPrimary,
@@ -2327,13 +2329,26 @@ class YejiStatsLogic
/**
* 业绩/成交单统计：仅排除履约已取消 fulfillment_status = 4，其余（含 NULL 与任意其它状态）全部计入。
* 与处方订单列表 stats_order_amount_performance（总业绩 − 已取消业绩）一致；避免 SQL 中 `<> 4` 把 NULL 行误排除。
* 与看板「合计业绩」、处方列表业绩 extend 口径一致；勿用 `<> 4`，以免误排除 NULL。
*
* @param \think\db\Query $query
* @param \think\db\BaseQuery|\think\Model $query Db::name / Model::where 等查询实例
* @param string $tableAlias 主表别名（如 Db 侧 `alias('o')` 传 `o`）；无别名时传空字符串
*/
public static function applyPrescriptionOrderNotCancelledForPerformanceQuery($query, string $tableAlias = ''): void
{
if ($tableAlias !== '') {
$query->whereRaw("NOT ({$tableAlias}.fulfillment_status <=> ?)", [4]);
} else {
$query->whereRaw('NOT (fulfillment_status <=> ?)', [4]);
}
}
/**
* @param \think\db\BaseQuery|\think\Model $query
*/
private static function applyPrescriptionOrderNotCancelledForPerformance($query, string $tableAlias = 'o'): void
{
$query->whereRaw("NOT ({$tableAlias}.fulfillment_status <=> ?)", [4]);
self::applyPrescriptionOrderNotCancelledForPerformanceQuery($query, $tableAlias);
}
/**
@@ -2365,16 +2380,20 @@ class YejiStatsLogic
if ($tagAssistantIds !== null && $tagAssistantIds === []) {
return 0.0;
}
$diagTable = self::tableWithPrefix('tcm_diagnosis');
$query = Db::name('tcm_prescription_order')
->alias('o')
->join("{$diagTable} dg", 'dg.id = o.diagnosis_id AND dg.delete_time IS NULL', 'INNER')
->whereNull('o.delete_time')
->where('o.create_time', 'between', [$startTs, $endTs]);
->where('o.create_time', 'between', [$startTs, $endTs])
->where('o.diagnosis_id', '>', 0)
->where('dg.assistant_id', '>', 0);
self::applyPrescriptionOrderNotCancelledForPerformance($query);
if ($tagDiagIds !== null) {
$query->whereIn('o.diagnosis_id', $tagDiagIds);
}
if ($tagAssistantIds !== null) {
$query->whereIn('o.creator_id', array_keys($tagAssistantIds));
$query->whereIn('dg.assistant_id', array_keys($tagAssistantIds));
}
return round((float) $query->sum('o.amount'), 1);
@@ -2630,62 +2649,10 @@ class YejiStatsLogic
}
/**
* 标签口径下的「{渠道}成交单」计数：与 aggregatePerformance 同一套 WHERE（仅剔除已取消=4，含 NULL），
* 按 o.creator_id 分组 COUNT 后映射到 primary 部门，用于 tag 路径的「成交单」列展示。
*
* @return array<int, int>
*/
private static function aggregateDealOrderCountByTagScope(
int $startTs,
int $endTs,
array $adminToPrimary,
?array $tagDiagIds,
?array $tagAssistantIds
): array {
if ($tagDiagIds !== null && $tagDiagIds === []) {
return [];
}
if ($tagAssistantIds !== null && $tagAssistantIds === []) {
return [];
}
$query = Db::name('tcm_prescription_order')
->alias('o')
->whereNull('o.delete_time')
->where('o.create_time', 'between', [$startTs, $endTs]);
self::applyPrescriptionOrderNotCancelledForPerformance($query);
$query->field(['o.creator_id', 'COUNT(o.id) AS cnt'])
->group('o.creator_id');
if ($tagDiagIds !== null) {
$query->whereIn('o.diagnosis_id', $tagDiagIds);
}
if ($tagAssistantIds !== null) {
$query->whereIn('o.creator_id', array_keys($tagAssistantIds));
}
$rows = $query->select()->toArray();
if ($rows === []) {
return [];
}
$byDept = [];
foreach ($rows as $r) {
$cid = (int) ($r['creator_id'] ?? 0);
if ($cid <= 0) {
continue;
}
$primary = (int) ($adminToPrimary[$cid] ?? 0);
if ($primary <= 0) {
continue;
}
$byDept[$primary] = ($byDept[$primary] ?? 0) + (int) $r['cnt'];
}
return $byDept;
}
/**
* 单次业绩聚合查询。WHERE: delete_time IS NULL AND NOT(fulfillment <=> 4) AND create_time BETWEEN ...
* 可选 diagnosis_id IN tagDiagIds、creator_id IN tagAssistantIds。
* 单次业绩聚合：与 aggregatePerformanceAmountsByAdmin / aggregateDealOrderCount 同源 ——
* INNER 诊单，按 dg.assistant_id SUM(amount) 后映射到展示「中心」（与 PrescriptionOrderLists assistant_dept 一致）。
* WHERE: delete_time IS NULL、NOT(fulfillment <=> 4)、create_time 区间、diagnosis_id>0、dg.assistant_id>0；
* 可选 tag：diagnosis_id IN、dg.assistant_id IN。
*
* @return array<int, float>
*/
@@ -2697,20 +2664,23 @@ class YejiStatsLogic
if ($tagAssistantIds !== null && $tagAssistantIds === []) {
return [];
}
$diagTable = self::tableWithPrefix('tcm_diagnosis');
$query = Db::name('tcm_prescription_order')
->alias('o')
->join("{$diagTable} dg", 'dg.id = o.diagnosis_id AND dg.delete_time IS NULL', 'INNER')
->whereNull('o.delete_time')
->where('o.create_time', 'between', [$startTs, $endTs]);
->where('o.create_time', 'between', [$startTs, $endTs])
->where('o.diagnosis_id', '>', 0)
->where('dg.assistant_id', '>', 0);
self::applyPrescriptionOrderNotCancelledForPerformance($query);
$query->field(['o.creator_id', 'SUM(o.amount) AS amt'])
->group('o.creator_id');
$query->field(['dg.assistant_id', 'SUM(o.amount) AS amt'])
->group('dg.assistant_id');
if ($tagDiagIds !== null) {
$query->whereIn('o.diagnosis_id', $tagDiagIds);
}
if ($tagAssistantIds !== null) {
// 兜底口径：限定订单创建人为「跟进过该标签客户的医助」
$query->whereIn('o.creator_id', array_keys($tagAssistantIds));
$query->whereIn('dg.assistant_id', array_keys($tagAssistantIds));
}
$rows = $query->select()->toArray();
@@ -2719,11 +2689,11 @@ class YejiStatsLogic
}
$byDept = [];
foreach ($rows as $r) {
$cid = (int) ($r['creator_id'] ?? 0);
if ($cid <= 0) {
$aid = (int) ($r['assistant_id'] ?? 0);
if ($aid <= 0) {
continue;
}
$primary = (int) ($adminToPrimary[$cid] ?? 0);
$primary = (int) ($adminToPrimary[$aid] ?? 0);
if ($primary <= 0) {
continue;
}
@@ -3059,7 +3029,7 @@ class YejiStatsLogic
}
/**
* 「未归属中心」合计业绩按订单创建人拆解（与 aggregatePerformance /「合计业绩」列归属一致：仅 null,null 标签口径，不按渠道收窄）。
* 「未归属中心」业绩下钻：按诊单医助汇总无法映射到展示「中心」的金额（与 aggregatePerformance 部门行互补）。
*
* @return array{
* start_date: string,
@@ -3078,18 +3048,64 @@ class YejiStatsLogic
$startTs = (int) $c['startTs'];
$endTs = (int) $c['endTs'];
$adminToPrimary = $c['adminToPrimary'];
$visibleCreatorIds = null;
if (!empty($c['dataScopeRestricted'])) {
$visibleCreatorIds = $c['dataScopeVisibleAdminIds'] ?? [];
$byAdminAmt = self::aggregatePerformanceAmountsByAdmin($startTs, $endTs, null, null);
$byAdminCnt = self::aggregateDealOrderCountGroupedByAssistant($startTs, $endTs, null, null);
$visFlip = null;
if (!empty($c['dataScopeRestricted']) && isset($c['dataScopeVisibleAdminIds'])) {
$visFlip = array_flip(array_values(array_unique(array_filter(
array_map('intval', $c['dataScopeVisibleAdminIds']),
static function (int $v): bool {
return $v > 0;
}
))));
}
$rows = self::aggregateUnassignedByCreator(
$startTs,
$endTs,
$adminToPrimary,
null,
null,
$visibleCreatorIds
);
$rows = [];
foreach ($byAdminAmt as $aid => $amt) {
$aid = (int) $aid;
if ($aid <= 0) {
continue;
}
if ($visFlip !== null && !isset($visFlip[$aid])) {
continue;
}
if ((int) ($adminToPrimary[$aid] ?? 0) > 0) {
continue;
}
$rows[] = [
'admin_id' => $aid,
'name' => '',
'order_count' => (int) ($byAdminCnt[$aid] ?? 0),
'amount' => round((float) $amt, 2),
];
}
$globalAmt = self::sumGlobalPerformanceAmount($startTs, $endTs);
$globalCnt = self::countGlobalDealOrders($startTs, $endTs);
$innerAmt = array_sum($byAdminAmt);
$innerCnt = array_sum($byAdminCnt);
$orphanAmt = round(max(0.0, $globalAmt - $innerAmt), 2);
$orphanCnt = max(0, $globalCnt - $innerCnt);
if ($orphanAmt >= 0.01 || $orphanCnt > 0) {
$rows[] = [
'admin_id' => 0,
'name' => '',
'order_count' => $orphanCnt,
'amount' => $orphanAmt,
];
}
usort($rows, static function (array $a, array $b): int {
$c = $b['amount'] <=> $a['amount'];
if ($c !== 0) {
return $c;
}
return $b['order_count'] <=> $a['order_count'];
});
$ids = [];
foreach ($rows as $row) {
if ($row['admin_id'] > 0) {
@@ -3100,7 +3116,7 @@ class YejiStatsLogic
foreach ($rows as &$row) {
$aid = (int) $row['admin_id'];
if ($aid <= 0) {
$row['name'] = '（无创建人/0）';
$row['name'] = '（无诊单或医助未填）';
} else {
$row['name'] = (string) ($names[$aid] ?? ('#' . $aid));
}
@@ -3112,80 +3128,10 @@ class YejiStatsLogic
'end_date' => (string) $c['endDate'],
'channel_code' => (string) $c['channelCode'],
'rows' => $rows,
'note' => '与看板「合计业绩」列口径一致：按订单创建时间、剔除履约已取消(4)；创建人无法映射到任一展示「中心」部门的业绩计入未归属。账号数据权限下仅列出可见创建人相关订单。',
'note' => '与看板「未归属中心」补差一致：按订单 create_time、剔除履约已取消(4)；诊单医助无法映射到任一展示「中心」计入各行；其余（无诊单/医助为空）汇总在首行。账号数据权限下仅列出可见医助。',
];
}
/**
* @param int[]|null $visibleCreatorIds 数据权限：仅统计这些创建人（null=不额外限制）；须含 creator_id=0 时用 OR 条件已并入查询
*
* @return list<array{admin_id:int, name:string, order_count:int, amount:float}>
*/
private static function aggregateUnassignedByCreator(
int $startTs,
int $endTs,
array $adminToPrimary,
?array $tagDiagIds,
?array $tagAssistantIds,
?array $visibleCreatorIds
): array {
if ($tagDiagIds !== null && $tagDiagIds === []) {
return [];
}
if ($tagAssistantIds !== null && $tagAssistantIds === []) {
return [];
}
$query = Db::name('tcm_prescription_order')
->alias('o')
->whereNull('o.delete_time')
->where('o.create_time', 'between', [$startTs, $endTs]);
self::applyPrescriptionOrderNotCancelledForPerformance($query);
if ($tagDiagIds !== null) {
$query->whereIn('o.diagnosis_id', $tagDiagIds);
}
if ($tagAssistantIds !== null) {
$query->whereIn('o.creator_id', array_keys($tagAssistantIds));
}
if ($visibleCreatorIds !== null) {
$visibleCreatorIds = array_values(array_unique(array_filter(array_map('intval', $visibleCreatorIds), static fn (int $v): bool => $v > 0)));
if ($visibleCreatorIds === []) {
return [];
}
$ph = implode(',', array_fill(0, count($visibleCreatorIds), '?'));
$query->whereRaw("(o.creator_id = 0 OR o.creator_id IN ({$ph}))", $visibleCreatorIds);
}
$query->field(['o.creator_id', 'COUNT(*) AS order_count', 'SUM(o.amount) AS amount'])
->group('o.creator_id');
$dbRows = $query->select()->toArray();
if ($dbRows === []) {
return [];
}
$out = [];
foreach ($dbRows as $r) {
$cid = (int) ($r['creator_id'] ?? 0);
$primary = (int) ($adminToPrimary[$cid] ?? 0);
if ($primary > 0) {
continue;
}
$out[] = [
'admin_id' => $cid,
'name' => '',
'order_count' => (int) ($r['order_count'] ?? 0),
'amount' => round((float) ($r['amount'] ?? 0), 2),
];
}
usort($out, static function (array $a, array $b): int {
$c = $b['amount'] <=> $a['amount'];
if ($c !== 0) {
return $c;
}
return $b['order_count'] <=> $a['order_count'];
});
return $out;
}
/**
* @param int[] $ids
*
@@ -3219,4 +3165,156 @@ class YejiStatsLogic
return $prefix . $table;
}
/**
* 挂号字典 channels：与渠道配置名称匹配的 value 字符串列表（用于 ap.channel_source）
*
* @return string[]
*/
private static function appointmentChannelDictStringValuesForDrawer(?array $channelInfo): array
{
if ($channelInfo === null) {
return [];
}
$names = array_values(array_unique(array_filter([
trim((string) ($channelInfo['channel_name'] ?? '')),
trim((string) ($channelInfo['source_tag_name'] ?? '')),
])));
if ($names === []) {
return [];
}
$vals = Db::name('dict_data')->where('type_value', 'channels')->whereIn('name', $names)->column('value');
$out = [];
foreach ($vals as $v) {
$s = trim((string) $v);
if ($s !== '') {
$out[$s] = true;
}
}
return array_keys($out);
}
/** @var bool|null 进程内缓存：doctor_appointment 是否已加 channel_source 列 */
private static ?bool $doctorAppointmentHasChannelSourceColumn = null;
private static function doctorAppointmentHasChannelSourceColumn(): bool
{
if (self::$doctorAppointmentHasChannelSourceColumn !== null) {
return self::$doctorAppointmentHasChannelSourceColumn;
}
try {
$fields = Db::name('doctor_appointment')->getTableFields();
self::$doctorAppointmentHasChannelSourceColumn = is_array($fields)
&& in_array('channel_source', $fields, true);
} catch (\Throwable) {
self::$doctorAppointmentHasChannelSourceColumn = false;
}
return self::$doctorAppointmentHasChannelSourceColumn;
}
/**
* 业绩看板业务订单侧栏：按 channel_code 收窄（与 overview「{渠道}业绩」同患者判定；含 ap.channels 与 ap.channel_source）
*
* @param Query $query PrescriptionOrder 主表查询
* @param array<string, mixed> $params
*/
public static function applyYejiDrawerChannelFilterToPrescriptionOrderQuery(Query $query, array $params): void
{
if ((int) ($params['yeji_order_drawer'] ?? 0) !== 1) {
return;
}
$channelCode = trim((string) ($params['channel_code'] ?? ''));
if ($channelCode === '') {
return;
}
$startDate = '';
$endDate = '';
$st = trim((string) ($params['start_time'] ?? ''));
if (preg_match('/^(\d{4}-\d{2}-\d{2})/', $st, $m)) {
$startDate = $m[1];
}
$et = trim((string) ($params['end_time'] ?? ''));
if (preg_match('/^(\d{4}-\d{2}-\d{2})/', $et, $m)) {
$endDate = $m[1];
}
if ($startDate === '' || $endDate === '') {
return;
}
$ctx = self::resolveYejiContext([
'start_date' => $startDate,
'end_date' => $endDate,
'channel_code' => $channelCode,
'dept_ids' => null,
]);
if (!$ctx['channelFilterActive'] || $ctx['channelInfo'] === null) {
$query->whereRaw('0 = 1');
return;
}
$poTbl = (new PrescriptionOrder())->getTable();
$apTable = self::tableWithPrefix('doctor_appointment');
$adminRoleTable = self::tableWithPrefix('admin_role');
$norm = self::normalizeAppointmentChannelValues($ctx['appointmentChannelValues']);
$srcStrings = self::appointmentChannelDictStringValuesForDrawer($ctx['channelInfo']);
if ($norm !== [] || $srcStrings !== []) {
$subParts = [];
$subBind = [];
if ($norm !== []) {
$strVals = array_values(array_unique(array_map(static fn (int $v): string => (string) $v, $norm)));
$ph = implode(',', array_fill(0, count($strVals), '?'));
$subParts[] = "ap.channels IN ({$ph})";
$subBind = array_merge($subBind, $strVals);
}
if ($srcStrings !== [] && self::doctorAppointmentHasChannelSourceColumn()) {
$ph = implode(',', array_fill(0, count($srcStrings), '?'));
$subParts[] = "ap.channel_source IN ({$ph})";
$subBind = array_merge($subBind, $srcStrings);
}
if ($subParts !== []) {
$innerOr = implode(' OR ', $subParts);
$existsSql = "EXISTS (SELECT 1 FROM {$apTable} ap INNER JOIN {$adminRoleTable} ar "
. "ON ar.admin_id = ap.assistant_id AND ar.role_id = 2 WHERE ap.patient_id = `{$poTbl}`.`diagnosis_id` "
. "AND ap.status = 3 AND ({$innerOr}))";
$query->whereRaw($existsSql, $subBind);
return;
}
}
$tagDiagIds = $ctx['tagDiagIds'];
$tagAssistantIds = $ctx['tagAssistantIds'];
$tagFallback = $ctx['tagFallback'];
$tagFilterId = (string) ($ctx['tagFilterId'] ?? '');
if ($tagFilterId === '') {
$query->whereRaw('0 = 1');
return;
}
if ($tagDiagIds !== null && $tagDiagIds === []) {
$query->whereRaw('0 = 1');
return;
}
if ($tagAssistantIds !== null && $tagAssistantIds === [] && $tagFallback) {
$query->whereRaw('0 = 1');
return;
}
if ($tagDiagIds !== null) {
$query->whereIn('diagnosis_id', $tagDiagIds);
}
if ($tagFallback && $tagAssistantIds !== null && $tagAssistantIds !== []) {
$query->whereIn('creator_id', array_map('intval', array_keys($tagAssistantIds)));
}
if ($tagDiagIds === null && !($tagFallback && $tagAssistantIds !== null && $tagAssistantIds !== [])) {
$query->whereRaw('0 = 1');
}
}
}
server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php
+175 -17
View File
@@ -891,25 +891,31 @@ class PrescriptionOrderLogic
}
/**
* 挂号预约简要信息（业务订单详情展示）
* 渠道字典 value => 名称（与挂号 channel_source 存值一致）
*
* @return array<string, mixed>|null
* @return array<string, string>
*/
private static function buildAppointmentBrief(int $appointmentId): ?array
private static function channelSourceDictMap(): array
{
if ($appointmentId <= 0) {
return null;
}
$ap = Appointment::find($appointmentId);
if ($ap === null) {
return null;
}
$row = $ap->toArray();
$doctorName = '';
$did = (int) ($row['doctor_id'] ?? 0);
if ($did > 0) {
$doctorName = (string) (Admin::where('id', $did)->value('name') ?? '');
try {
/** @var array<string, string> $m */
$m = Db::name('dict_data')->where('type_value', 'channels')->column('name', 'value');
return $m;
} catch (\Throwable) {
return [];
}
}
/**
* @param array<string, mixed> $row doctor_appointment 行
* @param array<string, string> $channelDict
*
* @return array<string, mixed>
*/
private static function formatAppointmentBriefFromRow(array $row, string $doctorName, array $channelDict = []): array
{
$apptId = (int) ($row['id'] ?? 0);
$statusMap = [
1 => '已预约',
2 => '已取消',
@@ -929,9 +935,28 @@ class PrescriptionOrderLogic
}
$status = (int) ($row['status'] ?? 0);
$atype = (string) ($row['appointment_type'] ?? '');
$chSrc = trim((string) ($row['channel_source'] ?? ''));
if ($chSrc === '') {
$legacy = $row['channels'] ?? null;
if ($legacy !== null && $legacy !== '') {
$chSrc = is_numeric($legacy)
? (string) (int) $legacy
: trim((string) $legacy);
}
}
$chDesc = '';
if ($chSrc !== '') {
$chDesc = (string) ($channelDict[$chSrc] ?? '');
if ($chDesc === '' && is_numeric($chSrc)) {
$chDesc = (string) ($channelDict[(string) (int) $chSrc] ?? '');
}
if ($chDesc === '') {
$chDesc = $chSrc;
}
}
return [
'id' => $appointmentId,
'id' => $apptId,
'appointment_date' => (string) ($row['appointment_date'] ?? ''),
'period' => $period,
'appointment_time' => $timePart,
@@ -940,11 +965,144 @@ class PrescriptionOrderLogic
'status' => $status,
'status_desc' => $statusMap[$status] ?? '未知',
'doctor_name' => $doctorName,
'channel_source' => (string) ($row['channel_source'] ?? ''),
'channel_source' => $chSrc,
'channel_source_desc' => $chDesc,
'remark' => (string) ($row['remark'] ?? ''),
];
}
/**
* 挂号预约简要信息（业务订单详情展示）
*
* @return array<string, mixed>|null
*/
private static function buildAppointmentBrief(int $appointmentId): ?array
{
if ($appointmentId <= 0) {
return null;
}
$ap = Appointment::find($appointmentId);
if ($ap === null) {
return null;
}
$row = $ap->toArray();
$doctorName = '';
$did = (int) ($row['doctor_id'] ?? 0);
if ($did > 0) {
$doctorName = (string) (Admin::where('id', $did)->value('name') ?? '');
}
$channelDict = self::channelSourceDictMap();
return self::formatAppointmentBriefFromRow($row, $doctorName, $channelDict);
}
/**
* 业务订单列表行批量附加 linked_appointment（解析规则与详情一致：优先处方 appointment_id，否则诊单最近一条预约）
*
* @param array<int, array<string, mixed>> $lists
*/
public static function appendLinkedAppointmentsToListRows(array &$lists): void
{
if ($lists === []) {
return;
}
foreach ($lists as &$item) {
$item['linked_appointment'] = null;
}
unset($item);
$rxIds = array_values(array_unique(array_filter(array_map(
static fn ($x) => (int) ($x['prescription_id'] ?? 0),
$lists
))));
$rxApptByRx = [];
if ($rxIds !== []) {
$rxApptByRx = Prescription::whereIn('id', $rxIds)->whereNull('delete_time')->column('appointment_id', 'id');
}
$diagNeedFallback = [];
foreach ($lists as $item) {
$rxId = (int) ($item['prescription_id'] ?? 0);
$dgId = (int) ($item['diagnosis_id'] ?? 0);
$apFromRx = $rxId > 0 ? (int) ($rxApptByRx[$rxId] ?? 0) : 0;
if ($apFromRx <= 0 && $dgId > 0) {
$diagNeedFallback[$dgId] = true;
}
}
$diagIds = array_keys($diagNeedFallback);
$latestApptByDiag = [];
if ($diagIds !== []) {
try {
$agg = Db::name('doctor_appointment')
->whereIn('patient_id', $diagIds)
->fieldRaw('patient_id, MAX(id) as max_id')
->group('patient_id')
->select()
->toArray();
foreach ($agg as $r) {
$pid = (int) ($r['patient_id'] ?? 0);
$mid = (int) ($r['max_id'] ?? 0);
if ($pid > 0 && $mid > 0) {
$latestApptByDiag[$pid] = $mid;
}
}
} catch (\Throwable) {
$latestApptByDiag = [];
}
}
/** @var array<int, array{0: int, 1: int}> $resolvedPairs index => [ resolvedApptId, rxAppointmentId ] */
$resolvedPairs = [];
foreach ($lists as $idx => $item) {
$rxId = (int) ($item['prescription_id'] ?? 0);
$dgId = (int) ($item['diagnosis_id'] ?? 0);
$rxApptId = $rxId > 0 ? (int) ($rxApptByRx[$rxId] ?? 0) : 0;
$resolved = $rxApptId;
if ($resolved <= 0 && $dgId > 0) {
$resolved = (int) ($latestApptByDiag[$dgId] ?? 0);
}
if ($resolved > 0) {
$resolvedPairs[$idx] = [$resolved, $rxApptId];
}
}
if ($resolvedPairs === []) {
return;
}
$allApptIds = array_values(array_unique(array_map(static fn ($p) => $p[0], $resolvedPairs)));
$appts = Appointment::whereIn('id', $allApptIds)->select()->toArray();
$apptById = [];
foreach ($appts as $a) {
$aid = (int) ($a['id'] ?? 0);
if ($aid > 0) {
$apptById[$aid] = $a;
}
}
$doctorIds = array_values(array_unique(array_filter(array_map(
static fn ($a) => (int) ($a['doctor_id'] ?? 0),
$appts
))));
$doctorNames = [];
if ($doctorIds !== []) {
$doctorNames = Admin::whereIn('id', $doctorIds)->column('name', 'id');
}
$channelDict = self::channelSourceDictMap();
foreach ($resolvedPairs as $idx => $pair) {
$resolvedId = $pair[0];
$rxApptId = $pair[1];
$row = $apptById[$resolvedId] ?? null;
if ($row === null || !is_array($row)) {
continue;
}
$did = (int) ($row['doctor_id'] ?? 0);
$dname = $did > 0 ? (string) ($doctorNames[$did] ?? '') : '';
$brief = self::formatAppointmentBriefFromRow($row, $dname, $channelDict);
$brief['resolved_from'] = $rxApptId === $resolvedId ? 'prescription' : 'diagnosis';
$lists[$idx]['linked_appointment'] = $brief;
}
}
/**
* 物流轨迹（顺丰/京东等，优先快递100；未配置密钥时返回官网链接）
*