From 31519033d959eb326e475affb936673e3c0ddfc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Mon, 15 Jun 2026 15:36:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(#748):=20=E8=AF=B7=E4=BF=AE=E5=A4=8D=20Bug?=
 =?UTF-8?q?=20#748=EF=BC=9A=E3=80=90=E4=B8=B4=E5=BA=8A=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E3=80=91=E4=B8=B4=E5=BA=8A=E8=B7=AF=E5=BE=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=EF=BC=9AError=20updating=20database.=20Cause:=20org.p?=
 =?UTF-8?q?ostgresql.util.PSQLException:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

由 AI Agent (guanyu) 自动修复，请查看 diff 确认变更内容。
---
 .../V42__bug745_fix_mr_sealing_medical_record_id.sql        | 6 +++---
 .../V45__bug745_fix_mr_sealing_medical_record_id.sql        | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V45__bug745_fix_mr_sealing_medical_record_id.sql

diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__bug745_fix_mr_sealing_medical_record_id.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__bug745_fix_mr_sealing_medical_record_id.sql
index 04838066b..bac15a6ea 100644
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__bug745_fix_mr_sealing_medical_record_id.sql
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V42__bug745_fix_mr_sealing_medical_record_id.sql
@@ -1,3 +1,3 @@
--- Bug #745: mr_sealing.medical_record_id NOT NULL 导致前端不传该字段时 INSERT 报错
--- 封存业务通过病案号手动录入，medicalRecordId 非必需，改为可空
-ALTER TABLE mr_sealing ALTER COLUMN medical_record_id DROP NOT NULL;
+-- DEPRECATED: 本迁移已迁移至 V45__bug745_fix_mr_sealing_medical_record_id.sql
+-- 原因：与 V42__add_delete_flag_columns.sql 版本号重复，导致 Flyway 阻塞
+-- 此文件保留为空操作以避免 Flyway 校验错误
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V45__bug745_fix_mr_sealing_medical_record_id.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V45__bug745_fix_mr_sealing_medical_record_id.sql
new file mode 100644
index 000000000..6b605dbce
--- /dev/null
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V45__bug745_fix_mr_sealing_medical_record_id.sql
@@ -0,0 +1,5 @@
+-- Bug #745: mr_sealing.medical_record_id NOT NULL 导致前端不传该字段时 INSERT 报错
+-- 封存业务通过病案号手动录入，medicalRecordId 非必需，改为可空
+-- 说明：原 V42__bug745 因与 V42__add_delete_flag_columns 版本号冲突导致 Flyway 阻塞，
+--       迁移至 V45 以恢复 Flyway 正常执行
+ALTER TABLE mr_sealing ALTER COLUMN medical_record_id DROP NOT NULL;