功能修复: 1. 患者创建空名称验证:后端添加 name.trim().is_empty() 检查 2. 仪表盘统计容错:单个查询失败返回零值而非 500 3. FHIR 路由修复:从 /fhir 移到 /api/v1/fhir 保持一致 4. 冻结模块后端中间件:新增 frozen_module_middleware 拦截冻结路径 5. 积分端点权限码:health.health-data.list → health.points.list 6. 角色权限迁移:护士补充 devices.list,运营补充 points.list/manage 7. 测试结果文档:R01-R05 角色测试 + T00/T10 结果归档 Clippy 全 workspace 清零(14→0 errors): - erp-core: 修复 empty doc line、collapsible if、redundant closure 等 9 处 - erp-health: 修复 too_many_arguments、unused var、unnecessary parens 等 58 处 - erp-ai: 修复 dead_code、unused import 等 11 处 - erp-plugin: 修复 too_many_arguments、wildcard pattern 等 11 处 - erp-server-migration: 修复 enum_variant_names 5 处 - erp-auth/config/workflow/message: 各 1-3 处 工程改进: - lint-staged 配置迁移到 .lintstagedrc.js(函数式避免文件列表传给 clippy) - cargo fmt 统一格式化
240 lines
7.5 KiB
Rust
240 lines
7.5 KiB
Rust
use axum::Extension;
|
|
use axum::extract::{FromRef, Json, Path, Query, State};
|
|
use erp_core::error::AppError;
|
|
use erp_core::rbac::require_permission;
|
|
use erp_core::types::{ApiResponse, TenantContext};
|
|
use uuid::Uuid;
|
|
|
|
use crate::dto::shift_dto::*;
|
|
use crate::service::shift_service;
|
|
use crate::state::HealthState;
|
|
|
|
#[derive(Debug, serde::Deserialize)]
|
|
pub struct PaginationParams {
|
|
pub page: Option<u64>,
|
|
pub page_size: Option<u64>,
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Shift
|
|
// ---------------------------------------------------------------------------
|
|
|
|
pub async fn list_shifts<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<ListShiftsParams>,
|
|
) -> Result<Json<ApiResponse<erp_core::types::PaginatedResponse<ShiftResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.list")?;
|
|
let result = shift_service::list_shifts(&state, ctx.tenant_id, ¶ms).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn get_shift<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
) -> Result<Json<ApiResponse<ShiftResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.list")?;
|
|
let result = shift_service::get_shift(&state, ctx.tenant_id, shift_id).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_shift<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(mut body): Json<CreateShiftReq>,
|
|
) -> Result<Json<ApiResponse<ShiftResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
body.sanitize();
|
|
let result =
|
|
shift_service::create_shift(&state, ctx.tenant_id, Some(ctx.user_id), body).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn update_shift<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
Json(body): Json<UpdateShiftWithVersion>,
|
|
) -> Result<Json<ApiResponse<ShiftResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
let result =
|
|
shift_service::update_shift(&state, ctx.tenant_id, shift_id, Some(ctx.user_id), body)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn delete_shift<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
Query(params): Query<crate::dto::DeleteWithVersion>,
|
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
shift_service::delete_shift(
|
|
&state,
|
|
ctx.tenant_id,
|
|
shift_id,
|
|
Some(ctx.user_id),
|
|
params.version,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(())))
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// PatientAssignment
|
|
// ---------------------------------------------------------------------------
|
|
|
|
pub async fn list_assignments<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
Query(params): Query<PaginationParams>,
|
|
) -> Result<Json<ApiResponse<erp_core::types::PaginatedResponse<PatientAssignmentResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.list")?;
|
|
let page = params.page.unwrap_or(1);
|
|
let page_size = params.page_size.unwrap_or(20);
|
|
let result =
|
|
shift_service::list_assignments(&state, ctx.tenant_id, shift_id, page, page_size).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_assignment<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
Json(mut body): Json<CreatePatientAssignmentReq>,
|
|
) -> Result<Json<ApiResponse<PatientAssignmentResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
body.sanitize();
|
|
let result =
|
|
shift_service::create_assignment(&state, ctx.tenant_id, shift_id, Some(ctx.user_id), body)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn batch_assign<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(shift_id): Path<Uuid>,
|
|
Json(body): Json<BatchAssignReq>,
|
|
) -> Result<Json<ApiResponse<Vec<PatientAssignmentResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
let result =
|
|
shift_service::batch_assign(&state, ctx.tenant_id, shift_id, Some(ctx.user_id), body)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn update_assignment<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path((shift_id, assignment_id)): Path<(Uuid, Uuid)>,
|
|
Json(body): Json<UpdatePatientAssignmentWithVersion>,
|
|
) -> Result<Json<ApiResponse<PatientAssignmentResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
let result = shift_service::update_assignment(
|
|
&state,
|
|
ctx.tenant_id,
|
|
shift_id,
|
|
assignment_id,
|
|
Some(ctx.user_id),
|
|
body,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn delete_assignment<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path((shift_id, assignment_id)): Path<(Uuid, Uuid)>,
|
|
Query(params): Query<crate::dto::DeleteWithVersion>,
|
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
shift_service::delete_assignment(
|
|
&state,
|
|
ctx.tenant_id,
|
|
shift_id,
|
|
assignment_id,
|
|
Some(ctx.user_id),
|
|
params.version,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(())))
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// HandoffLog
|
|
// ---------------------------------------------------------------------------
|
|
|
|
pub async fn list_handoffs<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<ListHandoffParams>,
|
|
) -> Result<Json<ApiResponse<erp_core::types::PaginatedResponse<HandoffLogResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.list")?;
|
|
let result = shift_service::list_handoffs(&state, ctx.tenant_id, ¶ms).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_handoff<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(body): Json<CreateHandoffReq>,
|
|
) -> Result<Json<ApiResponse<HandoffLogResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.shifts.manage")?;
|
|
let result =
|
|
shift_service::create_handoff(&state, ctx.tenant_id, Some(ctx.user_id), body).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|