功能修复: 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 统一格式化
222 lines
6.3 KiB
Rust
222 lines
6.3 KiB
Rust
use axum::Extension;
|
|
use axum::extract::{FromRef, Json, Path, Query, State};
|
|
use serde::Deserialize;
|
|
use utoipa::IntoParams;
|
|
use uuid::Uuid;
|
|
|
|
use erp_core::error::AppError;
|
|
use erp_core::rbac::require_permission;
|
|
use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext};
|
|
|
|
use crate::dto::appointment_dto::*;
|
|
use crate::service::appointment_service;
|
|
use crate::state::HealthState;
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct AppointmentListParams {
|
|
pub page: Option<u64>,
|
|
pub page_size: Option<u64>,
|
|
pub status: Option<String>,
|
|
pub patient_id: Option<Uuid>,
|
|
pub doctor_id: Option<Uuid>,
|
|
pub date: Option<chrono::NaiveDate>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct ScheduleListParams {
|
|
pub page: Option<u64>,
|
|
pub page_size: Option<u64>,
|
|
pub doctor_id: Option<Uuid>,
|
|
pub date: Option<chrono::NaiveDate>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct CalendarViewParams {
|
|
pub start_date: chrono::NaiveDate,
|
|
pub end_date: chrono::NaiveDate,
|
|
pub doctor_id: Option<Uuid>,
|
|
}
|
|
|
|
#[derive(Debug, serde::Deserialize, utoipa::ToSchema)]
|
|
pub struct UpdateScheduleWithVersion {
|
|
#[serde(flatten)]
|
|
pub data: UpdateScheduleReq,
|
|
pub version: i32,
|
|
}
|
|
|
|
#[derive(Debug, serde::Deserialize, utoipa::ToSchema)]
|
|
pub struct UpdateAppointmentStatusWithVersion {
|
|
pub status: String,
|
|
pub cancel_reason: Option<String>,
|
|
pub version: i32,
|
|
}
|
|
|
|
pub async fn list_appointments<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<AppointmentListParams>,
|
|
) -> Result<Json<ApiResponse<PaginatedResponse<AppointmentResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.list")?;
|
|
let page = params.page.unwrap_or(1);
|
|
let page_size = params.page_size.unwrap_or(20);
|
|
let result = appointment_service::list_appointments(
|
|
&state,
|
|
ctx.tenant_id,
|
|
page,
|
|
page_size,
|
|
params.status,
|
|
params.patient_id,
|
|
params.doctor_id,
|
|
params.date,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_appointment<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<CreateAppointmentReq>,
|
|
) -> Result<Json<ApiResponse<AppointmentResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.manage")?;
|
|
let mut req = req;
|
|
req.sanitize();
|
|
let result =
|
|
appointment_service::create_appointment(&state, ctx.tenant_id, Some(ctx.user_id), req)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn get_appointment<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
) -> Result<Json<ApiResponse<AppointmentResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.list")?;
|
|
let result = appointment_service::get_appointment(&state, ctx.tenant_id, id).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn update_appointment_status<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
Json(req): Json<UpdateAppointmentStatusWithVersion>,
|
|
) -> Result<Json<ApiResponse<AppointmentResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.manage")?;
|
|
let mut update_req = UpdateAppointmentStatusReq {
|
|
status: req.status,
|
|
cancel_reason: req.cancel_reason,
|
|
};
|
|
update_req.sanitize();
|
|
let result = appointment_service::update_appointment_status(
|
|
&state,
|
|
ctx.tenant_id,
|
|
id,
|
|
Some(ctx.user_id),
|
|
update_req,
|
|
req.version,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn list_schedules<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<ScheduleListParams>,
|
|
) -> Result<Json<ApiResponse<PaginatedResponse<ScheduleResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.list")?;
|
|
let page = params.page.unwrap_or(1);
|
|
let page_size = params.page_size.unwrap_or(20);
|
|
let result = appointment_service::list_schedules(
|
|
&state,
|
|
ctx.tenant_id,
|
|
page,
|
|
page_size,
|
|
params.doctor_id,
|
|
params.date,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_schedule<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<CreateScheduleReq>,
|
|
) -> Result<Json<ApiResponse<ScheduleResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.manage")?;
|
|
let result =
|
|
appointment_service::create_schedule(&state, ctx.tenant_id, Some(ctx.user_id), req).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn update_schedule<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
Json(req): Json<UpdateScheduleWithVersion>,
|
|
) -> Result<Json<ApiResponse<ScheduleResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.manage")?;
|
|
let result = appointment_service::update_schedule(
|
|
&state,
|
|
ctx.tenant_id,
|
|
id,
|
|
Some(ctx.user_id),
|
|
req.data,
|
|
req.version,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn calendar_view<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<CalendarViewParams>,
|
|
) -> Result<Json<ApiResponse<Vec<CalendarDayResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.appointment.list")?;
|
|
let result = appointment_service::calendar_view(
|
|
&state,
|
|
ctx.tenant_id,
|
|
params.start_date,
|
|
params.end_date,
|
|
params.doctor_id,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|