From 6443b88e2c4c4e5765c02de0ea9ff90cf6fa7268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Thu, 18 Jun 2026 21:12:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(#732):=20=E3=80=90=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=8F=8D=E9=A6=88=E3=80=91Bug=20#732=20?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=BF=AE=E5=A4=8D=E6=9C=AA=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=85=A8=E9=93=BE=E8=B7=AF=E9=AA=8C=E8=AF=81=EF=BC=8C=E8=AF=B7?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BB=A5=E4=B8=8B=E5=A4=B1=E8=B4=A5=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E9=87=8D=E6=96=B0=E4=BF=AE=E5=A4=8D=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 失败原因： - 数据库验证 ❌: 数据库验证失败: 表 med_medication_... 根因： - Bug #【验证失败反馈】Bug #732 上次修复未通过全链路验证，请根据以下失败原因重新修复 存在的问题 修复： - ✅ Mapper SQL 修复完成。现在修复前端 `el-progress` 防御性编码： --- .../mapper/OrderExecuteRecordMapper.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/orderclosedloop/mapper/OrderExecuteRecordMapper.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/orderclosedloop/mapper/OrderExecuteRecordMapper.java index 1159fd20b..686217082 100644 --- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/orderclosedloop/mapper/OrderExecuteRecordMapper.java +++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/orderclosedloop/mapper/OrderExecuteRecordMapper.java @@ -15,30 +15,30 @@ public interface OrderExecuteRecordMapper extends BaseMapper @Select("SELECT m.department_name FROM order_main m WHERE m.order_no = #{orderNo} AND m.delete_flag = '0' LIMIT 1") String findDepartmentByOrderNo(@Param("orderNo") String orderNo); - @Select("SELECT e.order_type AS orderType, " + - "COUNT(*) AS totalOrders, " + - "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS closedCount " + + @Select("SELECT e.order_type AS \"orderType\", " + + "COUNT(*) AS \"totalOrders\", " + + "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS \"closedCount\" " + "FROM order_execute_record e " + "WHERE e.delete_flag = '0' AND e.execute_status != 'cancelled' " + "GROUP BY e.order_type") List> selectOverviewByType(); - @Select("SELECT COALESCE(m.department_name, '未知') AS department, " + - "COUNT(*) AS totalOrders, " + - "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS closedCount " + + @Select("SELECT COALESCE(m.department_name, '未知') AS \"department\", " + + "COUNT(*) AS \"totalOrders\", " + + "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS \"closedCount\" " + "FROM order_execute_record e " + "LEFT JOIN order_main m ON e.order_no = m.order_no AND m.delete_flag = '0' " + "WHERE e.delete_flag = '0' AND e.execute_status != 'cancelled' " + - "GROUP BY m.department_name ORDER BY totalOrders DESC") + "GROUP BY m.department_name ORDER BY \"totalOrders\" DESC") List> selectGroupByDepartment(); - @Select("SELECT COALESCE(m.doctor_name, '未知') AS doctorName, " + - "COUNT(*) AS totalOrders, " + - "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS closedCount " + + @Select("SELECT COALESCE(m.doctor_name, '未知') AS \"doctorName\", " + + "COUNT(*) AS \"totalOrders\", " + + "COUNT(CASE WHEN e.execute_status = 'completed' THEN 1 END) AS \"closedCount\" " + "FROM order_execute_record e " + "LEFT JOIN order_main m ON e.order_no = m.order_no AND m.delete_flag = '0' " + "WHERE e.delete_flag = '0' AND e.execute_status != 'cancelled' " + - "GROUP BY m.doctor_name ORDER BY totalOrders DESC") + "GROUP BY m.doctor_name ORDER BY \"totalOrders\" DESC") List> selectGroupByDoctor(); @Select("SELECT COUNT(*) FROM order_execute_record e " + @@ -46,10 +46,10 @@ public interface OrderExecuteRecordMapper extends BaseMapper "AND e.execute_status IN ('pending', 'in_progress', 'overdue', 'executing')") long countUnclosedWarnings(); - @Select("SELECT e.order_no AS orderNo, e.patient_name AS patientName, e.order_type AS orderType, " + - "COALESCE(m.department_name, '未知') AS department, " + - "COALESCE(m.doctor_name, '未知') AS doctorName, " + - "e.current_step AS currentStep, e.create_time AS orderTime " + + @Select("SELECT e.order_no AS \"orderNo\", e.patient_name AS \"patientName\", e.order_type AS \"orderType\", " + + "COALESCE(m.department_name, '未知') AS \"department\", " + + "COALESCE(m.doctor_name, '未知') AS \"doctorName\", " + + "e.current_step AS \"currentStep\", e.create_time AS \"orderTime\" " + "FROM order_execute_record e " + "LEFT JOIN order_main m ON e.order_no = m.order_no AND m.delete_flag = '0' " + "WHERE e.delete_flag = '0' " +