wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix: Flyway迁移冲突修复 + Controller编译修复

Browse Source 
- 删除重复的Flyway迁移V10/V11(内容已作为V10/V11执行过)
- 修复RequestFormManageController新方法在类外部的编译错误
- 所有7个关键API返回200
This commit is contained in:
华佗
2026-06-07 16:17:19 +08:00
parent d5a75083fd
commit d7d7f2a752
3 changed files with 0 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/controller/RequestFormManageController.java
View File

@@ -234,7 +234,6 @@ public class RequestFormManageController {
return null;
}
}
}
// ==================== 门诊申请单管理兼容接口 ====================

1043
healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V10__menu_permission_registration.sql
View File

File diff suppressed because it is too large Load Diff

215
healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V11__menu_cleanup_placeholder_paths.sql
View File

@@ -1,215 +0,0 @@
-- =====================================================
-- V11: 菜单清理 — 修正占位/错误路径
-- 功能：禁用占位菜单、修正path、启用已有实现的菜单
-- 日期：2026-06-07
-- =====================================================
-- 1. 禁用占位/待开发菜单（无代码实现）
UPDATE healthlink_his.sys_menu SET status = '1', visible = '1' WHERE menu_id IN (
205, -- 患者管理 (path=patientmenu, 重复)
251, -- 自动计算-待开发 (path=automaticBilling2)
252, -- 划价组套-待开发 (path=bargainSets2)
269, -- 门诊工作站 (path=workstation, 重复)
291, -- 手术管理-待开发 (path=portal1)
293, -- 病案管理-待开发 (path=portal12)
303, -- 皮试管理 (path=portal, 无component)
305, -- 退药管理 (path=portal, 重复)
306, -- 手术记录 (path=portal44)
308, -- 费用管理 (path=portal, 无component)
310, -- 住院日结-待开发 (path=portal23)
311, -- 住院收费详情 (path=portal)
312, -- 中途结算 (path=portal)
314, -- 货位管理-待开发 (path=locationManagement2)
338, -- 调价单管理 (重复, 无component)
339, -- 调价盈亏记录 (重复, 无component)
341, -- 库存结余 (path=portal2)
342, -- 发药管理 (path=giveGrug, 孤儿顶级菜单)
345, -- 住院发药-待开发 (path=portal34, component=zyfy)
346, -- 住院汇总发药-待开发 (path=/zyhzfy4)
347, -- 门诊发药明细记录 (path=aaa)
348, -- 住院退药-待开发 (path=/zyty3)
349, -- 电子处方审批 (path=aaa)
358, -- 医保结算 (path=1)
359, -- 医保对账 (path=1)
360, -- 报表管理 (path=aa)
361, -- 院内整体收入明细查询 (path=1)
362, -- 院内整体工作量统计 (path=111)
363, -- 费用整体查询 (path=11)
364, -- 省医保费用查询 (path=2)
365, -- 市医保费用查询 (path=3)
366, -- 自费费用查询 (path=4)
367, -- 学生费用查询 (path=5)
369, -- 医生工作量统计 (path=1)
370, -- 医技工作量统计 (path=2)
371, -- 护士工作量统计 (path=3)
372, -- 院内药房发药情况 (path=3)
374, -- 发药统计 (path=2)
376, -- 院内库房情况查询报表 (path=4)
377, -- 院内收入报表 (path=5)
385, -- 门诊收费结算缴费报表 (path=1)
387, -- 医保费用查询 (path=1)
388, -- 医药机构费用结算总账 (path=2)
389, -- 医保目录基础信息 (path=3)
390, -- 省医保 (path=1)
391, -- 市医保 (path=2)
394, -- 医保结算 (path=3)
395, -- 医保诊疗目录 (path=1)
396, -- 医保病种目录 (path=2)
397, -- 医保手术编码目录 (path=3)
398, -- 医保药品目录 (path=4)
399, -- 医保目录自动更新 (path=5)
400, -- 医保信息手动对照 (path=4)
401, -- DRG结算上传管理 (path=5)
402, -- DRG智控结果管理 (path=6)
403, -- 医保进销存查询管理 (path=7)
404, -- 医保诊疗目录对账 (path=1)
405, -- 医保手术目录对照 (path=2)
406, -- 医保病种目录对账 (path=3)
407, -- 医保药品目录对照 (path=4)
408, -- DRG医保结算上传 (path=1)
409, -- DRG自费结算上传 (path=2)
410, -- DRG质控结果与相关信息 (path=1)
411, -- 3507商品删除 (path=1)
412, -- 3508库存查询 (path=2)
413, -- 3509库存变更记录查询 (path=3)
414, -- 3510采购信息查询 (path=4)
415, -- 3511销售信息查询 (path=5)
416, -- 3512入库商品追溯信息查询 (path=6)
417, -- 3513销售商品追溯信息查询 (path=7)
418, -- 接口管理 (path=1)
419, -- 电子发票 (path=1)
420, -- LIS (path=2)
421, -- PASC (path=3)
422, -- DRG系统接口 (path=4)
423, -- 工伤接口 (path=5)
2069, -- 目录对照-待开发 (component=vue)
2070, -- LIS对照 (component=vue)
2071, -- PACS对照 (component=vue)
2072, -- 诊断对照 (component=vue)
2075, -- 收费规则配置-待开发
2162, -- 门户(统计) (path=portal3)
20227 -- 住院门户(增强) (path=portal)
);
-- 2. 启用已有正确实现的菜单
UPDATE healthlink_his.sys_menu SET status = '0', visible = '0' WHERE menu_id IN (
294, -- 费用清单 (component=inHospitalManagement/listFee/index)
337, -- 调价审核管理 (component=priceAdjustmentApprovalManagement)
343, -- 门诊发药 (component=pharmacymanagement/westernmedicine/index)
344, -- 门诊退药 (component=clinicmanagement/returnDrug/index)
2095, -- 调价申请管理 (component=priceAdjustmentManagement)
2099, -- 调价单审批 (component=priceAdjustmentFormApproval)
2101, -- 住院发退药 (component=drug/inpatientMedicationDispensing/index)
20229, -- 盈亏记录 (component=adjustmentProfitLossRecord)
20230, -- 科室盘点 (component=chkstockPartDeptDevice)
20231, -- 日结管理 (component=dayEndSettlement)
20232, -- 医保目录更新 (component=medicalInsuranceCatalogUpdate)
20233, -- 发药单 (component=dispensingOrder)
20234, -- 盈亏单 (component=profitLossOrder)
20235, -- 领用单 (component=requisitionOrder)
20236, -- 退药回药房 (component=returnToDispensaryOrder)
20237, -- 入库单 (component=stockInOrder)
20238, -- 盘点单 (component=stocktakingOrder)
20239, -- 调入单 (component=transferInOrder)
20240, -- 调出单 (component=transferOutOrder)
20241, -- 西药房 (component=westernmedicine)
20242 -- 药房库存预警 (component=stockalert)
);
-- 3. 修正path（保留status不变，只修正路径）
UPDATE healthlink_his.sys_menu SET path = 'listFee' WHERE menu_id = 294;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-surgery' WHERE menu_id = 291;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-medical-record' WHERE menu_id = 293;
UPDATE healthlink_his.sys_menu SET path = 'nurse-skin-test' WHERE menu_id = 303;
UPDATE healthlink_his.sys_menu SET path = 'nurse-drug-return' WHERE menu_id = 305;
UPDATE healthlink_his.sys_menu SET path = 'nurse-surgery-record' WHERE menu_id = 306;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-fee-manage' WHERE menu_id = 308;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-charge-detail' WHERE menu_id = 311;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-midway-settle' WHERE menu_id = 312;
UPDATE healthlink_his.sys_menu SET path = 'inpatient-portal' WHERE menu_id = 20227;
UPDATE healthlink_his.sys_menu SET path = 'stat-portal' WHERE menu_id = 2162;
UPDATE healthlink_his.sys_menu SET path = 'stock-balance' WHERE menu_id = 341;
-- 4. 修正报表管理子菜单的path（虽然已禁用，但保持数据整洁）
UPDATE healthlink_his.sys_menu SET path = 'revenue-detail' WHERE menu_id = 361;
UPDATE healthlink_his.sys_menu SET path = 'workload-stats' WHERE menu_id = 362;
UPDATE healthlink_his.sys_menu SET path = 'fee-overview' WHERE menu_id = 363;
UPDATE healthlink_his.sys_menu SET path = 'provincial-insurance' WHERE menu_id = 364;
UPDATE healthlink_his.sys_menu SET path = 'municipal-insurance' WHERE menu_id = 365;
UPDATE healthlink_his.sys_menu SET path = 'self-pay' WHERE menu_id = 366;
UPDATE healthlink_his.sys_menu SET path = 'student-pay' WHERE menu_id = 367;
UPDATE healthlink_his.sys_menu SET path = 'doctor-workload' WHERE menu_id = 369;
UPDATE healthlink_his.sys_menu SET path = 'tech-workload' WHERE menu_id = 370;
UPDATE healthlink_his.sys_menu SET path = 'nurse-workload' WHERE menu_id = 371;
UPDATE healthlink_his.sys_menu SET path = 'pharmacy-dispensing' WHERE menu_id = 372;
UPDATE healthlink_his.sys_menu SET path = 'dispensing-stats' WHERE menu_id = 374;
UPDATE healthlink_his.sys_menu SET path = 'warehouse-status' WHERE menu_id = 376;
UPDATE healthlink_his.sys_menu SET path = 'income-report' WHERE menu_id = 377;
UPDATE healthlink_his.sys_menu SET path = 'clinic-charge-report' WHERE menu_id = 385;
-- 5. 修正医保管理子菜单的path
UPDATE healthlink_his.sys_menu SET path = 'yb-settlement' WHERE menu_id = 358;
UPDATE healthlink_his.sys_menu SET path = 'yb-reconciliation' WHERE menu_id = 359;
UPDATE healthlink_his.sys_menu SET path = 'insurance-query' WHERE menu_id = 387;
UPDATE healthlink_his.sys_menu SET path = 'settlement-ledger' WHERE menu_id = 388;
UPDATE healthlink_his.sys_menu SET path = 'catalog-base' WHERE menu_id = 389;
UPDATE healthlink_his.sys_menu SET path = 'provincial' WHERE menu_id = 390;
UPDATE healthlink_his.sys_menu SET path = 'municipal' WHERE menu_id = 391;
UPDATE healthlink_his.sys_menu SET path = 'yb-settlement-detail' WHERE menu_id = 394;
UPDATE healthlink_his.sys_menu SET path = 'treatment-catalog' WHERE menu_id = 395;
UPDATE healthlink_his.sys_menu SET path = 'disease-catalog' WHERE menu_id = 396;
UPDATE healthlink_his.sys_menu SET path = 'surgery-catalog' WHERE menu_id = 397;
UPDATE healthlink_his.sys_menu SET path = 'drug-catalog' WHERE menu_id = 398;
UPDATE healthlink_his.sys_menu SET path = 'auto-update' WHERE menu_id = 399;
UPDATE healthlink_his.sys_menu SET path = 'manual-mapping' WHERE menu_id = 400;
UPDATE healthlink_his.sys_menu SET path = 'drg-upload' WHERE menu_id = 401;
UPDATE healthlink_his.sys_menu SET path = 'drg-control' WHERE menu_id = 402;
UPDATE healthlink_his.sys_menu SET path = 'inventory-query' WHERE menu_id = 403;
UPDATE healthlink_his.sys_menu SET path = 'treatment-mapping' WHERE menu_id = 404;
UPDATE healthlink_his.sys_menu SET path = 'surgery-mapping' WHERE menu_id = 405;
UPDATE healthlink_his.sys_menu SET path = 'disease-mapping' WHERE menu_id = 406;
UPDATE healthlink_his.sys_menu SET path = 'drug-mapping' WHERE menu_id = 407;
UPDATE healthlink_his.sys_menu SET path = 'drg-insurance' WHERE menu_id = 408;
UPDATE healthlink_his.sys_menu SET path = 'drg-selfpay' WHERE menu_id = 409;
UPDATE healthlink_his.sys_menu SET path = 'drg-quality' WHERE menu_id = 410;
UPDATE healthlink_his.sys_menu SET path = 'product-delete' WHERE menu_id = 411;
UPDATE healthlink_his.sys_menu SET path = 'stock-query' WHERE menu_id = 412;
UPDATE healthlink_his.sys_menu SET path = 'stock-change' WHERE menu_id = 413;
UPDATE healthlink_his.sys_menu SET path = 'purchase-query' WHERE menu_id = 414;
UPDATE healthlink_his.sys_menu SET path = 'sale-query' WHERE menu_id = 415;
UPDATE healthlink_his.sys_menu SET path = 'inbound-trace' WHERE menu_id = 416;
UPDATE healthlink_his.sys_menu SET path = 'sale-trace' WHERE menu_id = 417;
-- 6. 修正接口管理子菜单的path
UPDATE healthlink_his.sys_menu SET path = 'interface-management' WHERE menu_id = 418;
UPDATE healthlink_his.sys_menu SET path = 'e-invoice' WHERE menu_id = 419;
UPDATE healthlink_his.sys_menu SET path = 'lis-interface' WHERE menu_id = 420;
UPDATE healthlink_his.sys_menu SET path = 'pacs-interface' WHERE menu_id = 421;
UPDATE healthlink_his.sys_menu SET path = 'drg-interface' WHERE menu_id = 422;
UPDATE healthlink_his.sys_menu SET path = 'work-injury' WHERE menu_id = 423;
-- 7. 禁用仪表盘菜单（C类型+parent_id=0导致路由冲突Invalid path 'dashboard'）
UPDATE healthlink_his.sys_menu SET status = '1', visible = '1' WHERE menu_id = 20266;
-- 8. 删除确认重复的禁用菜单
-- 216 挂号收费项目 → 与245门诊号源管理完全相同
-- 229 患者列表 → 与217门诊医生站相同component
-- 305 退药管理 → 与20183退药管理重复
-- 308 费用管理 → 与20260费用管理重复
-- 341 库存结余 → 与382库存商品明细查询报表相同component
-- 358 医保结算 → 与20248医保结算重复
-- 359 医保对账 → 与392医保对账重复
-- 394 医保结算 → 与20248医保结算重复
DELETE FROM healthlink_his.sys_role_menu WHERE menu_id IN (216, 229, 305, 308, 341, 358, 359, 394);
DELETE FROM healthlink_his.sys_menu WHERE menu_id IN (216, 229, 305, 308, 341, 358, 359, 394);
-- 9. 修正V10新增菜单的is_frame值（原始菜单是'1'，新增菜单错误设为'0'导致路由路径缺少/前缀）
-- getRouterPath()方法只在is_frame='1'时才为顶级目录添加/前缀
UPDATE healthlink_his.sys_menu SET is_frame = '1' WHERE menu_id >= 20001 AND is_frame = '0';
-- 10. 启用标准系统管理菜单
UPDATE healthlink_his.sys_menu SET status = '0', visible = '0' WHERE menu_id IN (103, 104, 106, 115);
-- 11. 删除重复/无用菜单
DELETE FROM healthlink_his.sys_role_menu WHERE menu_id IN (2162, 20227, 20266, 300);
DELETE FROM healthlink_his.sys_menu WHERE menu_id IN (2162, 20227, 20266, 300);