diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
index 844daa74..b1dface1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
@@ -319,15 +319,30 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             }
         }
 
-        // 如果队列项存在且未完成，更新队列状态为已完成
-        // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
-        if (queueItem != null &&
-            !TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus())) {
-            java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-            queueItem.setStatus(TriageQueueStatus.COMPLETED.getValue());
-            queueItem.setUpdateTime(nowLocal);
-            triageQueueItemService.updateById(queueItem);
-        } else if (queueItem == null) {
+        // 如果队列项存在，更新队列状态为已完成
+        // 使用 LambdaUpdateWrapper 直接更新数据库，避免 updateById 实体序列化导致的类型映射问题
+        if (queueItem != null) {
+            Integer targetStatus = TriageQueueStatus.COMPLETED.getValue();
+            // 排除法：只要不是"已完成"就执行更新，覆盖等待、叫号中、诊中、跳过等状态
+            if (!targetStatus.equals(queueItem.getStatus())) {
+                java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
+                boolean updated = triageQueueItemService.update(
+                    new LambdaUpdateWrapper<TriageQueueItem>()
+                        .eq(TriageQueueItem::getId, queueItem.getId())
+                        .set(TriageQueueItem::getStatus, targetStatus)
+                        .set(TriageQueueItem::getUpdateTime, nowLocal)
+                );
+                if (updated) {
+                    log.info("完诊：更新队列状态为 COMPLETED(30) 成功，queueItemId={}, encounterId={}",
+                        queueItem.getId(), encounterId);
+                } else {
+                    log.error("完诊：更新队列状态为 COMPLETED(30) 失败，queueItemId={}, encounterId={}",
+                        queueItem.getId(), encounterId);
+                }
+            } else {
+                log.info("完诊：队列状态已为 COMPLETED(30)，无需重复更新，queueItemId={}", queueItem.getId());
+            }
+        } else {
             log.error("完诊：未找到任何 triage_queue_item 记录，encounterId={}, tenantId={}",
                 encounterId, tenantId);
         }