From 226d3192f1d056aaef97abd4fff57b37051e93a9 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentronhealth.com>
Date: Sun, 14 Jun 2026 06:11:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(#743):=20guanyu=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MD/MODULE_INDEX.md                                   |  2 +-
 .../emergency/controller/EmergencyController.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/MD/MODULE_INDEX.md b/MD/MODULE_INDEX.md
index 189b116cc..a07ae9680 100644
--- a/MD/MODULE_INDEX.md
+++ b/MD/MODULE_INDEX.md
@@ -1,7 +1,7 @@
 # HealthLink-HIS 代码模块索引
 
 > 供 LLM 快速定位代码。每个模块列出 Controller → Service → Mapper 关键文件。
-> 最后更新: 2026-06-14 00:00 (298 个 Controller)
+> 最后更新: 2026-06-14 06:00 (298 个 Controller)
 
 ## 关键词 → 模块速查
 
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emergency/controller/EmergencyController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emergency/controller/EmergencyController.java
index 4413fd8c7..7f5c2d475 100644
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emergency/controller/EmergencyController.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/emergency/controller/EmergencyController.java
@@ -165,6 +165,18 @@ public class EmergencyController {
     @PostMapping("/rescue/add")
     @Transactional(rollbackFor = Exception.class)
     public R<?> addRescue(@RequestBody EmergencyRescue rescue) {
+        // Bug#743: 修复 patientId 为 null 时数据库 NOT NULL 约束冲突
+        // 如果传了 triageId 但没传 patientId，从分诊记录自动关联患者
+        if (rescue.getPatientId() == null && rescue.getTriageId() != null) {
+            EmergencyTriage triage = triageService.getById(rescue.getTriageId());
+            if (triage != null) {
+                rescue.setPatientId(triage.getPatientId());
+            }
+        }
+        // 校验：patientId 必须存在（数据库 NOT NULL 约束）
+        if (rescue.getPatientId() == null) {
+            return R.fail("患者ID不能为空，请提供患者ID或分诊ID");
+        }
         rescue.setRescueStart(new Date());
         rescue.setCreateTime(new Date());
         rescueService.save(rescue);