功能修复: 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 统一格式化
253 lines
7.7 KiB
Rust
253 lines
7.7 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::DeleteWithVersion;
|
|
use crate::dto::follow_up_dto::*;
|
|
use crate::service::follow_up_service;
|
|
use crate::state::HealthState;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// 批量操作 Handler
|
|
// ---------------------------------------------------------------------------
|
|
|
|
pub async fn batch_create_tasks<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<BatchCreateTasksReq>,
|
|
) -> Result<Json<ApiResponse<BatchResultResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
if req.patient_ids.is_empty() {
|
|
return Err(AppError::Validation("patient_ids 不能为空".to_string()));
|
|
}
|
|
if req.patient_ids.len() > 100 {
|
|
return Err(AppError::Validation("单次批量最多 100 条".to_string()));
|
|
}
|
|
let result =
|
|
follow_up_service::batch_create_tasks(&state, ctx.tenant_id, Some(ctx.user_id), req)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn batch_assign_tasks<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<BatchAssignReq>,
|
|
) -> Result<Json<ApiResponse<BatchResultResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
if req.task_ids.is_empty() {
|
|
return Err(AppError::Validation("task_ids 不能为空".to_string()));
|
|
}
|
|
if req.task_ids.len() > 100 {
|
|
return Err(AppError::Validation("单次批量最多 100 条".to_string()));
|
|
}
|
|
let result =
|
|
follow_up_service::batch_assign_tasks(&state, ctx.tenant_id, Some(ctx.user_id), req)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn batch_complete_tasks<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<BatchCompleteReq>,
|
|
) -> Result<Json<ApiResponse<BatchResultResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
if req.task_ids.is_empty() {
|
|
return Err(AppError::Validation("task_ids 不能为空".to_string()));
|
|
}
|
|
if req.task_ids.len() > 100 {
|
|
return Err(AppError::Validation("单次批量最多 100 条".to_string()));
|
|
}
|
|
let result =
|
|
follow_up_service::batch_complete_tasks(&state, ctx.tenant_id, Some(ctx.user_id), req)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct FollowUpTaskListParams {
|
|
pub page: Option<u64>,
|
|
pub page_size: Option<u64>,
|
|
pub patient_id: Option<Uuid>,
|
|
pub assigned_to: Option<Uuid>,
|
|
pub status: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, IntoParams)]
|
|
pub struct FollowUpRecordListParams {
|
|
pub page: Option<u64>,
|
|
pub page_size: Option<u64>,
|
|
pub task_id: Option<Uuid>,
|
|
pub patient_id: Option<Uuid>,
|
|
}
|
|
|
|
#[derive(Debug, serde::Deserialize, utoipa::ToSchema)]
|
|
pub struct UpdateFollowUpTaskWithVersion {
|
|
#[serde(flatten)]
|
|
pub data: UpdateFollowUpTaskReq,
|
|
pub version: i32,
|
|
}
|
|
|
|
pub async fn list_tasks<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<FollowUpTaskListParams>,
|
|
) -> Result<Json<ApiResponse<PaginatedResponse<FollowUpTaskResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.list")?;
|
|
let page = params.page.unwrap_or(1);
|
|
let page_size = params.page_size.unwrap_or(20);
|
|
let result = follow_up_service::list_tasks(
|
|
&state,
|
|
ctx.tenant_id,
|
|
page,
|
|
page_size,
|
|
params.patient_id,
|
|
params.assigned_to,
|
|
params.status,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn get_task<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
) -> Result<Json<ApiResponse<FollowUpTaskResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.list")?;
|
|
let result = follow_up_service::get_task(&state, ctx.tenant_id, id).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn create_task<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Json(req): Json<CreateFollowUpTaskReq>,
|
|
) -> Result<Json<ApiResponse<FollowUpTaskResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
let mut req = req;
|
|
req.sanitize();
|
|
let result =
|
|
follow_up_service::create_task(&state, ctx.tenant_id, Some(ctx.user_id), req).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn update_task<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
Json(req): Json<UpdateFollowUpTaskWithVersion>,
|
|
) -> Result<Json<ApiResponse<FollowUpTaskResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
let mut data = req.data;
|
|
data.sanitize();
|
|
let result = follow_up_service::update_task(
|
|
&state,
|
|
ctx.tenant_id,
|
|
id,
|
|
Some(ctx.user_id),
|
|
data,
|
|
req.version,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn delete_task<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(id): Path<Uuid>,
|
|
Json(req): Json<DeleteWithVersion>,
|
|
) -> Result<Json<ApiResponse<()>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
follow_up_service::delete_task(&state, ctx.tenant_id, id, Some(ctx.user_id), req.version)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(())))
|
|
}
|
|
|
|
pub async fn create_record<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Path(task_id): Path<Uuid>,
|
|
Json(req): Json<CreateFollowUpRecordReq>,
|
|
) -> Result<Json<ApiResponse<FollowUpRecordResp>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.manage")?;
|
|
if req.task_id != task_id {
|
|
return Err(AppError::Validation(
|
|
"路径中的 task_id 与请求体不一致".to_string(),
|
|
));
|
|
}
|
|
let mut req = req;
|
|
req.sanitize();
|
|
let result =
|
|
follow_up_service::create_record(&state, ctx.tenant_id, Some(ctx.user_id), req).await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|
|
|
|
pub async fn list_records<S>(
|
|
State(state): State<HealthState>,
|
|
Extension(ctx): Extension<TenantContext>,
|
|
Query(params): Query<FollowUpRecordListParams>,
|
|
) -> Result<Json<ApiResponse<PaginatedResponse<FollowUpRecordResp>>>, AppError>
|
|
where
|
|
HealthState: FromRef<S>,
|
|
S: Clone + Send + Sync + 'static,
|
|
{
|
|
require_permission(&ctx, "health.follow-up.list")?;
|
|
let page = params.page.unwrap_or(1);
|
|
let page_size = params.page_size.unwrap_or(20);
|
|
let result = follow_up_service::list_records(
|
|
&state,
|
|
ctx.tenant_id,
|
|
page,
|
|
page_size,
|
|
params.task_id,
|
|
params.patient_id,
|
|
)
|
|
.await?;
|
|
Ok(Json(ApiResponse::ok(result)))
|
|
}
|