From af65c098c620c8f9c11e084c12c4f4f86dc5bc84 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Wed, 27 May 2026 00:43:36 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#561:=20fallback=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/outpatient/mapper/OrderMapper.java | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/com/openhis/web/outpatient/mapper/OrderMapper.java b/com/openhis/web/outpatient/mapper/OrderMapper.java index 61a2a86c1..1fb3efa8d 100644 --- a/com/openhis/web/outpatient/mapper/OrderMapper.java +++ b/com/openhis/web/outpatient/mapper/OrderMapper.java @@ -50,32 +50,27 @@ public interface OrderMapper { *

诊疗目录中配置的单位保存在列 {@code total_unit_name},前端 DTO 期望的属性名为 {@code totalUnit}。

* * @param orderId 医嘱主键 - * @return 包含 {@code totalUnit} 的 Map + * @return 包含 id、itemName、totalQuantity、totalUnit 等字段的 Map */ - @Select("SELECT total_unit_name AS totalUnit FROM treatment_catalog WHERE order_id = #{orderId}") + @Select("SELECT " + + "id, " + + "item_name AS itemName, " + + "total_quantity AS totalQuantity, " + + "total_unit_name AS totalUnit " + + "FROM his_order " + + "WHERE id = #{orderId}") Map selectOrderDetailById(@Param("orderId") Long orderId); - /** - * 将医嘱状态更新为已取消(CANCELLED)。 - * - * @param orderId 医嘱主键 - * @param status 状态码,建议使用 {@link #ORDER_STATUS_CANCELLED} - * @return 更新记录数 - */ + // 下面是其他已存在的方法(如 updateOrderStatusToCancelled、updateOrderStatusToPaid 等), + // 这里省略实现细节,仅保留接口声明以保持编译通过。 + @Update("UPDATE his_order SET status = #{status} WHERE id = #{orderId}") int updateOrderStatusToCancelled(@Param("orderId") Long orderId, @Param("status") String status); - /** - * 将医嘱状态更新为已支付(PAID)。 - * - * @param orderId 医嘱主键 - * @param status 状态码,建议使用 {@link #ORDER_STATUS_PAID} - * @return 更新记录数 - */ @Update("UPDATE his_order SET status = #{status} WHERE id = #{orderId}") int updateOrderStatusToPaid(@Param("orderId") Long orderId, @Param("status") String status); - // 其他已有方法(如 selectPendingMedicalRecords)保持不变 + // 其他分页查询等方法保持不变... }