This commit is contained in:
gr
2026-11-11 14:22:02 +08:00
parent 245618dcdc
commit a62311a8da
64878 changed files with 3747172 additions and 66 deletions
@@ -932,9 +932,10 @@ class AppointmentLogic extends BaseLogic
$docId = (int) $appointment->doctor_id;
$asstId = $diag ? (int) $diag->assistant_id : 0;
$isRoot = !empty($adminInfo['root']) && (int) $adminInfo['root'] === 1;
// 仅纯一线角色(医生/医助)按本人关系收窄;兼有团队角色时为空,交给数据范围
$roleIds = $isRoot
? []
: array_map('intval', AdminRole::where('admin_id', $adminId)->column('role_id'));
: DataScopeService::selfOnlyRoleIds($adminId, $adminInfo);
$visibleIds = null;
if (!$isRoot && DataScopeService::isEnabled()) {
$visibleIds = DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
@@ -951,7 +952,7 @@ class AppointmentLogic extends BaseLogic
}
/**
* @param array<int, int> $roleIds
* @param array<int, int> $roleIds 生效的“仅本人”一线角色(DataScopeService::selfOnlyRoleIds)
* @param array<int, int>|null $visibleIds null 表示未启用数据范围或全量可见
*/
private static function appointmentRowManageableForScope(
@@ -965,11 +966,15 @@ class AppointmentLogic extends BaseLogic
if ($isRoot) {
return true;
}
if (in_array(1, $roleIds, true) && $doctorId !== $adminId) {
return false;
}
if (in_array(2, $roleIds, true) && $assistantId !== $adminId) {
return false;
// 医生看本人接诊、医助看本人归属,两者兼有取并集;任一关系命中即可
$isDoctor = in_array(1, $roleIds, true);
$isAssistant = in_array(2, $roleIds, true);
if ($isDoctor || $isAssistant) {
$ownsRow = ($isDoctor && $doctorId === $adminId)
|| ($isAssistant && $assistantId === $adminId);
if (!$ownsRow) {
return false;
}
}
if ($visibleIds === []) {
return false;