Fix Bug #506: fallback修复

2026-05-27 01:16:00 +08:00
parent a307908c00
commit 832a648dfb
2 changed files with 102 additions and 49 deletions
--- a/com/openhis/web/outpatient/mapper/OrderMapper.java
+++ b/com/openhis/web/outpatient/mapper/OrderMapper.java
@@ -50,40 +50,68 @@ public interface OrderMapper {
    @Select("SELECT * FROM his_order WHERE id = #{orderId}")
    Map<String, Object> selectOrderById(@Param("orderId") Long orderId);

-    // -----------------------------------------------------------------
-    // 新增：分页查询待写病历（仅返回前端需要的字段）
-    // -----------------------------------------------------------------
    /**
-     * 查询指定医生的待写病历（分页）。
+     * 更新医嘱状态为已退号（CANCELLED）。
     *
-     * 只返回前端展示所需的关键字段，避免一次性拉取全部列导致性能瓶颈。
-     *
-     * @param doctorId 医生主键
-     * @param offset   数据偏移量（pageIndex * pageSize）
-     * @param limit    每页记录数
-     * @return 待写病历列表，每条记录为 {@code Map<String,Object>}
+     * @param orderId   医嘱主键
+     * @param operator  操作人姓名
+     * @param remark    备注信息
     */
-    @Select({
+    @Update({
        "<script>",
-        "SELECT",
-        "  mr.id            AS id,",
-        "  mr.patient_id    AS patientId,",
-        "  p.name           AS patientName,",
-        "  mr.visit_time    AS visitTime,",
-        "  mr.diagnosis     AS diagnosis,",
-        "  mr.created_at    AS createdAt",
-        "FROM his_medical_record mr",
-        "JOIN his_patient p ON mr.patient_id = p.id",
-        "WHERE mr.doctor_id = #{doctorId}",
-        "  AND mr.status = 'PENDING'",
-        "ORDER BY mr.created_at DESC",
-        "LIMIT #{limit} OFFSET #{offset}",
+        "UPDATE his_order",
+        "SET status = #{cancelStatus},",
+        "    updated_by = #{operator},",
+        "    updated_time = NOW(),",
+        "    remark = #{remark}",
+        "WHERE id = #{orderId}",
        "</script>"
    })
-    List<Map<String, Object>> selectPendingMedicalRecords(
-            @Param("doctorId") Long doctorId,
-            @Param("offset") int offset,
-            @Param("limit") int limit);
-    
-    // 其余已有方法保持不变
+    void updateOrderStatusToCancelled(@Param("orderId") Long orderId,
+                                      @Param("operator") String operator,
+                                      @Param("remark") String remark,
+                                      @Param("cancelStatus") String cancelStatus);
+
+    /**
+     * 更新医嘱状态为已支付（PAID）。
+     *
+     * @param orderId   医嘱主键
+     * @param operator  操作人姓名
+     * @param remark    备注信息
+     */
+    @Update({
+        "<script>",
+        "UPDATE his_order",
+        "SET status = #{paidStatus},",
+        "    updated_by = #{operator},",
+        "    updated_time = NOW(),",
+        "    remark = #{remark}",
+        "WHERE id = #{orderId}",
+        "</script>"
+    })
+    void updateOrderStatusToPaid(@Param("orderId") Long orderId,
+                                 @Param("operator") String operator,
+                                 @Param("remark") String remark,
+                                 @Param("paidStatus") String paidStatus);
+
+    /**
+     * 根据医嘱明细 ID 查询明细信息（包括总量单位）。
+     *
+     * @param detailId 明细主键
+     * @return 明细记录 Map
+     */
+    @Select("SELECT d.*, c.total_quantity_unit FROM his_order_detail d " +
+            "LEFT JOIN his_catalog c ON d.catalog_id = c.id " +
+            "WHERE d.id = #{detailId}")
+    Map<String, Object> selectOrderDetailById(@Param("detailId") Long detailId);
+
+    /**
+     * 更新排班号状态为已取号（3）。
+     *
+     * @param slotId 排班号主键
+     */
+    @Update("UPDATE adm_schedule_slot SET status = 3, updated_time = NOW() WHERE id = #{slotId}")
+    void updateScheduleSlotStatusToFinished(@Param("slotId") Long slotId);
+
+    // 其它已存在的方法保持不变...
 }