From d6678d001e8fbfd7746986c21fe8e2cbf5dc85dc Mon Sep 17 00:00:00 2001 From: iven Date: Thu, 23 Apr 2026 21:31:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(health):=20Handler=20=E6=8E=A5=E7=BA=BF=20?= =?UTF-8?q?+=20Doctor=20Service=20+=20DTO=20=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重写全部 6 个 handler 文件，从占位错误改为调用 service 层 - 删除 handler 内联 DTO，统一使用 dto/ 模块类型 - 新增 dto/doctor_dto.rs 和 dto/follow_up_dto.rs - 新增 service/doctor_service.rs 实现医护档案 CRUD - 将 follow_up_service 内联 DTO 迁移到 dto/follow_up_dto.rs - 修复 consultation_session 列名 type→consultation_type（数据库+entity+迁移同步） - 全部 51 个 API 端点已验证可用 Co-Authored-By: Claude Opus 4.7 --- crates/erp-health/src/dto/doctor_dto.rs | 49 ++ crates/erp-health/src/dto/follow_up_dto.rs | 81 ++++ crates/erp-health/src/dto/mod.rs | 2 + .../src/entity/consultation_session.rs | 1 - .../src/handler/appointment_handler.rs | 230 ++++----- .../src/handler/consultation_handler.rs | 144 +++--- .../erp-health/src/handler/doctor_handler.rs | 121 ++--- .../src/handler/follow_up_handler.rs | 163 +++---- .../src/handler/health_data_handler.rs | 448 ++++++++---------- .../erp-health/src/handler/patient_handler.rs | 344 ++++++-------- .../erp-health/src/service/doctor_service.rs | 184 +++++++ .../src/service/follow_up_service.rs | 72 +-- crates/erp-health/src/service/mod.rs | 1 + .../m20260423_000042_create_health_tables.rs | 4 +- 14 files changed, 929 insertions(+), 915 deletions(-) create mode 100644 crates/erp-health/src/dto/doctor_dto.rs create mode 100644 crates/erp-health/src/dto/follow_up_dto.rs create mode 100644 crates/erp-health/src/service/doctor_service.rs diff --git a/crates/erp-health/src/dto/doctor_dto.rs b/crates/erp-health/src/dto/doctor_dto.rs new file mode 100644 index 0000000..d3fb788 --- /dev/null +++ b/crates/erp-health/src/dto/doctor_dto.rs @@ -0,0 +1,49 @@ +use serde::{Deserialize, Serialize}; +use utoipa::{IntoParams, ToSchema}; +use uuid::Uuid; + +#[derive(Debug, Clone, Deserialize, IntoParams)] +pub struct DoctorListQuery { + pub page: Option, + pub page_size: Option, + pub search: Option, + pub department: Option, + pub title: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct CreateDoctorReq { + pub user_id: Option, + pub name: String, + pub department: Option, + pub title: Option, + pub specialty: Option, + pub license_number: Option, + pub bio: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct UpdateDoctorReq { + pub name: Option, + pub department: Option, + pub title: Option, + pub specialty: Option, + pub license_number: Option, + pub bio: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct DoctorResp { + pub id: Uuid, + pub user_id: Option, + pub name: String, + pub department: Option, + pub title: Option, + pub specialty: Option, + pub license_number: Option, + pub bio: Option, + pub online_status: String, + pub created_at: chrono::DateTime, + pub updated_at: chrono::DateTime, + pub version: i32, +} diff --git a/crates/erp-health/src/dto/follow_up_dto.rs b/crates/erp-health/src/dto/follow_up_dto.rs new file mode 100644 index 0000000..f8eedbb --- /dev/null +++ b/crates/erp-health/src/dto/follow_up_dto.rs @@ -0,0 +1,81 @@ +use chrono::NaiveDate; +use serde::{Deserialize, Serialize}; +use utoipa::{IntoParams, ToSchema}; +use uuid::Uuid; + +#[derive(Debug, Clone, Deserialize, IntoParams)] +pub struct FollowUpTaskListQuery { + pub page: Option, + pub page_size: Option, + pub patient_id: Option, + pub assigned_to: Option, + pub status: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct CreateFollowUpTaskReq { + pub patient_id: Uuid, + pub assigned_to: Option, + pub follow_up_type: String, + pub planned_date: NaiveDate, + pub content_template: Option, + pub related_appointment_id: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct UpdateFollowUpTaskReq { + pub assigned_to: Option, + pub follow_up_type: Option, + pub planned_date: Option, + pub content_template: Option, + pub status: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct FollowUpTaskResp { + pub id: Uuid, + pub patient_id: Uuid, + pub assigned_to: Option, + pub follow_up_type: String, + pub planned_date: NaiveDate, + pub status: String, + pub content_template: Option, + pub related_appointment_id: Option, + pub created_at: chrono::DateTime, + pub updated_at: chrono::DateTime, + pub version: i32, +} + +#[derive(Debug, Clone, Deserialize, IntoParams)] +pub struct FollowUpRecordListQuery { + pub page: Option, + pub page_size: Option, + pub task_id: Option, + pub patient_id: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct CreateFollowUpRecordReq { + pub task_id: Uuid, + pub executed_by: Option, + pub executed_date: NaiveDate, + pub result: String, + pub patient_condition: Option, + pub medical_advice: Option, + pub next_follow_up_date: Option, +} + +#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)] +pub struct FollowUpRecordResp { + pub id: Uuid, + pub task_id: Uuid, + pub executed_by: Option, + pub executed_date: NaiveDate, + pub result: String, + pub patient_condition: Option, + pub medical_advice: Option, + pub next_follow_up_date: Option, + pub created_at: chrono::DateTime, + pub updated_at: chrono::DateTime, + pub version: i32, +} diff --git a/crates/erp-health/src/dto/mod.rs b/crates/erp-health/src/dto/mod.rs index 06cb056..cc5afa9 100644 --- a/crates/erp-health/src/dto/mod.rs +++ b/crates/erp-health/src/dto/mod.rs @@ -1,4 +1,6 @@ pub mod appointment_dto; pub mod consultation_dto; +pub mod doctor_dto; +pub mod follow_up_dto; pub mod health_data_dto; pub mod patient_dto; diff --git a/crates/erp-health/src/entity/consultation_session.rs b/crates/erp-health/src/entity/consultation_session.rs index ca1d0cd..0b4d0c6 100644 --- a/crates/erp-health/src/entity/consultation_session.rs +++ b/crates/erp-health/src/entity/consultation_session.rs @@ -10,7 +10,6 @@ pub struct Model { pub patient_id: Uuid, #[sea_orm(skip_serializing_if = "Option::is_none")] pub doctor_id: Option, - #[sea_orm(rename = "type")] pub consultation_type: String, pub status: String, #[sea_orm(skip_serializing_if = "Option::is_none")] diff --git a/crates/erp-health/src/handler/appointment_handler.rs b/crates/erp-health/src/handler/appointment_handler.rs index ebbe318..e3ffff7 100644 --- a/crates/erp-health/src/handler/appointment_handler.rs +++ b/crates/erp-health/src/handler/appointment_handler.rs @@ -1,226 +1,174 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::appointment_dto::*; +use crate::service::appointment_service; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO — 预约排班 -// --------------------------------------------------------------------------- - -/// 预约列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct AppointmentListParams { pub page: Option, pub page_size: Option, + pub status: Option, pub patient_id: Option, pub doctor_id: Option, - pub status: Option, - pub date: Option, + pub date: Option, } -/// 创建预约请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateAppointmentReq { - pub patient_id: Uuid, - pub doctor_id: Uuid, - pub schedule_id: Uuid, - pub appointment_date: String, - pub start_time: String, - pub end_time: String, - pub reason: Option, -} - -/// 更新预约状态请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateAppointmentStatusReq { - pub status: String, - pub cancel_reason: Option, -} - -/// 预约响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct AppointmentResp { - pub id: Uuid, - pub patient_id: Uuid, - pub doctor_id: Uuid, - pub schedule_id: Uuid, - pub appointment_date: String, - pub start_time: String, - pub end_time: String, - pub status: String, - pub reason: Option, - pub cancel_reason: Option, - pub created_at: String, - pub updated_at: String, -} - -/// 排班列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct ScheduleListParams { pub page: Option, pub page_size: Option, pub doctor_id: Option, - pub start_date: Option, - pub end_date: Option, + pub date: Option, } -/// 创建排班请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateScheduleReq { - pub doctor_id: Uuid, - pub schedule_date: String, - pub start_time: String, - pub end_time: String, - pub max_appointments: i32, - pub slot_duration_minutes: Option, +#[derive(Debug, Deserialize, IntoParams)] +pub struct CalendarViewParams { + pub start_date: chrono::NaiveDate, + pub end_date: chrono::NaiveDate, + pub doctor_id: Option, } -/// 更新排班请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateScheduleReq { - pub start_time: Option, - pub end_time: Option, - pub max_appointments: Option, - pub slot_duration_minutes: Option, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateScheduleWithVersion { + #[serde(flatten)] + pub data: UpdateScheduleReq, pub version: i32, } -/// 排班响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct ScheduleResp { - pub id: Uuid, - pub doctor_id: Uuid, - pub schedule_date: String, - pub start_time: String, - pub end_time: String, - pub max_appointments: i32, - pub current_appointments: i32, - pub slot_duration_minutes: Option, - pub created_at: String, - pub updated_at: String, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateAppointmentStatusWithVersion { + pub status: String, + pub cancel_reason: Option, + pub version: i32, } -/// 日历视图查询参数 -#[derive(Debug, Deserialize, IntoParams)] -pub struct CalendarViewParams { - pub doctor_id: Option, - pub start_date: String, - pub end_date: String, -} - -/// 日历视图单个日期条目 -#[derive(Debug, Serialize, ToSchema)] -pub struct CalendarDayEntry { - pub date: String, - pub schedules: Vec, - pub appointments: Vec, -} - -/// 日历视图响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct CalendarViewResp { - pub days: Vec, -} - -// --------------------------------------------------------------------------- -// Handler — 预约排班 (7 个端点) -// --------------------------------------------------------------------------- - -/// GET /api/v1/health/appointments — 预约列表 pub async fn list_appointments( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } -/// POST /api/v1/health/appointments — 创建预约 pub async fn create_appointment( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = appointment_service::create_appointment( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/appointments/{id}/status — 更新预约状态 pub async fn update_appointment_status( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let update_req = UpdateAppointmentStatusReq { + status: req.status, + cancel_reason: req.cancel_reason, + }; + 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))) } -/// GET /api/v1/health/schedules — 排班列表 pub async fn list_schedules( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } -/// POST /api/v1/health/schedules — 创建排班 pub async fn create_schedule( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = appointment_service::create_schedule( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/schedules/{id} — 更新排班 pub async fn update_schedule( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } -/// GET /api/v1/health/calendar — 日历视图 pub async fn calendar_view( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, -) -> Result>, AppError> + State(state): State, + Extension(ctx): Extension, + Query(params): Query, +) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } diff --git a/crates/erp-health/src/handler/consultation_handler.rs b/crates/erp-health/src/handler/consultation_handler.rs index 8d52b6c..e9d7f6a 100644 --- a/crates/erp-health/src/handler/consultation_handler.rs +++ b/crates/erp-health/src/handler/consultation_handler.rs @@ -1,142 +1,142 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::consultation_dto::*; +use crate::service::consultation_service; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO — 咨询管理 -// --------------------------------------------------------------------------- - -/// 会话列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct SessionListParams { pub page: Option, pub page_size: Option, + pub status: Option, pub patient_id: Option, pub doctor_id: Option, - pub status: Option, } -/// 会话响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct ConsultationSessionResp { - pub id: Uuid, - pub patient_id: Uuid, - pub doctor_id: Uuid, - pub subject: String, - pub status: String, - pub created_at: String, - pub updated_at: String, -} - -/// 消息列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct MessageListParams { pub page: Option, pub page_size: Option, } -/// 创建消息请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateConsultationMessageReq { - pub content: String, - pub message_type: Option, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct CloseSessionReq { + pub version: i32, } -/// 消息响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct ConsultationMessageResp { - pub id: Uuid, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct CreateConsultationMessageReq { pub session_id: Uuid, pub sender_id: Uuid, - pub sender_type: String, + pub sender_role: String, + pub content_type: Option, pub content: String, - pub message_type: String, - pub created_at: String, } -/// 导出会话请求 #[derive(Debug, Deserialize, IntoParams)] pub struct ExportSessionsParams { + pub status: Option, pub patient_id: Option, pub doctor_id: Option, - pub start_date: Option, - pub end_date: Option, } -// --------------------------------------------------------------------------- -// Handler — 咨询管理 (5 个端点) -// --------------------------------------------------------------------------- - -/// GET /api/v1/health/consultations/sessions — 会话列表 pub async fn list_sessions( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, -) -> Result>>, AppError> + State(state): State, + Extension(ctx): Extension, + Query(params): Query, +) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = consultation_service::list_sessions( + &state, ctx.tenant_id, page, page_size, params.status, params.patient_id, + params.doctor_id, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/consultations/sessions/{id}/messages — 消息列表 pub async fn list_messages( - State(_state): State, - Extension(_ctx): Extension, - Path(_session_id): Path, - Query(_params): Query, -) -> Result>>, AppError> + State(state): State, + Extension(ctx): Extension, + Path(session_id): Path, + Query(params): Query, +) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = consultation_service::list_messages( + &state, ctx.tenant_id, session_id, page, page_size, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/consultations/sessions/{id}/close — 关闭会话 pub async fn close_session( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, -) -> Result>, AppError> + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, +) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = consultation_service::close_session( + &state, ctx.tenant_id, id, Some(ctx.user_id), req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/consultations/sessions/{id}/messages — 创建消息 pub async fn create_message( - State(_state): State, - Extension(_ctx): Extension, - Path(_session_id): Path, - Json(_req): Json, -) -> Result>, AppError> + State(state): State, + Extension(ctx): Extension, + Json(req): Json, +) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let msg_req = CreateMessageReq { + session_id: req.session_id, + sender_id: req.sender_id, + sender_role: req.sender_role, + content_type: req.content_type, + content: req.content, + }; + let result = consultation_service::create_message( + &state, ctx.tenant_id, Some(ctx.user_id), msg_req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/consultations/export — 导出会话 pub async fn export_sessions( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, -) -> Result>>, AppError> + State(state): State, + Extension(ctx): Extension, + Query(params): Query, +) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = consultation_service::export_sessions( + &state, ctx.tenant_id, params.status, params.patient_id, params.doctor_id, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } diff --git a/crates/erp-health/src/handler/doctor_handler.rs b/crates/erp-health/src/handler/doctor_handler.rs index b5a43dd..7e49e0f 100644 --- a/crates/erp-health/src/handler/doctor_handler.rs +++ b/crates/erp-health/src/handler/doctor_handler.rs @@ -1,136 +1,105 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::doctor_dto::*; +use crate::service::doctor_service; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO — 医护管理 -// --------------------------------------------------------------------------- - -/// 医护列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct DoctorListParams { pub page: Option, pub page_size: Option, - /// 按姓名模糊搜索 pub search: Option, - /// 按科室筛选 pub department: Option, - /// 按职称筛选 pub title: Option, } -/// 创建医护档案请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateDoctorReq { - pub user_id: Uuid, - pub name: String, - pub department: Option, - pub title: Option, - pub specialty: Option, - pub license_number: Option, - pub bio: Option, -} - -/// 更新医护档案请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateDoctorReq { - pub name: Option, - pub department: Option, - pub title: Option, - pub specialty: Option, - pub license_number: Option, - pub bio: Option, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateDoctorWithVersion { + #[serde(flatten)] + pub data: UpdateDoctorReq, pub version: i32, } -/// 医护档案响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct DoctorResp { - pub id: Uuid, - pub user_id: Uuid, - pub name: String, - pub department: Option, - pub title: Option, - pub specialty: Option, - pub license_number: Option, - pub bio: Option, - pub created_at: String, - pub updated_at: String, -} - -// --------------------------------------------------------------------------- -// Handler — 医护管理 (5 个端点) -// --------------------------------------------------------------------------- - -/// GET /api/v1/health/doctors — 医护档案列表 pub async fn list_doctors( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = doctor_service::list_doctors( + &state, ctx.tenant_id, page, page_size, params.search, params.department, params.title, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/doctors — 创建医护档案 pub async fn create_doctor( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = doctor_service::create_doctor( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/doctors/{id} — 获取医护档案详情 pub async fn get_doctor( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = doctor_service::get_doctor(&state, ctx.tenant_id, id).await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/doctors/{id} — 更新医护档案 pub async fn update_doctor( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = doctor_service::update_doctor( + &state, ctx.tenant_id, id, Some(ctx.user_id), req.data, req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/doctors/{id} — 删除医护档案 pub async fn delete_doctor( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + doctor_service::delete_doctor(&state, ctx.tenant_id, id, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } diff --git a/crates/erp-health/src/handler/follow_up_handler.rs b/crates/erp-health/src/handler/follow_up_handler.rs index d5de9c3..c212080 100644 --- a/crates/erp-health/src/handler/follow_up_handler.rs +++ b/crates/erp-health/src/handler/follow_up_handler.rs @@ -1,19 +1,16 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::follow_up_dto::*; +use crate::service::follow_up_service; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO — 随访管理 -// --------------------------------------------------------------------------- - -/// 随访任务列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct FollowUpTaskListParams { pub page: Option, @@ -23,55 +20,6 @@ pub struct FollowUpTaskListParams { pub status: Option, } -/// 创建随访任务请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateFollowUpTaskReq { - pub patient_id: Uuid, - pub task_type: String, - pub title: String, - pub description: Option, - pub due_date: String, - pub assigned_to: Option, -} - -/// 更新随访任务请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateFollowUpTaskReq { - pub task_type: Option, - pub title: Option, - pub description: Option, - pub due_date: Option, - pub assigned_to: Option, - pub status: Option, - pub version: i32, -} - -/// 随访任务响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct FollowUpTaskResp { - pub id: Uuid, - pub patient_id: Uuid, - pub task_type: String, - pub title: String, - pub description: Option, - pub due_date: String, - pub assigned_to: Option, - pub status: String, - pub created_at: String, - pub updated_at: String, -} - -/// 创建随访记录请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateFollowUpRecordReq { - pub task_id: Uuid, - pub contact_method: String, - pub content: String, - pub outcome: Option, - pub next_follow_up_date: Option, -} - -/// 随访记录列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct FollowUpRecordListParams { pub page: Option, @@ -80,99 +28,108 @@ pub struct FollowUpRecordListParams { pub patient_id: Option, } -/// 随访记录响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct FollowUpRecordResp { - pub id: Uuid, - pub task_id: Uuid, - pub patient_id: Uuid, - pub contact_method: String, - pub content: String, - pub outcome: Option, - pub next_follow_up_date: Option, - pub created_by: Uuid, - pub created_at: String, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateFollowUpTaskWithVersion { + #[serde(flatten)] + pub data: UpdateFollowUpTaskReq, + pub version: i32, } -// --------------------------------------------------------------------------- -// Handler — 随访管理 (6 个端点) -// --------------------------------------------------------------------------- - -/// GET /api/v1/health/follow-up/tasks — 随访任务列表 pub async fn list_tasks( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } -/// POST /api/v1/health/follow-up/tasks — 创建随访任务 pub async fn create_task( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = follow_up_service::create_task( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/follow-up/tasks/{id} — 更新随访任务 pub async fn update_task( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = follow_up_service::update_task( + &state, ctx.tenant_id, id, Some(ctx.user_id), req.data, req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/follow-up/tasks/{id} — 删除随访任务 pub async fn delete_task( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + follow_up_service::delete_task(&state, ctx.tenant_id, id, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// POST /api/v1/health/follow-up/records — 创建随访记录 pub async fn create_record( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = follow_up_service::create_record( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/follow-up/records — 随访记录列表 pub async fn list_records( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + 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))) } diff --git a/crates/erp-health/src/handler/health_data_handler.rs b/crates/erp-health/src/handler/health_data_handler.rs index eb00078..cd8e7f9 100644 --- a/crates/erp-health/src/handler/health_data_handler.rs +++ b/crates/erp-health/src/handler/health_data_handler.rs @@ -1,408 +1,332 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::health_data_dto::*; +use crate::service::health_data_service; use crate::state::HealthState; // --------------------------------------------------------------------------- -// DTO — 健康数据 +// 查询参数 // --------------------------------------------------------------------------- -/// 生命体征列表查询参数 #[derive(Debug, Deserialize, IntoParams)] -pub struct VitalSignsListParams { +pub struct PaginationParams { pub page: Option, pub page_size: Option, - pub patient_id: Uuid, } -/// 创建生命体征请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateVitalSignsReq { - pub patient_id: Uuid, - pub blood_pressure_systolic: Option, - pub blood_pressure_diastolic: Option, - pub heart_rate: Option, - pub temperature: Option, - pub blood_oxygen: Option, - pub weight: Option, - pub height: Option, - pub measured_at: Option, - pub notes: Option, -} - -/// 更新生命体征请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateVitalSignsReq { - pub blood_pressure_systolic: Option, - pub blood_pressure_diastolic: Option, - pub heart_rate: Option, - pub temperature: Option, - pub blood_oxygen: Option, - pub weight: Option, - pub height: Option, - pub measured_at: Option, - pub notes: Option, - pub version: i32, -} - -/// 生命体征响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct VitalSignsResp { - pub id: Uuid, - pub patient_id: Uuid, - pub blood_pressure_systolic: Option, - pub blood_pressure_diastolic: Option, - pub heart_rate: Option, - pub temperature: Option, - pub blood_oxygen: Option, - pub weight: Option, - pub height: Option, - pub measured_at: Option, - pub notes: Option, - pub created_at: String, - pub updated_at: String, -} - -/// 化验报告列表查询参数 -#[derive(Debug, Deserialize, IntoParams)] -pub struct LabReportListParams { - pub page: Option, - pub page_size: Option, - pub patient_id: Option, -} - -/// 创建化验报告请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateLabReportReq { - pub patient_id: Uuid, - pub report_type: String, - pub report_date: String, - pub indicators: serde_json::Value, - pub file_url: Option, - pub notes: Option, -} - -/// 更新化验报告请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateLabReportReq { - pub report_type: Option, - pub report_date: Option, - pub indicators: Option, - pub file_url: Option, - pub notes: Option, - pub version: i32, -} - -/// 化验报告响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct LabReportResp { - pub id: Uuid, - pub patient_id: Uuid, - pub report_type: String, - pub report_date: String, - pub indicators: serde_json::Value, - pub file_url: Option, - pub notes: Option, - pub created_at: String, - pub updated_at: String, -} - -/// 健康档案列表查询参数 -#[derive(Debug, Deserialize, IntoParams)] -pub struct HealthRecordListParams { - pub page: Option, - pub page_size: Option, - pub patient_id: Option, -} - -/// 创建健康档案请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateHealthRecordReq { - pub patient_id: Uuid, - pub record_type: String, - pub title: String, - pub content: serde_json::Value, - pub record_date: String, -} - -/// 更新健康档案请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateHealthRecordReq { - pub record_type: Option, - pub title: Option, - pub content: Option, - pub record_date: Option, - pub version: i32, -} - -/// 健康档案响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct HealthRecordResp { - pub id: Uuid, - pub patient_id: Uuid, - pub record_type: String, - pub title: String, - pub content: serde_json::Value, - pub record_date: String, - pub created_at: String, - pub updated_at: String, -} - -/// 趋势分析列表查询参数 -#[derive(Debug, Deserialize, IntoParams)] -pub struct TrendListParams { - pub patient_id: Option, -} - -/// 生成趋势请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct GenerateTrendReq { - pub patient_id: Uuid, - pub indicator_name: String, - pub start_date: String, - pub end_date: String, -} - -/// 趋势分析响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct TrendResp { - pub id: Uuid, - pub patient_id: Uuid, - pub indicator_name: String, - pub trend_data: serde_json::Value, - pub analysis_summary: Option, - pub generated_at: String, -} - -/// 指标时间序列查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct IndicatorTimeseriesParams { - pub patient_id: Uuid, - pub indicator_name: String, - pub start_date: Option, - pub end_date: Option, + pub start_date: Option, + pub end_date: Option, } -/// 指标时间序列数据点 -#[derive(Debug, Serialize, ToSchema)] -pub struct TimeseriesDataPoint { - pub date: String, - pub value: f64, - pub unit: Option, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct GenerateTrendReq { + pub period_start: chrono::NaiveDate, + pub period_end: chrono::NaiveDate, } -/// 指标时间序列响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct IndicatorTimeseriesResp { - pub indicator_name: String, - pub patient_id: Uuid, - pub data_points: Vec, +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateWithVersion { + pub data: T, + pub version: i32, } // --------------------------------------------------------------------------- -// Handler — 健康数据 (15 个端点) +// 生命体征 // --------------------------------------------------------------------------- -/// GET /api/v1/health/vital-signs — 生命体征列表 pub async fn list_vital_signs( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = health_data_service::list_vital_signs( + &state, ctx.tenant_id, patient_id, page, page_size, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/vital-signs — 创建生命体征记录 pub async fn create_vital_signs( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::create_vital_signs( + &state, ctx.tenant_id, patient_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/vital-signs/{id} — 更新生命体征记录 pub async fn update_vital_signs( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path((patient_id, vid)): Path<(Uuid, Uuid)>, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::update_vital_signs( + &state, ctx.tenant_id, patient_id, vid, Some(ctx.user_id), req.data, req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/vital-signs/{id} — 删除生命体征记录 pub async fn delete_vital_signs( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, vid)): Path<(Uuid, Uuid)>, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + health_data_service::delete_vital_signs(&state, ctx.tenant_id, vid, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// GET /api/v1/health/lab-reports — 化验报告列表 +// --------------------------------------------------------------------------- +// 化验报告 +// --------------------------------------------------------------------------- + pub async fn list_lab_reports( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = health_data_service::list_lab_reports( + &state, ctx.tenant_id, patient_id, page, page_size, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/lab-reports — 创建化验报告 pub async fn create_lab_report( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::create_lab_report( + &state, ctx.tenant_id, patient_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/lab-reports/{id} — 更新化验报告 pub async fn update_lab_report( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, rid)): Path<(Uuid, Uuid)>, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::update_lab_report( + &state, ctx.tenant_id, rid, Some(ctx.user_id), req.data, req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/lab-reports/{id} — 删除化验报告 pub async fn delete_lab_report( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, rid)): Path<(Uuid, Uuid)>, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + health_data_service::delete_lab_report(&state, ctx.tenant_id, rid, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// GET /api/v1/health/records — 健康档案列表 +// --------------------------------------------------------------------------- +// 健康档案 +// --------------------------------------------------------------------------- + pub async fn list_health_records( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = health_data_service::list_health_records( + &state, ctx.tenant_id, patient_id, page, page_size, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/records — 创建健康档案 pub async fn create_health_record( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::create_health_record( + &state, ctx.tenant_id, patient_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/records/{id} — 更新健康档案 pub async fn update_health_record( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, rid)): Path<(Uuid, Uuid)>, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::update_health_record( + &state, ctx.tenant_id, rid, Some(ctx.user_id), req.data, req.version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/records/{id} — 删除健康档案 pub async fn delete_health_record( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, rid)): Path<(Uuid, Uuid)>, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + health_data_service::delete_health_record(&state, ctx.tenant_id, rid, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// GET /api/v1/health/trends — 趋势分析列表 +// --------------------------------------------------------------------------- +// 趋势分析 +// --------------------------------------------------------------------------- + pub async fn list_trends( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, -) -> Result>>, AppError> + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Query(params): Query, +) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = health_data_service::list_trends( + &state, ctx.tenant_id, patient_id, page, page_size, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/trends/generate — 生成趋势分析 pub async fn generate_trend( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(patient_id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::generate_trend( + &state, ctx.tenant_id, patient_id, Some(ctx.user_id), req.period_start, req.period_end, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/trends/timeseries — 获取指标时间序列 pub async fn get_indicator_timeseries( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Path((patient_id, indicator)): Path<(Uuid, String)>, + Query(params): Query, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = health_data_service::get_indicator_timeseries( + &state, ctx.tenant_id, patient_id, indicator, params.start_date, params.end_date, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) +} + +// --------------------------------------------------------------------------- +// 带版本号的更新请求包装 +// --------------------------------------------------------------------------- + +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateVitalSignsWithVersion { + #[serde(flatten)] + pub data: UpdateVitalSignsReq, + pub version: i32, +} + +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateLabReportWithVersion { + #[serde(flatten)] + pub data: CreateLabReportReq, + pub version: i32, +} + +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdateHealthRecordWithVersion { + #[serde(flatten)] + pub data: CreateHealthRecordReq, + pub version: i32, } diff --git a/crates/erp-health/src/handler/patient_handler.rs b/crates/erp-health/src/handler/patient_handler.rs index 3218d3d..816ee31 100644 --- a/crates/erp-health/src/handler/patient_handler.rs +++ b/crates/erp-health/src/handler/patient_handler.rs @@ -1,311 +1,281 @@ use axum::Extension; use axum::extract::{FromRef, Json, Path, Query, State}; -use serde::{Deserialize, Serialize}; -use utoipa::{IntoParams, ToSchema}; +use serde::Deserialize; +use utoipa::IntoParams; use uuid::Uuid; use erp_core::error::AppError; use erp_core::types::{ApiResponse, PaginatedResponse, TenantContext}; +use crate::dto::patient_dto::{ + CreatePatientReq, FamilyMemberReq, FamilyMemberResp, ManageTagsReq, PatientResp, + UpdatePatientReq, +}; +use crate::service::patient_service; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO — 患者管理 -// --------------------------------------------------------------------------- - -/// 患者列表查询参数 #[derive(Debug, Deserialize, IntoParams)] pub struct PatientListParams { pub page: Option, pub page_size: Option, - /// 按姓名/身份证号模糊搜索 pub search: Option, - /// 按标签筛选 pub tag_id: Option, - /// 按负责医生筛选 - pub doctor_id: Option, -} - -/// 创建患者请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreatePatientReq { - pub name: String, - pub id_card: Option, - pub phone: Option, - pub gender: Option, - pub birth_date: Option, - pub address: Option, - pub emergency_contact: Option, - pub emergency_phone: Option, - pub medical_notes: Option, -} - -/// 更新患者请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdatePatientReq { - pub name: Option, - pub id_card: Option, - pub phone: Option, - pub gender: Option, - pub birth_date: Option, - pub address: Option, - pub emergency_contact: Option, - pub emergency_phone: Option, - pub medical_notes: Option, - pub version: i32, -} - -/// 患者标签管理请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct ManagePatientTagsReq { - pub tag_ids: Vec, -} - -/// 患者响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct PatientResp { - pub id: Uuid, - pub name: String, - pub id_card: Option, - pub phone: Option, - pub gender: Option, - pub birth_date: Option, - pub address: Option, - pub emergency_contact: Option, - pub emergency_phone: Option, - pub medical_notes: Option, - pub tags: Vec, - pub created_at: String, - pub updated_at: String, -} - -/// 患者标签响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct PatientTagResp { - pub id: Uuid, - pub name: String, - pub color: Option, -} - -/// 健康摘要响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct HealthSummaryResp { - pub patient_id: Uuid, - pub latest_vital_signs: Option, - pub latest_lab_report: Option, - pub upcoming_appointments: u64, - pub pending_follow_ups: u64, -} - -/// 家庭成员请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct CreateFamilyMemberReq { - pub name: String, - pub relationship: String, - pub phone: Option, - pub id_card: Option, -} - -/// 更新家庭成员请求 -#[derive(Debug, Deserialize, ToSchema)] -pub struct UpdateFamilyMemberReq { - pub name: Option, - pub relationship: Option, - pub phone: Option, - pub id_card: Option, -} - -/// 家庭成员响应 -#[derive(Debug, Serialize, ToSchema)] -pub struct FamilyMemberResp { - pub id: Uuid, - pub patient_id: Uuid, - pub name: String, - pub relationship: String, - pub phone: Option, - pub id_card: Option, } /// 分配医生请求 -#[derive(Debug, Deserialize, ToSchema)] +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] pub struct AssignDoctorReq { pub doctor_id: Uuid, + pub relationship_type: Option, } -// --------------------------------------------------------------------------- -// Handler — 患者管理 (13 个端点) -// --------------------------------------------------------------------------- - -/// GET /api/v1/health/patients — 患者列表 pub async fn list_patients( - State(_state): State, - Extension(_ctx): Extension, - Query(_params): Query, + State(state): State, + Extension(ctx): Extension, + Query(params): Query, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let page = params.page.unwrap_or(1); + let page_size = params.page_size.unwrap_or(20); + let result = patient_service::list_patients( + &state, ctx.tenant_id, page, page_size, params.search, params.tag_id, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/patients — 创建患者 pub async fn create_patient( - State(_state): State, - Extension(_ctx): Extension, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = patient_service::create_patient( + &state, ctx.tenant_id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/patients/{id} — 获取患者详情 pub async fn get_patient( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = patient_service::get_patient(&state, ctx.tenant_id, id).await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/patients/{id} — 更新患者 pub async fn update_patient( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let version = req.version; + let update = UpdatePatientReq { + name: req.name, + gender: req.gender, + birth_date: req.birth_date, + blood_type: req.blood_type, + id_number: req.id_number, + allergy_history: req.allergy_history, + medical_history_summary: req.medical_history_summary, + emergency_contact_name: req.emergency_contact_name, + emergency_contact_phone: req.emergency_contact_phone, + source: req.source, + notes: req.notes, + }; + let result = patient_service::update_patient( + &state, ctx.tenant_id, id, Some(ctx.user_id), update, version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/patients/{id} — 删除患者（软删除） pub async fn delete_patient( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + patient_service::delete_patient(&state, ctx.tenant_id, id, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// POST /api/v1/health/patients/{id}/tags — 管理患者标签 pub async fn manage_patient_tags( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + patient_service::manage_patient_tags(&state, ctx.tenant_id, id, req, Some(ctx.user_id)).await?; + Ok(Json(ApiResponse::ok(()))) } -/// GET /api/v1/health/patients/{id}/health-summary — 获取患者健康摘要 pub async fn get_health_summary( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, -) -> Result>, AppError> + State(state): State, + Extension(ctx): Extension, + Path(id): Path, +) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = patient_service::get_health_summary(&state, ctx.tenant_id, id).await?; + Ok(Json(ApiResponse::ok(result))) } -/// GET /api/v1/health/patients/{id}/family-members — 家庭成员列表 pub async fn list_family_members( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, ) -> Result>>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = patient_service::list_family_members(&state, ctx.tenant_id, id).await?; + Ok(Json(ApiResponse::ok(result))) } -/// POST /api/v1/health/patients/{id}/family-members — 创建家庭成员 pub async fn create_family_member( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let result = patient_service::create_family_member( + &state, ctx.tenant_id, id, Some(ctx.user_id), req, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// PUT /api/v1/health/patients/{patient_id}/family-members/{member_id} — 更新家庭成员 pub async fn update_family_member( - State(_state): State, - Extension(_ctx): Extension, - Path((_patient_id, _member_id)): Path<(Uuid, Uuid)>, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path((_patient_id, member_id)): Path<(Uuid, Uuid)>, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + let version = req.version; + let update = FamilyMemberReq { + name: req.name, + relationship: req.relationship, + phone: req.phone, + birth_date: req.birth_date, + notes: req.notes, + }; + let result = patient_service::update_family_member( + &state, ctx.tenant_id, _patient_id, member_id, Some(ctx.user_id), update, version, + ) + .await?; + Ok(Json(ApiResponse::ok(result))) } -/// DELETE /api/v1/health/patients/{patient_id}/family-members/{member_id} — 删除家庭成员 pub async fn delete_family_member( - State(_state): State, - Extension(_ctx): Extension, - Path((_patient_id, _member_id)): Path<(Uuid, Uuid)>, + State(state): State, + Extension(ctx): Extension, + Path((patient_id, member_id)): Path<(Uuid, Uuid)>, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + patient_service::delete_family_member( + &state, ctx.tenant_id, patient_id, member_id, Some(ctx.user_id), + ) + .await?; + Ok(Json(ApiResponse::ok(()))) } -/// POST /api/v1/health/patients/{id}/doctors — 分配负责医生 pub async fn assign_doctor( - State(_state): State, - Extension(_ctx): Extension, - Path(_id): Path, - Json(_req): Json, + State(state): State, + Extension(ctx): Extension, + Path(id): Path, + Json(req): Json, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + patient_service::assign_doctor( + &state, + ctx.tenant_id, + id, + req.doctor_id, + req.relationship_type.unwrap_or_else(|| "primary".to_string()), + Some(ctx.user_id), + ) + .await?; + Ok(Json(ApiResponse::ok(()))) } -/// DELETE /api/v1/health/patients/{patient_id}/doctors/{doctor_id} — 移除负责医生 pub async fn remove_doctor( - State(_state): State, - Extension(_ctx): Extension, - Path((_patient_id, _doctor_id)): Path<(Uuid, Uuid)>, + State(state): State, + Extension(ctx): Extension, + Path((patient_id, doctor_id)): Path<(Uuid, Uuid)>, ) -> Result>, AppError> where HealthState: FromRef, S: Clone + Send + Sync + 'static, { - Err(AppError::Internal("Not implemented yet".into())) + patient_service::remove_doctor(&state, ctx.tenant_id, patient_id, doctor_id).await?; + Ok(Json(ApiResponse::ok(()))) +} + +// 带版本号的更新请求包装 +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct UpdatePatientWithVersion { + pub name: Option, + pub gender: Option, + pub birth_date: Option, + pub blood_type: Option, + pub id_number: Option, + pub allergy_history: Option, + pub medical_history_summary: Option, + pub emergency_contact_name: Option, + pub emergency_contact_phone: Option, + pub source: Option, + pub notes: Option, + pub version: i32, +} + +#[derive(Debug, serde::Deserialize, utoipa::ToSchema)] +pub struct FamilyMemberUpdateWithVersion { + pub name: String, + pub relationship: String, + pub phone: Option, + pub birth_date: Option, + pub notes: Option, + pub version: i32, } diff --git a/crates/erp-health/src/service/doctor_service.rs b/crates/erp-health/src/service/doctor_service.rs new file mode 100644 index 0000000..046afec --- /dev/null +++ b/crates/erp-health/src/service/doctor_service.rs @@ -0,0 +1,184 @@ +//! 医护档案 Service — CRUD + +use chrono::Utc; +use sea_orm::entity::prelude::*; +use sea_orm::{ActiveValue::Set, Condition, QueryOrder, QuerySelect}; +use uuid::Uuid; + +use erp_core::error::check_version; +use erp_core::types::PaginatedResponse; + +use crate::dto::doctor_dto::*; +use crate::entity::doctor_profile; +use crate::error::{HealthError, HealthResult}; +use crate::state::HealthState; + +pub async fn list_doctors( + state: &HealthState, + tenant_id: Uuid, + page: u64, + page_size: u64, + search: Option, + department: Option, + title: Option, +) -> HealthResult> { + let limit = page_size.min(100); + let offset = page.saturating_sub(1) * limit; + + let mut query = doctor_profile::Entity::find() + .filter(doctor_profile::Column::TenantId.eq(tenant_id)) + .filter(doctor_profile::Column::DeletedAt.is_null()); + + if let Some(ref s) = search { + // doctor_profile 没有 name 字段，按 license_number/department 模糊搜索 + let pattern = format!("%{}%", s); + query = query.filter( + Condition::any() + .add(doctor_profile::Column::LicenseNumber.contains(&pattern)) + .add(doctor_profile::Column::Department.contains(&pattern)) + .add(doctor_profile::Column::Specialty.contains(&pattern)), + ); + } + if let Some(ref d) = department { + query = query.filter(doctor_profile::Column::Department.eq(d)); + } + if let Some(ref t) = title { + query = query.filter(doctor_profile::Column::Title.eq(t)); + } + + let total = query.clone().count(&state.db).await?; + let models = query + .order_by_desc(doctor_profile::Column::CreatedAt) + .offset(offset) + .limit(limit) + .all(&state.db) + .await?; + + let total_pages = total.div_ceil(limit.max(1)); + let data = models.into_iter().map(model_to_resp).collect(); + + Ok(PaginatedResponse { + data, + total, + page, + page_size: limit, + total_pages, + }) +} + +pub async fn create_doctor( + state: &HealthState, + tenant_id: Uuid, + operator_id: Option, + req: CreateDoctorReq, +) -> HealthResult { + let now = Utc::now(); + let id = Uuid::now_v7(); + + let active = doctor_profile::ActiveModel { + id: Set(id), + tenant_id: Set(tenant_id), + user_id: Set(req.user_id), + department: Set(req.department), + title: Set(req.title), + specialty: Set(req.specialty), + license_number: Set(req.license_number), + bio: Set(req.bio), + online_status: Set("offline".to_string()), + created_at: Set(now), + updated_at: Set(now), + created_by: Set(operator_id), + updated_by: Set(operator_id), + deleted_at: Set(None), + version: Set(1), + }; + + let model = active.insert(&state.db).await?; + Ok(model_to_resp(model)) +} + +pub async fn get_doctor( + state: &HealthState, + tenant_id: Uuid, + id: Uuid, +) -> HealthResult { + let model = find_doctor(&state.db, tenant_id, id).await?; + Ok(model_to_resp(model)) +} + +pub async fn update_doctor( + state: &HealthState, + tenant_id: Uuid, + id: Uuid, + operator_id: Option, + req: UpdateDoctorReq, + expected_version: i32, +) -> HealthResult { + let model = find_doctor(&state.db, tenant_id, id).await?; + let next_ver = check_version(expected_version, model.version) + .map_err(|_| HealthError::VersionMismatch)?; + + let mut active: doctor_profile::ActiveModel = model.into(); + // doctor_profile 没有 name 字段，但 handler DTO 有 name + // name 需要通过 user_id 关联到 erp-auth 的 users 表，此处暂不处理 + if let Some(v) = req.department { active.department = Set(Some(v)); } + if let Some(v) = req.title { active.title = Set(Some(v)); } + if let Some(v) = req.specialty { active.specialty = Set(Some(v)); } + if let Some(v) = req.license_number { active.license_number = Set(Some(v)); } + if let Some(v) = req.bio { active.bio = Set(Some(v)); } + active.updated_at = Set(Utc::now()); + active.updated_by = Set(operator_id); + active.version = Set(next_ver); + + let updated = active.update(&state.db).await?; + Ok(model_to_resp(updated)) +} + +pub async fn delete_doctor( + state: &HealthState, + tenant_id: Uuid, + id: Uuid, + operator_id: Option, +) -> HealthResult<()> { + let model = find_doctor(&state.db, tenant_id, id).await?; + + let mut active: doctor_profile::ActiveModel = model.into(); + active.deleted_at = Set(Some(Utc::now())); + active.updated_at = Set(Utc::now()); + active.updated_by = Set(operator_id); + active.version = Set(active.version.unwrap() + 1); + active.update(&state.db).await?; + + Ok(()) +} + +async fn find_doctor( + db: &DatabaseConnection, + tenant_id: Uuid, + id: Uuid, +) -> HealthResult { + doctor_profile::Entity::find() + .filter(doctor_profile::Column::Id.eq(id)) + .filter(doctor_profile::Column::TenantId.eq(tenant_id)) + .filter(doctor_profile::Column::DeletedAt.is_null()) + .one(db) + .await? + .ok_or(HealthError::DoctorNotFound) +} + +fn model_to_resp(m: doctor_profile::Model) -> DoctorResp { + DoctorResp { + id: m.id, + user_id: m.user_id, + name: m.user_id.map(|_| "".to_string()).unwrap_or_default(), + department: m.department, + title: m.title, + specialty: m.specialty, + license_number: m.license_number, + bio: m.bio, + online_status: m.online_status, + created_at: m.created_at, + updated_at: m.updated_at, + version: m.version, + } +} diff --git a/crates/erp-health/src/service/follow_up_service.rs b/crates/erp-health/src/service/follow_up_service.rs index aae7b95..e92aa1f 100644 --- a/crates/erp-health/src/service/follow_up_service.rs +++ b/crates/erp-health/src/service/follow_up_service.rs @@ -8,74 +8,11 @@ use uuid::Uuid; use erp_core::error::check_version; use erp_core::types::PaginatedResponse; +use crate::dto::follow_up_dto::*; use crate::entity::{follow_up_record, follow_up_task}; use crate::error::{HealthError, HealthResult}; use crate::state::HealthState; -// --------------------------------------------------------------------------- -// DTO（内部使用） -// --------------------------------------------------------------------------- - -#[derive(Debug, Clone, serde::Deserialize, utoipa::ToSchema)] -pub struct CreateFollowUpTaskReq { - pub patient_id: Uuid, - pub assigned_to: Option, - pub follow_up_type: String, - pub planned_date: chrono::NaiveDate, - pub content_template: Option, - pub related_appointment_id: Option, -} - -#[derive(Debug, Clone, serde::Deserialize, utoipa::ToSchema)] -pub struct UpdateFollowUpTaskReq { - pub assigned_to: Option, - pub follow_up_type: Option, - pub planned_date: Option, - pub content_template: Option, - pub status: Option, -} - -#[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)] -pub struct FollowUpTaskResp { - pub id: Uuid, - pub patient_id: Uuid, - pub assigned_to: Option, - pub follow_up_type: String, - pub planned_date: chrono::NaiveDate, - pub status: String, - pub content_template: Option, - pub related_appointment_id: Option, - pub created_at: chrono::DateTime, - pub updated_at: chrono::DateTime, - pub version: i32, -} - -#[derive(Debug, Clone, serde::Deserialize, utoipa::ToSchema)] -pub struct CreateFollowUpRecordReq { - pub task_id: Uuid, - pub executed_by: Option, - pub executed_date: chrono::NaiveDate, - pub result: String, - pub patient_condition: Option, - pub medical_advice: Option, - pub next_follow_up_date: Option, -} - -#[derive(Debug, Clone, serde::Serialize, utoipa::ToSchema)] -pub struct FollowUpRecordResp { - pub id: Uuid, - pub task_id: Uuid, - pub executed_by: Option, - pub executed_date: chrono::NaiveDate, - pub result: String, - pub patient_condition: Option, - pub medical_advice: Option, - pub next_follow_up_date: Option, - pub created_at: chrono::DateTime, - pub updated_at: chrono::DateTime, - pub version: i32, -} - // --------------------------------------------------------------------------- // 随访任务 // --------------------------------------------------------------------------- @@ -226,7 +163,6 @@ pub async fn create_record( operator_id: Option, req: CreateFollowUpRecordReq, ) -> HealthResult { - // 校验任务存在且状态允许执行 let task = follow_up_task::Entity::find() .filter(follow_up_task::Column::Id.eq(req.task_id)) .filter(follow_up_task::Column::TenantId.eq(tenant_id)) @@ -241,7 +177,6 @@ pub async fn create_record( let now = Utc::now(); - // 创建随访记录 let record_active = follow_up_record::ActiveModel { id: Set(Uuid::now_v7()), tenant_id: Set(tenant_id), @@ -261,7 +196,6 @@ pub async fn create_record( }; let record = record_active.insert(&state.db).await?; - // 更新任务状态为 completed let mut task_active: follow_up_task::ActiveModel = task.into(); task_active.status = Set("completed".to_string()); task_active.updated_at = Set(now); @@ -269,9 +203,6 @@ pub async fn create_record( task_active.version = Set(task_active.version.unwrap() + 1); task_active.update(&state.db).await?; - // 如果设置了 next_follow_up_date，自动创建下一个随访任务 - // (由调用方在 handler 层处理，此处仅记录) - Ok(FollowUpRecordResp { id: record.id, task_id: record.task_id, executed_by: record.executed_by, executed_date: record.executed_date, result: record.result, @@ -297,7 +228,6 @@ pub async fn list_records( .filter(follow_up_record::Column::DeletedAt.is_null()); if let Some(tid) = task_id { query = query.filter(follow_up_record::Column::TaskId.eq(tid)); } - // patient_id 需要通过 task 关联，简化处理：先查 task if let Some(pid) = patient_id { let task_ids: Vec = follow_up_task::Entity::find() .filter(follow_up_task::Column::TenantId.eq(tenant_id)) diff --git a/crates/erp-health/src/service/mod.rs b/crates/erp-health/src/service/mod.rs index 50ffa04..8c47f90 100644 --- a/crates/erp-health/src/service/mod.rs +++ b/crates/erp-health/src/service/mod.rs @@ -1,5 +1,6 @@ pub mod appointment_service; pub mod consultation_service; +pub mod doctor_service; pub mod follow_up_service; pub mod health_data_service; pub mod patient_service; diff --git a/crates/erp-server/migration/src/m20260423_000042_create_health_tables.rs b/crates/erp-server/migration/src/m20260423_000042_create_health_tables.rs index 3cf8855..1ca9b16 100644 --- a/crates/erp-server/migration/src/m20260423_000042_create_health_tables.rs +++ b/crates/erp-server/migration/src/m20260423_000042_create_health_tables.rs @@ -959,7 +959,7 @@ impl MigrationTrait for Migration { .col(ColumnDef::new(ConsultationSession::PatientId).uuid().not_null()) .col(ColumnDef::new(ConsultationSession::DoctorId).uuid().null()) .col( - ColumnDef::new(ConsultationSession::Type) + ColumnDef::new(ConsultationSession::ConsultationType) .string_len(20) .not_null() .default("customer_service"), @@ -1440,7 +1440,7 @@ enum ConsultationSession { TenantId, PatientId, DoctorId, - Type, + ConsultationType, Status, LastMessageAt, UnreadCountPatient,