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;
@@ -16,12 +16,12 @@ use think\facade\Db;
*
* 角色语义:医生只看本人接诊患者,医助只看本人归属患者;经理、
* 诊室组长和管理员按系统 DataScope 查看团队患者;root 查看全部。
* 多角色取并集:兼有团队角色(DataScopeService::hasTeamRole)时按团队范围,不再收窄到本人。
*/
class MyPatientLogic
{
private const DOCTOR_ROLE_ID = 1;
private const ASSISTANT_ROLE_ID = 2;
private const TEAM_ROLE_IDS = [3, 7, 8];
private const EFFECTIVE_APPOINTMENT_STATUSES = [1, 3, 4];
/**
@@ -44,7 +44,7 @@ class MyPatientLogic
$statusList = implode(',', self::EFFECTIVE_APPOINTMENT_STATUSES);
// 管理角色按系统的数据范围查看“范围内医助归属或医生接诊”的患者。
if (array_intersect($roleIds, self::TEAM_ROLE_IDS) !== []) {
if (DataScopeService::hasTeamRole($adminId, $adminInfo)) {
$visibleAdminIds = DataScopeService::getVisibleAdminIds($adminId, $adminInfo);
if ($visibleAdminIds === null) {
return;
@@ -116,7 +116,7 @@ class MyPatientLogic
}
$roleIds = self::roleIds($adminId);
if (array_intersect($roleIds, self::TEAM_ROLE_IDS) !== []) {
if (DataScopeService::hasTeamRole($adminId, $adminInfo)) {
$scope = DataScopeService::getEffectiveScope($adminInfo);
$labels = [
DataScopeService::SCOPE_ALL => '全部数据',
@@ -71,8 +71,10 @@ class PerformanceDashboardScope
if (self::roleNamesMatch($roleNames, ['诊室组长', '组长'])) {
return self::KIND_GROUP_LEADER;
}
// 医助角色固定仅本人,不因部门负责人或 data_scope 放大到小组。
if (self::roleNamesMatch($roleNames, ['医助'])) {
// 纯医助账号固定仅本人,不因部门负责人或 data_scope 放大到小组;
// 多角色取并集:兼有主管等团队角色(data_scope 为部门范围)时按下方数据范围分类。
if (self::roleNamesMatch($roleNames, ['医助'])
&& !DataScopeService::hasTeamRole((int) ($adminInfo['admin_id'] ?? 0), $adminInfo)) {
return self::KIND_ASSISTANT;
}
@@ -1534,11 +1534,9 @@ class DiagnosisLogic extends BaseLogic
}
$diagnosisQuery = Diagnosis::where('id', $diagnosisId)
->where('patient_id', $patientId);
$roleIds = array_map(
'intval',
AdminRole::where('admin_id', $adminId)->column('role_id')
);
if (in_array(2, $roleIds, true)) {
// 纯医助只看本人归属诊单;兼有主管/经理等团队角色时交给下方数据范围按部门过滤
$selfRoles = DataScopeService::selfOnlyRoleIds($adminId, $adminInfo);
if (in_array(2, $selfRoles, true)) {
$diagnosisQuery->where('assistant_id', $adminId);
}
if (DataScopeService::isEnabled()) {
@@ -4359,8 +4357,9 @@ class DiagnosisLogic extends BaseLogic
}
$query = Diagnosis::where('id', $diagnosisId)->whereNull('delete_time');
$roleIds = array_map('intval', AdminRole::where('admin_id', $adminId)->column('role_id'));
if (in_array(2, $roleIds, true)) {
// 纯医助只看本人归属诊单;兼有团队角色时交给下方数据范围按部门过滤
$selfRoles = DataScopeService::selfOnlyRoleIds($adminId, $adminInfo);
if (in_array(2, $selfRoles, true)) {
$query->where('assistant_id', $adminId);
}
@@ -487,8 +487,13 @@ class PrescriptionOrderLogic
return false;
}
$assistantRid = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);
if ($assistantRid <= 0) {
return false;
}
// 多角色取并集:兼有主管等团队角色时不按“统计医助”收口
$selfRoles = DataScopeService::selfOnlyRoleIds((int) ($adminInfo['admin_id'] ?? 0), $adminInfo);
return $assistantRid > 0 && self::roleIntersect($adminInfo, [$assistantRid]);
return in_array($assistantRid, $selfRoles, true);
}
/**