fix(#768): 请修复 Bug #768（诸葛亮分析完成，分配给你）

vxe-table 的 min-width/width 仅接受纯数字，带 px/% 单位的设置会被
  静默忽略。统一去掉 vxe-column/vxe-table 上的 px 后缀，将百分比
  min-width 改为 width（vxe 的 width 支持百分比字符串）。

MD/MODULE_INDEX.md

@@ -1,7 +1,7 @@
 # HealthLink-HIS 代码模块索引
 
 > 供 LLM 快速定位代码。每个模块列出 Controller → Service → Mapper 关键文件。
-> 最后更新: 2026-06-17 12:00 (301 个 Controller)
+> 最后更新: 2026-06-18 12:00 (309 个 Controller)
 
 ## 关键词 → 模块速查
 

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/consultation/controller/ConsultationController.java

@@ -294,7 +294,7 @@ public class ConsultationController {
     @Operation(summary = "获取会诊意见列表")
     @GetMapping("/confirmation/opinions")
     public R<List<ConsultationOpinionDto>> getConsultationOpinions(
-            @Parameter(description = "会诊申请单号") @RequestParam String consultationId) {
+            @Parameter(description = "会诊申请单号") @RequestParam(required = false) String consultationId) {
         try {
             List<ConsultationOpinionDto> opinions = consultationAppService.getConsultationOpinions(consultationId);
             return R.ok(opinions);

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/ElepMedicationInfoDto.java

@@ -67,6 +67,11 @@ public class ElepMedicationInfoDto {
     /** 诊断id */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long conditionId;
+    /** 诊断定义id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionDefId;
+    /** 慢病诊断编码 */
+    private String opspDiseCode;
     /** 药品版本号 */
     private String version;
 }

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/appservice/impl/InHospitalRegisterAppServiceImpl.java

@@ -176,9 +176,10 @@ public class InHospitalRegisterAppServiceImpl implements IInHospitalRegisterAppS
             String searchKey, String registeredFlag, Integer pageNo, Integer pageSize,
             Date startTime, Date endTime, Long organizationId, String idCard, HttpServletRequest request) {
         Integer encounterStatus = EncounterZyStatus.TO_BE_REGISTERED.getValue(); // 待登记
-        // startTime/endTime 直接传给 Mapper XML 参数，不通过 QueryWrapper
-        inHospitalRegisterQueryDto.setStartTime(null);
-        inHospitalRegisterQueryDto.setEndTime(null);
+        // 清除过滤条件字段，避免 HisQueryUtils.buildQueryWrapper 生成无效的外部 SQL 条件（这些条件已在 Mapper XML 内部实现）
+        inHospitalRegisterQueryDto.setStartTime(null)
+                .setEndTime(null)
+                .setOrganizationId(null);
         // 构建查询条件
         QueryWrapper<InHospitalRegisterQueryDto> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inHospitalRegisterQueryDto, searchKey,

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalcharge/dto/InHospitalRegisterQueryDto.java

@@ -55,6 +55,16 @@ public class InHospitalRegisterQueryDto {
      */
     private String patientName;
 
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 入院科室
+     */
+    private String organizationName;
+
     /**
      * 性别编码
      */
@@ -120,14 +130,4 @@ public class InHospitalRegisterQueryDto {
      */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizationId;
-
-    /**
-     * 身份证号
-     */
-    private String idCard;
-
-    /**
-     * 入院科室名称
-     */
-    private String organizationName;
 }

healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/personalization/dto/OrdersGroupPackageDto.java

@@ -37,7 +37,7 @@ public class OrdersGroupPackageDto {
     /**
      * 名称
      */
-    private String Name;
+    private String name;
 
     /**
      * 明细集合

healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V66__bug723_fix_duplicate_menu_doctor_enhanced.sql

@@ -0,0 +1,10 @@
+-- V66: 修复 Bug#723 — 删除 sys_menu 中重复的"住院医生增强"菜单条目
+-- 根因：sys_menu 表中存在两条 menu_name = '住院医生增强' 且 parent_id 相同的记录
+-- 修复：保留 menu_id 最小的一条（20171），删除其余重复记录
+DELETE FROM sys_menu
+WHERE menu_name = '住院医生增强'
+  AND menu_id NOT IN (
+      SELECT MIN(menu_id)
+      FROM sys_menu
+      WHERE menu_name = '住院医生增强'
+  );

healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V67__update_menu_icons.sql

@@ -0,0 +1,426 @@
+-- V67__update_menu_icons.sql
+-- 更新菜单图标 - 根据菜单功能名称匹配合适的图标
+-- 仅使用 src/assets/icons/svg/ 目录下实际存在的图标
+
+SET search_path TO healthlink_his;
+
+-- ========== 一级菜单（顶级目录）==========
+UPDATE sys_menu SET icon = 'system' WHERE menu_id = 1;          -- 系统管理
+UPDATE sys_menu SET icon = 'outpatient' WHERE menu_id = 270;    -- 门诊管理
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 2078;      -- 收费工作站
+UPDATE sys_menu SET icon = 'inpatient' WHERE menu_id = 235;     -- 住院管理
+UPDATE sys_menu SET icon = 'doctor' WHERE menu_id = 2084;       -- 门诊医生工作站
+UPDATE sys_menu SET icon = 'pharmacy' WHERE menu_id = 2079;     -- 药房管理
+UPDATE sys_menu SET icon = 'inventory' WHERE menu_id = 313;     -- 库房管理
+UPDATE sys_menu SET icon = 'drug-dispensing' WHERE menu_id = 342; -- 发药管理
+UPDATE sys_menu SET icon = 'finance' WHERE menu_id = 350;       -- 财务管理
+UPDATE sys_menu SET icon = 'report' WHERE menu_id = 360;        -- 报表管理
+UPDATE sys_menu SET icon = 'insurance' WHERE menu_id = 386;     -- 医保管理
+UPDATE sys_menu SET icon = 'connection' WHERE menu_id = 418;    -- 接口管理
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 268;          -- 药库管理
+UPDATE sys_menu SET icon = 'consultation' WHERE menu_id = 2147; -- 会诊管理
+UPDATE sys_menu SET icon = 'appointment' WHERE menu_id = 2092;  -- 预约管理
+UPDATE sys_menu SET icon = 'tool' WHERE menu_id = 2083;         -- 维护系统
+UPDATE sys_menu SET icon = 'anesthesia' WHERE menu_id = 20001;  -- 麻醉管理
+UPDATE sys_menu SET icon = 'medication' WHERE menu_id = 20011;  -- 合理用药
+UPDATE sys_menu SET icon = 'emergency' WHERE menu_id = 20021;   -- 急诊管理
+UPDATE sys_menu SET icon = 'nursing' WHERE menu_id = 20031;     -- 护理管理
+UPDATE sys_menu SET icon = 'pathology' WHERE menu_id = 20041;   -- 病理管理
+UPDATE sys_menu SET icon = 'triage' WHERE menu_id = 2110;       -- 分诊排队管理
+UPDATE sys_menu SET icon = 'medical-record' WHERE menu_id = 20051; -- 病案管理
+UPDATE sys_menu SET icon = 'radiology' WHERE menu_id = 20061;   -- 影像管理
+UPDATE sys_menu SET icon = 'follow-up' WHERE menu_id = 20071;   -- 随访管理
+UPDATE sys_menu SET icon = 'monitor' WHERE menu_id = 20081;     -- ESB管理
+UPDATE sys_menu SET icon = 'laboratory' WHERE menu_id = 20091;  -- 检查检验
+UPDATE sys_menu SET icon = 'consent' WHERE menu_id = 20101;     -- 知情同意管理
+UPDATE sys_menu SET icon = 'order' WHERE menu_id = 20111;       -- 医嘱闭环
+UPDATE sys_menu SET icon = 'audit' WHERE menu_id = 20131;       -- 审核管理
+UPDATE sys_menu SET icon = 'teamwork' WHERE menu_id = 20141;    -- 跨模块协同
+UPDATE sys_menu SET icon = 'sample' WHERE menu_id = 20151;      -- 标本管理
+UPDATE sys_menu SET icon = 'report' WHERE menu_id = 2159;       -- 疾病报告管理
+UPDATE sys_menu SET icon = 'standard' WHERE menu_id = 20161;    -- FHIR/CDA标准
+UPDATE sys_menu SET icon = 'emr' WHERE menu_id = 20201;         -- 电子病历管理
+UPDATE sys_menu SET icon = 'laboratory' WHERE menu_id = 20211;  -- 检验增强
+UPDATE sys_menu SET icon = 'infection' WHERE menu_id = 10001;   -- 院感管理
+UPDATE sys_menu SET icon = 'log' WHERE menu_id = 10011;         -- 药品追溯管理
+UPDATE sys_menu SET icon = 'edit' WHERE menu_id = 10021;        -- 电子签名管理
+UPDATE sys_menu SET icon = 'alert' WHERE menu_id = 10031;       -- 危急值管理
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 10041;     -- 患者主索引(EMPI)
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 10051;     -- 质量管理
+UPDATE sys_menu SET icon = 'shopping' WHERE menu_id = 10061;    -- 手术安全核查
+UPDATE sys_menu SET icon = 'guide' WHERE menu_id = 10071;       -- 临床路径
+UPDATE sys_menu SET icon = 'surgery' WHERE menu_id = 2119;      -- 手术管理
+UPDATE sys_menu SET icon = 'user' WHERE menu_id = 2140;         -- 患者管理
+UPDATE sys_menu SET icon = 'monitor' WHERE menu_id = 2;         -- 系统监控
+UPDATE sys_menu SET icon = 'tool' WHERE menu_id = 3;            -- 系统工具
+UPDATE sys_menu SET icon = 'log' WHERE menu_id = 108;           -- 日志管理
+
+-- ========== 系统管理子菜单（parent_id = 1）==========
+UPDATE sys_menu SET icon = 'user' WHERE menu_id = 100;          -- 用户管理
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 101;       -- 角色管理
+UPDATE sys_menu SET icon = 'post' WHERE menu_id = 104;          -- 岗位管理
+UPDATE sys_menu SET icon = 'system' WHERE menu_id = 102;        -- 菜单管理
+UPDATE sys_menu SET icon = 'tree-table' WHERE menu_id = 103;    -- 部门管理
+UPDATE sys_menu SET icon = 'dict' WHERE menu_id = 105;          -- 字典管理
+UPDATE sys_menu SET icon = 'edit' WHERE menu_id = 106;          -- 参数设置
+UPDATE sys_menu SET icon = 'message' WHERE menu_id = 107;       -- 通知公告
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 2107;      -- 租户管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 200;          -- 目录管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 211;          -- 基础数据
+UPDATE sys_menu SET icon = 'edit' WHERE menu_id = 2073;         -- 业务规则配置
+UPDATE sys_menu SET icon = 'edit' WHERE menu_id = 2074;         -- 易用性配置
+
+-- ========== 系统监控子菜单（parent_id = 2）==========
+UPDATE sys_menu SET icon = 'online' WHERE menu_id = 109;        -- 在线用户
+UPDATE sys_menu SET icon = 'job' WHERE menu_id = 110;           -- 定时任务
+UPDATE sys_menu SET icon = 'druid' WHERE menu_id = 111;         -- 数据监控
+UPDATE sys_menu SET icon = 'server' WHERE menu_id = 112;        -- 服务监控
+UPDATE sys_menu SET icon = 'monitor' WHERE menu_id = 113;       -- 缓存监控
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 114;          -- 缓存列表
+
+-- ========== 系统工具子菜单（parent_id = 3）==========
+UPDATE sys_menu SET icon = 'form' WHERE menu_id = 115;          -- 表单构建
+UPDATE sys_menu SET icon = 'code' WHERE menu_id = 116;          -- 代码生成
+UPDATE sys_menu SET icon = 'swagger' WHERE menu_id = 117;       -- 系统接口
+
+-- ========== 日志管理子菜单（parent_id = 108）==========
+UPDATE sys_menu SET icon = 'log' WHERE menu_id = 500;           -- 操作日志
+UPDATE sys_menu SET icon = 'log' WHERE menu_id = 501;           -- 登录日志
+UPDATE sys_menu SET icon = 'log' WHERE menu_id = 20265;         -- 审计日志
+
+-- ========== 住院管理子菜单（parent_id = 235）==========
+UPDATE sys_menu SET icon = 'doctor' WHERE menu_id = 288;        -- 住院医生工作站
+UPDATE sys_menu SET icon = 'nurse' WHERE menu_id = 295;         -- 住院护士站
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 307;       -- 住院收费工作站
+UPDATE sys_menu SET icon = 'doctor' WHERE menu_id = 20171;      -- 住院医生增强
+UPDATE sys_menu SET icon = 'nurse' WHERE menu_id = 20181;       -- 住院护士增强
+UPDATE sys_menu SET icon = 'hospital' WHERE menu_id = 20221;    -- 住院辅助
+
+-- ========== 门诊管理子菜单（parent_id = 270）==========
+UPDATE sys_menu SET icon = 'doctor' WHERE menu_id = 269;        -- 门诊工作站
+UPDATE sys_menu SET icon = 'laboratory' WHERE menu_id = 277;    -- 医技工作站
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 282;       -- 门诊收费工作站
+UPDATE sys_menu SET icon = 'outpatient' WHERE menu_id = 20191;  -- 门诊增强
+
+-- ========== 收费工作站子菜单（parent_id = 2078）==========
+UPDATE sys_menu SET icon = 'clipboard' WHERE menu_id = 225;     -- 门诊挂号
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 233;       -- 门诊收费
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 234;       -- 门诊退费
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 286;       -- 门诊日结
+UPDATE sys_menu SET icon = 'doctor' WHERE menu_id = 236;        -- 住院登记
+UPDATE sys_menu SET icon = 'money' WHERE menu_id = 239;         -- 预交金管理
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 261;       -- 收费记录
+UPDATE sys_menu SET icon = 'billing' WHERE menu_id = 2060;      -- 出院结算
+
+-- ========== 药房管理子菜单（parent_id = 2079）==========
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 343;          -- 门诊发药
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 344;          -- 门诊退药
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 345;          -- 住院发药-待开发
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 346;          -- 住院汇总发药-待开发
+UPDATE sys_menu SET icon = 'drug' WHERE menu_id = 348;          -- 住院退药-待开发
+
+-- ========== 库房管理子菜单（parent_id = 313）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 314;          -- 货位管理-待开发
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 316;          -- 采购管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 317;          -- 盘点管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 318;          -- 领用管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 319;          -- 调拨管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 320;          -- 报损管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 321;          -- 调价管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 322;          -- 统计管理
+
+-- ========== 财务管理子菜单（parent_id = 350）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 351;          -- 门诊财务
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 352;          -- 药房财务
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 353;          -- 医保财务
+
+-- ========== 住院护士站子菜单（parent_id = 295）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 296;          -- 门户
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 297;          -- 入出转管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 298;          -- 护理记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 299;          -- 三测单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2061;         -- 医嘱执行
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2064;         -- 医嘱校对
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 301;          -- 汇总发药申请
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 302;          -- 住院记账
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 303;          -- 皮试管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 276;          -- 医嘱查看与打印
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 304;          -- 出院管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 305;          -- 退药管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 306;          -- 手术记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2062;         -- 住院领药
+
+-- ========== 门诊工作站子菜单（parent_id = 269）==========
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 229;       -- 患者列表
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 272;          -- 门诊退药
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 274;          -- 门诊退号
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2059;         -- 历史处方
+
+-- ========== 门诊收费工作站子菜单（parent_id = 282）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 283;          -- 门诊收费
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 284;          -- 门诊退费
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 285;          -- 门诊划价
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 287;          -- 收费详情查询
+
+-- ========== 药库管理子菜单（parent_id = 268）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2049;         -- 药库订货单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2051;         -- 药库进货单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2050;         -- 药库退货单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2053;         -- 药库出库单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2054;         -- 药库退库单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2055;         -- 药库损益单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2056;         -- 药库盘点单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2058;         -- 库房单据管理
+
+-- ========== 住院医生工作站子菜单（parent_id = 2084）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2114;         -- 医生常用语
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2143;         -- 今日门诊
+UPDATE sys_menu SET icon = 'excel' WHERE menu_id = 217;         -- 门诊医生站
+
+-- ========== 预约管理子菜单（parent_id = 2092）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2105;         -- 医生排班管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20256;        -- 医生排班
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2097;         -- 门诊出诊医生诊室设置
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2112;         -- 科室预约工作时间维护
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2113;         -- 门诊预约挂号
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2094;         -- 预约管理2
+
+-- ========== 分诊排队管理子菜单（parent_id = 2110）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2118;         -- 叫号显示屏
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2145;         -- 智能分诊排队管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2116;         -- 叫号语音设置
+
+-- ========== 手术管理子菜单（parent_id = 2119）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2152;         -- 门诊手术安排
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2120;         -- 手术管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20244;        -- 术前讨论
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2144;         -- 手术室管理
+
+-- ========== 患者管理子菜单（parent_id = 2140）==========
+UPDATE sys_menu SET icon = 'peoples' WHERE menu_id = 2141;      -- 患者列表
+UPDATE sys_menu SET icon = 'people' WHERE menu_id = 2142;       -- 门诊就诊记录
+
+-- ========== 会诊管理子菜单（parent_id = 2147）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2153;         -- 门诊会诊申请确认
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2161;         -- 门诊会诊申请管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20251;        -- 会诊申请
+
+-- ========== 院感管理子菜单（parent_id = 10001）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10002;        -- 感染病例监测
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10003;        -- 手卫生监测
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10004;        -- 环境监测
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10005;        -- 抗菌药物使用
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10006;        -- 多重耐药菌
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10007;        -- 职业暴露
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10008;        -- 疫情预警
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10009;        -- 目标性监测
+
+-- ========== 药品追溯管理子菜单（parent_id = 10011）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10012;        -- 追溯码管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10013;        -- 批次管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10014;        -- 扫码记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10015;        -- 追溯预警
+
+-- ========== 电子签名管理子菜单（parent_id = 10021）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10022;        -- 签名记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10023;        -- 签名统计
+
+-- ========== 危急值管理子菜单（parent_id = 10031）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10032;        -- 危急值处理
+
+-- ========== 患者主索引(EMPI)子菜单（parent_id = 10041）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10042;        -- 患者查询
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10043;        -- 合并管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10044;        -- EMPI统计
+
+-- ========== 质量管理子菜单（parent_id = 10051）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10052;        -- 质量指标
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10053;        -- EMR质控
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10054;        -- 业务分析
+
+-- ========== 手术安全核查子菜单（parent_id = 10061）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10062;        -- 三方核查
+
+-- ========== 临床路径子菜单（parent_id = 10071）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 10072;        -- 路径管理
+
+-- ========== 麻醉管理子菜单（parent_id = 20001）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20002;        -- 麻醉记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20003;        -- 麻醉增强
+
+-- ========== 合理用药子菜单（parent_id = 20011）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20012;        -- 抗菌药物规则
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20013;        -- 药物相互作用
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20014;        -- 审核日志
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20015;        -- 合理用药统计
+
+-- ========== 急诊管理子菜单（parent_id = 20021）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20022;        -- 急诊分诊
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20023;        -- 急诊抢救
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20024;        -- 急诊观察
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20025;        -- 绿色通道
+
+-- ========== 护理管理子菜单（parent_id = 20031）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20032;        -- 护理评估
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20033;        -- 护理增强
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20034;        -- 护理执行
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20035;        -- 护理质量
+UPDATE sys_menu SET icon = 'chart' WHERE menu_id = 20036;       -- 生命体征图表
+
+-- ========== 病理管理子菜单（parent_id = 20041）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20042;        -- 病理医嘱
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20043;        -- 病理报告
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20044;        -- 病理标本
+
+-- ========== 病案管理子菜单（parent_id = 20051）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20052;        -- 病案管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20053;        -- 病案首页管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20054;        -- DRG分析
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20055;        -- 病案统计
+
+-- ========== 影像管理子菜单（parent_id = 20061）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20062;        -- 影像增强
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20063;        -- 影像对比
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20064;        -- 3D重建
+
+-- ========== 随访管理子菜单（parent_id = 20071）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20072;        -- 随访计划
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20073;        -- 随访记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20074;        -- 随访任务
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20075;        -- 随访调查
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20076;        -- 投诉管理
+
+-- ========== ESB管理子菜单（parent_id = 20081）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20082;        -- 服务注册
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20083;        -- 消息管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20084;        -- 监控统计
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20085;        -- 可靠性管理
+
+-- ========== 检查检验子菜单（parent_id = 20091）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20092;        -- 检查申请
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20093;        -- 检查仪器
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20094;        -- LIS配置
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20095;        -- 检验组套
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20096;        -- 标本采集
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20097;        -- 标本类型
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20098;        -- 观察项目
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20099;        -- 检验增强
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20100;        -- 检验ICD10
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20102;        -- 检验预约
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20103;        -- 检验路径
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20104;        -- 参考范围
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20105;        -- 放射报告
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20106;        -- 检验历史
+
+-- ========== 知情同意管理子菜单（parent_id = 20101）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20107;        -- 知情同意
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20108;        -- ID验证
+
+-- ========== 医嘱闭环子菜单（parent_id = 20111）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20112;        -- 执行追踪
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20113;        -- 闭环统计
+
+-- ========== 消毒供应中心子菜单（parent_id = 20121）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20122;        -- 消毒追溯
+
+-- ========== 审核管理子菜单（parent_id = 20131）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20133;        -- 点评计划
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20132;        -- 审核统计
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20134;        -- 点评工作台
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20135;        -- 点评记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20136;        -- 医生排名
+
+-- ========== 跨模块协同子菜单（parent_id = 20141）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20142;        -- 会诊反馈
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20143;        -- 会诊超时
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20144;        -- DRG绩效
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20145;        -- 药品效期
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20146;        -- 增强救护
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20147;        -- 增强抗菌
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20148;        -- 增强知情
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20149;        -- DRG预警
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20150;        -- 增强护理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20152;        -- 交接统计
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20153;        -- 检验预警
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20154;        -- 病案质量
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20155;        -- 护士执行
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20156;        -- 报告反馈
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20157;        -- 审核统计
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20158;        -- 库存拦截
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20159;        -- 手术闭环
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20160;        -- 手术关联
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20162;        -- 患者转运
+
+-- ========== 标本管理子菜单（parent_id = 20151）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20163;        -- 标本条码
+
+-- ========== FHIR/CDA标准子菜单（parent_id = 20161）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20164;        -- FHIR/CDA
+
+-- ========== 住院医生增强子菜单（parent_id = 20171）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20172;        -- 住院病历
+
+-- ========== 住院护士增强子菜单（parent_id = 20181）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20182;        -- 护士工作站
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20183;        -- 退药管理
+UPDATE sys_MENU SET icon = 'list' WHERE menu_id = 20184;        -- 滚费管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20185;        -- TPR表
+
+-- ========== 门诊增强子菜单（parent_id = 20191）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20192;        -- 门诊增强
+
+-- ========== 电子病历管理子菜单（parent_id = 20201）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20202;        -- 病案归档
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20203;        -- 修订历史
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20204;        -- 病历时效
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20205;        -- 病历检索
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20206;        -- 进程记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20207;        -- 知识库
+
+-- ========== 住院辅助子菜单（parent_id = 20221）==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20222;        -- 住院结算
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20223;        -- 费用类型转换
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20224;        -- 住院诊断
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20225;        -- 住院病历
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20226;        -- 医嘱管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20228;        -- 住院手术
+
+-- ========== 其他零散菜单 ==========
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 9999;         -- 门诊换卡
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 349;          -- 电子处方审批
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20243;        -- 住院发药
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20249;        -- 会诊收费
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20250;        -- 会诊确认
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20252;        -- 挂号记录
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20253;        -- 排班管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20254;        -- 手术收费
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20255;        -- 三方支付
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 310;          -- 住院日结-待开发
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20257;        -- 床位管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20258;        -- 体表结构
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20259;        -- 常用诊断
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20260;        -- 费用管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20261;        -- 位置管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20262;        -- 医嘱组合
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20263;        -- 中医处方
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20233;        -- 发药单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20234;        -- 盈亏单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20235;        -- 领用单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20236;        -- 退药回药房
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20237;        -- 入库单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20238;        -- 盘点单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20239;        -- 调入单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20240;        -- 调出单
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20241;        -- 西药房
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20242;        -- 药房库存预警
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20245;        -- 医保目录管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20246;        -- 住院医保登记
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20247;        -- 医保信息
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20248;        -- 医保结算
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20264;        -- API认证
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2152;         -- 门诊手术安排
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2120;         -- 手术管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 20244;        -- 术前讨论
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2144;         -- 手术室管理
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2093;         -- 药房月结
+UPDATE sys_menu SET icon = 'list' WHERE menu_id = 2066;         -- 药房月结

healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationElepPrescriptionMapper.xml

@@ -400,6 +400,8 @@
                T1.rx_type_code,                            --处方类别
                T1.rx_item_type_code,                       --处方项目类别
                T1.condition_id,                            --诊断id
+               T1.condition_def_id,                       --诊断定义id
+               T1.opsp_dise_code,                         --慢病诊断编码
                T1.version                                  --药品版本号
         FROM elep_medication_request AS T1
                  LEFT JOIN yb_catalog_drug_info AS T2
@@ -427,6 +429,8 @@
                  T1.rx_type_code,
                  T1.rx_item_type_code,
                  T1.condition_id,
+                 T1.condition_def_id,
+                 T1.opsp_dise_code,
                  T1.version
     </select>
     <select id="selectSaveInfo" resultType="com.healthlink.his.web.doctorstation.dto.ElepPrescriptionInfoParam">

healthlink-his-ui/src/views/basicmanage/medicalOrderSet/components/MedicalOrderSetDialog.vue

@@ -131,7 +131,7 @@
       <vxe-column
         title="类型"
         align="center"
-        width="120"
+        width="160"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -205,7 +205,6 @@
         title="单次剂量"
         align="center"
         width="250"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -214,11 +213,7 @@
               <el-input
                 v-model="scope.row.doseQuantity"
                 style="width: 70px; margin-right: 10px"
-                @input="
-                  (value) => {
-                    scope.row.dose = value * scope.row.unitConversionRatio;
-                  }
-                "
+                @input="(value) => handleDoseQuantityChange(value, scope.row)"
               />
               <span>
                 {{
@@ -232,11 +227,7 @@
               <el-input
                 v-model="scope.row.dose"
                 style="width: 70px; margin-right: 10px"
-                @input="
-                  (value) => {
-                    scope.row.doseQuantity = value / scope.row.unitConversionRatio;
-                  }
-                "
+                @input="(value) => handleDoseChange(value, scope.row)"
               />
               <span>
                 {{
@@ -260,7 +251,6 @@
         title="给药途径"
         align="center"
         width="150"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -292,7 +282,6 @@
         title="用药频次"
         align="center"
         width="150"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -324,7 +313,6 @@
         title="用药天数"
         align="center"
         width="100"
-        field="sortNumber"
       >
         <template #default="scope">
           <template v-if="!scope.row.groupPackageId">
@@ -547,8 +535,7 @@ function openAdd(tab) {
   } else if (tab === 'department') {
     formData.organizationId = userStore.orgId;
   }
-
-  addEmptyRow();
+  // 不再默认新增空行，用户点击"新增"按钮时才添加
 }
 
 function handleRangeChange(tab) {
@@ -680,7 +667,7 @@ function openEdit(tab, row) {
       };
     });
     nextId.value = prescriptionList.value.length + 1;
-    addEmptyRow();
+    // 不再默认新增空行，用户点击"新增"按钮时才添加
   });
 }
 
@@ -939,8 +926,9 @@ function selectAdviceBase(key, row) {
     JSON.stringify(row)
   ).chargeItemDefinitionId;
   prescriptionList.value[rowIndex.value].therapyEnum = preservedTherapyEnum;
-  addEmptyRow();
-  expandOrder.value = [key];
+  // 不再自动新增空行，用户点击"新增"按钮时才添加
+  // 强制触发 vxe-table v4 响应式更新（v4 不响应数组元素直接索引赋值）
+  prescriptionList.value = [...prescriptionList.value];
 }
 
 function handleFocus(row, index) {
@@ -972,6 +960,38 @@ function handleQuantityChange(row) {
   prescriptionList.value = [...prescriptionList.value];
 }
 
+// 单次剂量数量变化 → 自动计算剂量
+function handleDoseQuantityChange(value, row) {
+  if (value === '' || value === null || value === undefined) {
+    row.dose = undefined;
+  } else {
+    const ratio = row.unitConversionRatio;
+    const numValue = Number(value) || 0;
+    if (ratio && Number(ratio) > 0) {
+      row.dose = numValue * Number(ratio);
+    } else {
+      row.dose = numValue;
+    }
+  }
+  prescriptionList.value = [...prescriptionList.value];
+}
+
+// 剂量变化 → 反算单次剂量数量
+function handleDoseChange(value, row) {
+  if (value === '' || value === null || value === undefined) {
+    row.doseQuantity = undefined;
+  } else {
+    const ratio = row.unitConversionRatio;
+    const numValue = Number(value) || 0;
+    if (ratio && Number(ratio) > 0) {
+      row.doseQuantity = numValue / Number(ratio);
+    } else {
+      row.doseQuantity = numValue;
+    }
+  }
+  prescriptionList.value = [...prescriptionList.value];
+}
+
 function handleUnitChange(row) {
   prescriptionList.value = [...prescriptionList.value];
 }

healthlink-his-ui/src/views/catalog/medicine/components/medicineDialog.vue

@@ -1020,10 +1020,6 @@ const statusFlagOptions = ref(undefined);
 const domainEnumOptions = ref(undefined);
 const deptOptions = ref(undefined); // 部门树选项
 const locationOptions = ref(undefined); // 地点树选项
-const supplierListOptions = ref(undefined); // 供应商列表选项
-const statusRestrictedOptions = ref(undefined); // 权限级别选项
-const partAttributeEnumOptions = ref(undefined); // 部位属性选项
-const tempOrderSplitPropertyOptions = ref(undefined); // 临时订单拆分属性选项
 const activeName = ref('basic');
 const data = reactive({
   form: {},

healthlink-his-ui/src/views/catalog/medicine/index.vue

@@ -239,8 +239,8 @@
             align="center"
             field="totalVolume"
             show-overflow="title"
-            min-width="200px"
-            width="200px"
+            min-width="200"
+            width="200"
           />
           <vxe-column
             key="statusEnum_enumText"

healthlink-his-ui/src/views/consultationmanagement/consultationconfirmation/index.vue

@@ -554,7 +554,7 @@ const handleRowChange = async (row) => {
   currentRow.value = row
   
   // 先加载会诊意见列表
-  if (row) {
+  if (row && row.consultationId) {
     await loadConsultationOpinions(row.consultationId)
   } else {
     opinionList.value = []

healthlink-his-ui/src/views/doctorstation/components/eprescriptiondialog.vue

@@ -1,10 +1,11 @@
 <template>
   <el-dialog
-    v-model="props.openPrescription"
-    :title="title"
-    width="1840px"
+    :model-value="props.openPrescription"
+    :title="dialogTitle"
+    width="95%"
     teleported
     destroy-on-close
+    @update:model-value="$emit('update:openPrescription', $event)"
     @open="open"
     @close="close"
   >
@@ -227,7 +228,7 @@
             title="药品名称"
             align="center"
             field="medicationName"
-            width="150"
+            min-width="110"
           >
             <template #default="scope">
               <template v-if="getRowDisabled(scope.row)">
@@ -237,7 +238,7 @@
                     placement="bottom-start"
                     :visible="scope.row.showPopover"
                     trigger="manual"
-                    :width="1200"
+                    :width="800"
                   >
                     <prescriptionMedicineList
                       :search-key="medicineSearchKey"
@@ -250,7 +251,6 @@
                         @input="handleChange"
                         @focus="handleFocus(scope.row, scope.rowIndex)"
                       />
-                      <!-- @blur="handleBlur(scope.row)" -->
                     </template>
                   </el-popover>
                 </el-form-item>
@@ -262,7 +262,7 @@
             title="药品规格"
             align="center"
             field=""
-            width="100"
+            min-width="90"
           >
             <template #default="scope">
               <el-form-item :prop="`medicationInfoList.${scope.rowIndex}.drugSpecification`">
@@ -282,7 +282,8 @@
             title="生产厂家"
             align="center"
             field=""
-            width="220"
+            min-width="120"
+            :show-overflow="true"
           >
             <template #default="scope">
               <el-form-item :prop="`medicationInfoList.${scope.rowIndex}.manufacturerName`">
@@ -308,7 +309,7 @@
             title="药品剂量"
             align="center"
             field=""
-            width="80"
+            min-width="100"
           >
             <template #default="scope">
               <el-form-item
@@ -331,7 +332,7 @@
             title="剂量单位"
             align="center"
             field="medDosageUnitCode"
-            width="150"
+            min-width="90"
           >
             <template #default="scope">
               <el-form-item
@@ -371,7 +372,7 @@
             title="使用频次"
             align="center"
             field="medFrequency"
-            width="230"
+            min-width="130"
           >
             <template #default="scope">
               <el-form-item
@@ -404,7 +405,7 @@
             title="服药时间(开始)"
             align="center"
             field="effectiveDoseStart"
-            width="220"
+            min-width="140"
           >
             <template #default="scope">
               <el-form-item
@@ -429,7 +430,7 @@
             title="每次发药供应天数"
             align="center"
             field="dispensePerDuration"
-            width="130"
+            min-width="140"
           >
             <template #default="scope">
               <el-form-item
@@ -450,7 +451,7 @@
             title="服药时间(结束)"
             align="center"
             field="effectiveDoseEnd"
-            width="220"
+            min-width="140"
           >
             <template #default="scope">
               <el-form-item :prop="`medicationInfoList.${scope.rowIndex}.effectiveDoseEnd`">
@@ -472,7 +473,7 @@
             title="途径"
             align="center"
             field="medRoute"
-            width="140"
+            min-width="90"
           >
             <template #default="scope">
               <el-form-item
@@ -502,6 +503,7 @@
             title="数量"
             align="center"
             field="quantity"
+            min-width="90"
           >
             <template #default="scope">
               <el-form-item
@@ -524,7 +526,7 @@
             title="单位"
             align="center"
             field="medDosageUnitCode"
-            width="150"
+            min-width="90"
           >
             <template #default="scope">
               <el-form-item
@@ -611,6 +613,7 @@ const props = defineProps({
   title: {
     type: String,
     required: false,
+    default: '',
   },
   medicationInfo: {
     type: Object,
@@ -633,7 +636,7 @@ const ids = ref([]); // 存储选择的药品信息行数据
 const selectData = ref([]); // 存储选择的药品信息行数据
 const single = ref(true);
 const multiple = ref(true);
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'update:openPrescription']);
 const total = ref(0);
 const queryParams = ref({
   pageNum: 1,
@@ -702,7 +705,7 @@ const queryMedicationParams = ref({
 
 const dosageInputRefs = ref([]);
 
-const title = ref('');
+const dialogTitle = ref('');
 
 const unitMap = ref({
   dose: 'dose',
@@ -720,6 +723,17 @@ function getInit(searchKey) {
 
 function open() {
   conditionId.value = props.prescriptionData.conditionId;
+  // 编辑/查看时回显诊断和慢病诊断
+  if (dialogTitle.value !== '新增处方') {
+    conditionDefId.value = props.prescriptionData.conditionDefId || '';
+    speConditionId.value = props.prescriptionData.opspDiseCode || '';
+    // 远程搜索诊断下拉框：加载当前已选诊断的选项，确保 label 正常显示
+    if (conditionDefId.value) {
+      getDiagnosisListEle('', infoForm.encounterId).then(res => {
+        diagnosisListOption.value = res.data || [];
+      });
+    }
+  }
   getDiagnosisInfo();
 }
 
@@ -728,22 +742,22 @@ function open() {
  */
 function getPrescriptionNoInit() {
   reset();
-  title.value = '';
-  title.value = props.title;
-  console.log(props, 'props', title.value);
+  dialogTitle.value = '';
+  dialogTitle.value = props.title;
+  console.log(props, 'props', dialogTitle.value);
   prescriptionTypeList.value = props.prescriptionType;
   console.log(prescriptionTypeList.value, 'prescriptionTypeList');
   infoForm.patientId = props.patient.patientId;
   infoForm.encounterId = props.patient.encounterId;
   infoForm.validityDays = props.prescriptionData.validityDays;
   infoForm.extensionReason = props.prescriptionData.extensionReason;
-  if (title.value != '新增处方') {
+  if (dialogTitle.value != '新增处方') {
     form.rxTypeCode = props.prescriptionData.rxTypeCode;
     infoForm.prescriptionNo = props.prescriptionData.prescriptionNo;
   }
   console.log('infoForm.prescriptionNo (初始值):', infoForm.prescriptionNo, 'props.prescriptionData:', props.prescriptionData);
   // prescriptionInfo.value = props.prescriptionData;
-  if (title.value === '新增处方') {
+  if (dialogTitle.value === '新增处方') {
     prescriptionNoInit().then((res) => {
       infoForm.prescriptionNo = res.data;
       console.log('处方号初始化成功:', {
@@ -767,7 +781,7 @@ function getDiagnosisInfo() {
     });
     if (diagnosisInfo.length > 0) {
       diagnosisInfo.value = diagnosisInfo[0];
-      if (title.value === '新增处方') {
+      if (dialogTitle.value === '新增处方') {
         conditionId.value = diagnosisInfo[0].id;
       }
     }
@@ -973,7 +987,7 @@ function submit() {
  * 双击药品行
  */
 function clickMedicineRowDb(row) {
-  if (title.value == '查看处方') {
+  if (dialogTitle.value == '查看处方') {
     row.isEdit = false;
   } else {
     row.isEdit = true;

healthlink-his-ui/src/views/doctorstation/components/eprescriptionlist.vue

@@ -57,6 +57,7 @@
         title="门诊号"
         align="center"
         field="iptOtpNo"
+        min-width="120"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -68,6 +69,8 @@
         title="病区"
         align="center"
         field="departmentWard"
+        min-width="90"
+        :show-overflow="true"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -79,7 +82,7 @@
         title="有效天数"
         align="center"
         field="validityDays"
-        width="80"
+        min-width="100"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -138,7 +141,7 @@
         title="取药状态"
         align="center"
         field="medStatus"
-        width="80"
+        min-width="100"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -150,6 +153,8 @@
         title="延长原因"
         align="center"
         field="extensionReason"
+        min-width="90"
+        :show-overflow="true"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -166,6 +171,8 @@
         title="撤销原因"
         align="center"
         field="quashReason"
+        min-width="90"
+        :show-overflow="true"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -177,6 +184,8 @@
         title="诊断"
         align="center"
         field="conditionName"
+        min-width="130"
+        :show-overflow="true"
       >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
@@ -435,6 +444,8 @@ function handleView(row) {
     });
 
     prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
+    prescriptionInfo.value.conditionDefId = response.data.records[0].conditionDefId;
+    prescriptionInfo.value.opspDiseCode = response.data.records[0].opspDiseCode;
     openPrescriptionDialog();
 
   });
@@ -458,6 +469,8 @@ function handleEdit(row) {
       medicationInfo.isEdit = false;
     });
     prescriptionInfo.value.conditionId = response.data.records[0].conditionId;
+    prescriptionInfo.value.conditionDefId = response.data.records[0].conditionDefId;
+    prescriptionInfo.value.opspDiseCode = response.data.records[0].opspDiseCode;
     openPrescriptionDialog();
   });
 }

healthlink-his-ui/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -127,7 +127,7 @@
           <vxe-column
             title="检验项目"
             field="itemName"
-            min-width="170px"
+            min-width="170"
             align="center"
             header-align="center"
           >
@@ -330,8 +330,8 @@
                       >
                         <el-input
                           v-model="formData.medicalrecordNumber"
-                          readonly
                           size="small"
+                          placeholder="请输入就诊卡号"
                         />
                       </el-form-item>
                     </el-col>

healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionHistory.vue

@@ -3,6 +3,7 @@
     v-model="drawer"
     title="历史医嘱"
     direction="ltr"
+    size="75%"
   >
     <div style="margin: 10px 0px">
       <el-input

healthlink-his-ui/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1,5 +1,3 @@
-<!--
- * @Description: 门诊手术申请
 -->
 <template>
   <div class="surgery-application-container">
@@ -34,7 +32,6 @@
       v-loading="loading"
       :data="surgeryList"
       border
-      :row-config="{ keyField: 'surgeryNo' }"
       :row-class-name="getRowClassName"
       height="calc(100vh - 250px)"
       style="width: 100%"
@@ -199,7 +196,6 @@
       v-model="open"
       :title="title"
       width="1200px"
-      teleported
       :close-on-click-modal="false"
       @close="cancel"
     >
@@ -1817,10 +1813,17 @@ defineExpose({
   padding: 20px 0;
 }
 
-/* Bug #770: 确保对话框表单内容可滚动，防止操作按钮遮盖字段 */
+/* Bug #770: 对话框 body 滚动区域限制，防止 footer 按钮遮盖表单字段 */
 :deep(.el-dialog__body) {
-  max-height: calc(100vh - 200px);
+  max-height: calc(100vh - 220px);
   overflow-y: auto;
   padding-bottom: 10px;
 }
+
+/* Bug #770: 确保 footer 固定在对话框底部，不随内容滚动 */
+:deep(.el-dialog__footer) {
+  flex-shrink: 0;
+  border-top: 1px solid #ebeef5;
+  padding: 12px 20px;
+}
 </style>

healthlink-his-ui/src/views/inHospitalManagement/charge/feeTypeConversion/components/PatientList.vue

@@ -14,17 +14,17 @@
       <vxe-column
         title="姓名"
         field="name"
-        min-width="90px"
+        min-width="90"
       />
       <vxe-column
         title="年龄"
         field="age"
-        width="60px"
+        width="60"
       />
       <vxe-column
         title="费别"
         field="feeType"
-        width="60px"
+        width="60"
       />
       <vxe-column
         title="病区"

healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/accomplishList.vue

@@ -59,7 +59,7 @@
       <vxe-table
         ref="tableRef"
         :data="treatHospitalizedData"
-        min-width="1600px"
+        min-width="1600"
         show-overflow="title"
         @radio-change="handleRadioChange"
       >

healthlink-his-ui/src/views/inHospitalManagement/charge/register/components/awaitList.vue

@@ -50,7 +50,7 @@
     <div class="table-container">
       <vxe-table
         :data="treatHospitalizedData"
-        min-width="900px"
+        min-width="900"
         show-overflow="title"
       >
         <vxe-column

healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -83,6 +83,7 @@
           <el-button
             type="primary"
             plain
+            :disabled="hasUnsavedDiagnosis"
             @click="handleAddDiagnosis()"
           >
             新增诊断
@@ -98,12 +99,19 @@
           <el-button
             type="primary"
             plain
+            :disabled="hasUnsavedDiagnosis"
             @click="handleImport()"
           >
             导入慢性病诊断
           </el-button>
         </div>
 
+        <div
+          v-if="hasUnsavedDiagnosis"
+          class="unsaved-diagnosis-tip"
+        >
+          <el-icon><WarningFilled /></el-icon> 当前有未保存的诊断，请先保存后再新增
+        </div>
         <el-form
           ref="formRef"
           :model="form"
@@ -377,7 +385,7 @@
 </template>
 
 <script setup>
-import {getCurrentInstance, ref, watch} from 'vue'; // 添加 nextTick 导入
+import {getCurrentInstance, ref, computed, watch} from 'vue'; // 添加 nextTick 导入
 import useUserStore from '@/store/modules/user';
 import {
   delEncounterDiagnosis,
@@ -397,7 +405,7 @@ import {deleteTcmDiagnosis} from '@/views/doctorstation/components/api.js';
 import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
 import AddDiagnosisDialog from './addDiagnosisDialog.vue';
 import diagnosislist from '../diagnosis/diagnosislist.vue';
-import {patientInfo} from '../../store/patient.js';
+
 import {ElMessage} from 'element-plus';
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
@@ -414,6 +422,13 @@ const syndromeOptions = ref([]);
 const form = ref({
   diagnosisList: [],
 });
+
+// 计算属性：是否有未保存的新诊断
+const hasUnsavedDiagnosis = computed(() => {
+  return (form.value.diagnosisList || []).some(
+    (item) => !item.conditionId && !item.encounterDiagnosisId
+  );
+});
 const props = defineProps({
   patientInfo: {
     type: Object,
@@ -555,6 +570,7 @@ function getList() {
               conditionId: item.conditionId || '',
               encounterDiagnosisId: item.encounterDiagnosisId || '',
               syndromeGroupNo: item.syndromeGroupNo || res.data.symptom[index]?.syndromeGroupNo || '',
+              illnessName: item.name, // 保存原始疾病名称，避免保存时发送合并名称
               name: item.name + '-' + (res.data.symptom[index]?.name || ''),
               ybNo: item.ybNo,
               definitionId: item.definitionId || '',
@@ -611,7 +627,22 @@ function handleImport() {
   if (!props.patientInfo || !props.patientInfo.encounterId) {
     return;
   }
-  
+
+  // 检查是否已填写病历
+  if (!allowAdd.value) {
+    proxy.$modal.msgWarning('请先填写病历');
+    return;
+  }
+
+  // 检查当前列表是否有未保存的诊断，阻止重复新增
+  const hasUnsaved = (form.value.diagnosisList || []).some(
+    (item) => !item.conditionId && !item.encounterDiagnosisId
+  );
+  if (hasUnsaved) {
+    proxy.$modal.msgWarning('请保存当前诊断');
+    return;
+  }
+
   if (props.patientInfo.contractName != '自费') {
     // 获取患者慢性病信息
     getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
@@ -710,7 +741,22 @@ function getTree() {
  */
 function handleAddDiagnosis() {
   console.log('点击新增诊断按钮，allowAdd:', allowAdd.value);
-  
+
+  // 检查是否已填写病历（必须先于其他检查）
+  if (!allowAdd.value) {
+    proxy.$modal.msgWarning('请先填写病历');
+    return;
+  }
+
+  // 检查当前列表是否已有未保存的诊断，阻止重复新增
+  const hasUnsaved = (form.value.diagnosisList || []).some(
+    (item) => !item.conditionId && !item.encounterDiagnosisId
+  );
+  if (hasUnsaved) {
+    proxy.$modal.msgWarning('请保存当前诊断');
+    return;
+  }
+
   // 检查表单ref是否存在
   if (!proxy.$refs.formRef) {
     console.error('表单ref不存在');
@@ -718,23 +764,20 @@ function handleAddDiagnosis() {
     addDiagnosisItem();
     return;
   }
-  
+
   proxy.$refs.formRef.validate((valid, fields) => {
     console.log('表单验证结果:', valid, '错误字段:', fields);
-    if (valid) {
-      if (!allowAdd.value) {
-        proxy.$modal.msgWarning('请先填写病历');
-        return;
-      }
-      addDiagnosisItem();
-    } else {
-      console.warn('表单验证失败:', fields);
-      // 验证失败时也允许添加（因为是新增空行）
-      if (allowAdd.value) {
-        console.log('验证失败但允许添加，强制添加诊断');
-        addDiagnosisItem();
+    // 再次检查是否有未保存的诊断（防止 validate 异步回调的竞态条件）
+    const hasUnsavedNow = (form.value.diagnosisList || []).some(
+      (item) => !item.conditionId && !item.encounterDiagnosisId
+    );
+    if (!valid || hasUnsavedNow) {
+      if (hasUnsavedNow) {
+        proxy.$modal.msgWarning('请保存当前诊断');
       }
+      return;
     }
+    addDiagnosisItem();
   });
 }
 
@@ -982,9 +1025,14 @@ function handleSaveDiagnosis() {
 
           // 再逐个保存中医诊断（只追加，不清空）
           for (const item of tcmList) {
-            const syndromeGroupNo = item.conditionId
-              ? `${item.conditionId}-${item.tcmSyndromeCode || Date.now()}`
-              : `${Date.now()}-${item.tcmSyndromeCode || '0'}`;
+            // 优先使用已有的 syndromeGroupNo，避免每次保存生成新值导致重复创建
+            const syndromeGroupNo = item.syndromeGroupNo || (
+              item.conditionId
+                ? `${item.conditionId}-${item.tcmSyndromeCode || Date.now()}`
+                : `${Date.now()}-${item.tcmSyndromeCode || '0'}`
+            );
+            // 使用原始疾病名称（illnessName），而非合并后的名称（如"感冒-风寒证"）
+            const illnessName = item.illnessName || item.name;
             await saveTcmDiagnosis({
               patientId: props.patientInfo.patientId,
               encounterId: props.patientInfo.encounterId,
@@ -992,7 +1040,8 @@ function handleSaveDiagnosis() {
                 // 病（illness）
                 {
                   conditionId: item.conditionId || null,
-                  name: item.name,
+                  encounterDiagnosisId: item.encounterDiagnosisId || null,
+                  name: illnessName,
                   ybNo: item.ybNo,
                   definitionId: item.definitionId || null,
                   diagSrtNo: item.diagSrtNo,
@@ -1085,10 +1134,22 @@ function handleNodeClick(data) {
     // 如果是根节点，不执行任何操作
     return;
   }
-  // if (!allowAdd.value) {
-  //   proxy.$modal.msgWarning('请先填写病历');
-  //   return;
-  // }
+
+  // 检查是否已填写病历
+  if (!allowAdd.value) {
+    proxy.$modal.msgWarning('请先填写病历');
+    return;
+  }
+
+  // 检查当前列表是否有未保存的诊断，阻止重复新增
+  const hasUnsaved = (form.value.diagnosisList || []).some(
+    (item) => !item.conditionId && !item.encounterDiagnosisId
+  );
+  if (hasUnsaved) {
+    proxy.$modal.msgWarning('请保存当前诊断');
+    return;
+  }
+
   const isDuplicate = form.value.diagnosisList.some(
     (diagnosis) => diagnosis.ybNo === data.ybNo || diagnosis.name === data.name
   );
@@ -1099,13 +1160,20 @@ function handleNodeClick(data) {
   form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
+    showPopover: false,
+    diagnosisSystem: '西医',
+    tcmSyndromeCode: '',
+    tcmSyndromeName: '',
+    syndromeDefinitionId: '',
+    syndromeGroupNo: '',
     verificationStatusEnum: 4,
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
+    iptDiseTypeCode: 2,
+    diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
     diagnosisTime: new Date().toLocaleString('zh-CN'),
-    // 添加 patientId
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {
@@ -1132,4 +1200,13 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
   display: flex;
   align-items: center;
 }
-</style>
+
+.unsaved-diagnosis-tip {
+  margin-bottom: 10px;
+  color: #E6A23C;
+  font-size: 13px;
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+</style>

healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/index.vue

@@ -348,6 +348,12 @@ function getCurrentDate() {
 }
 
 function addNewDiagnosis() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   const maxSortNo = diagnoseData.value.length > 0
     ? Math.max(...diagnoseData.value.map(item => item.sortNo || 0))
     : 0
@@ -374,6 +380,12 @@ function addNewDiagnosis() {
 }
 
 function addNewChinese() {
+  // Bug #783: 存在未保存的新诊断时，不允许继续新增
+  const hasUnsavedRow = diagnoseData.value.some(item => item.isNew && !item.conditionId)
+  if (hasUnsavedRow) {
+    ElMessage.warning('请先保存已新增的诊断，再添加新诊断')
+    return
+  }
   chineseMedicineDialogVisible.value = true
 }
 

healthlink-his-ui/src/views/inpatientNurse/drugDistribution/drugDistributionList.vue

@@ -121,7 +121,7 @@
         <vxe-column
           title="类型"
           field="name"
-          min-width=" 60px"
+          min-width="60"
         >
           <template #default="{ row }">
             <span v-if="!row.children">长期</span>
@@ -134,7 +134,7 @@
         <vxe-column
           title="医嘱内容"
           field="content"
-          min-width="220px"
+          min-width="220"
         >
           <template #default="{ row }">
             <span v-if="row.children">{{ row.content }}</span>
@@ -144,9 +144,9 @@
           v-if="searchForm.drugType == '1' || searchForm.drugType == '3'"
           title="用法/频次"
           field="gender"
-          min-width="120px"
+          min-width="120"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>注射/qd</span>
           </template>
         </vxe-column>
@@ -154,7 +154,7 @@
           v-if="searchForm.drugType == '3'"
           title="领药数量"
           field="gender"
-          min-width="120px"
+          min-width="120"
         >
           <template #default="{ row }">
             <el-input-number
@@ -169,27 +169,27 @@
           v-if="searchForm.drugType == '1' || searchForm.drugType == '2'"
           title="领药总量"
           field="gender"
-          min-width="100px"
+          min-width="100"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>2 支</span>
           </template>
         </vxe-column>
         <vxe-column
           title="参考金额"
           field="gender"
-          min-width="100px"
+          min-width="100"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>20.00</span>
           </template>
         </vxe-column>
         <vxe-column
           title="取药科室"
           field="gender"
-          min-width="140px"
+          min-width="140"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>儿科</span>
           </template>
         </vxe-column>
@@ -198,7 +198,7 @@
           title="领药次数"
           field="gender"
           fixed="right"
-          min-width="340px"
+          min-width="340"
         >
           <template #default="{ row }">
             <template v-if="!row.children">
@@ -235,7 +235,7 @@
         <vxe-column
           title="医嘱内容"
           field="content"
-          min-width="220px"
+          min-width="220"
         >
           <template #default="{ row }">
             <span v-if="!row.children">{{ row.content }}</span>
@@ -247,27 +247,27 @@
         <vxe-column
           title="领药数量"
           field="gender"
-          min-width="120px"
+          min-width="120"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>2 支</span>
           </template>
         </vxe-column>
         <vxe-column
           title="单价"
           field="gender"
-          min-width="100px"
+          min-width="100"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>20.00</span>
           </template>
         </vxe-column>
         <vxe-column
           title="参考金额"
           field="gender"
-          min-width="140px"
+          min-width="140"
         >
-          <template #default="{ row }">
+          <template #default>
             <span>40.00</span>
           </template>
         </vxe-column>

healthlink-his-ui/src/views/inpatientNurse/medicalOrderManagement/components/execute/MedicalOrderManagement.vue

@@ -124,7 +124,7 @@
         <vxe-column
           title="执行时间"
           field="gender"
-          min-width="200px"
+          min-width="200"
         >
           <template #default="{ row }">
             <template v-if="!row.children">

healthlink-his-ui/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -15,6 +15,7 @@
         <el-radio-group
           v-model="type"
           @change="handleRadioChange"
+        >
           <el-radio :value="0">
             全部
           </el-radio>
@@ -33,9 +34,12 @@
           value-format="YYYY-MM-DD HH:mm:ss"
           style="width: 200px"
         />
+        <el-button
           plain
           @click="handleGetPrescription"
+        >
           查询
+        </el-button>
       </div>
       <div style="flex: 1; min-width: 0;" />
       <div style="display: flex; align-items: center; gap: 12px; flex-shrink: 1; min-width: 0;">
@@ -47,11 +51,37 @@
           v-model="chooseAll"
           @change="handelSwitchChange"
         />
-          type="primary"
-        >
-        <el-button
-        >
-        </el-button>
+        <!-- 未校对tab：显示核对通过/退回 -->
+        <template v-if="activeTab === 'unverified'">
+          <el-button
+            type="primary"
+            @click="handleCheck"
+          >
+            核对通过
+          </el-button>
+          <el-button
+            type="danger"
+            :disabled="hasDispensedSelected"
+            @click="handleCancel"
+          >
+            退回
+          </el-button>
+        </template>
+        <!-- 已校对tab：显示执行/不执行 -->
+        <template v-else-if="activeTab === 'verified'">
+          <el-button
+            type="success"
+            @click="handleExecute"
+          >
+            执行
+          </el-button>
+          <el-button
+            type="warning"
+            @click="handleVoid"
+          >
+            不执行
+          </el-button>
+        </template>
       </div>
     </div>
     <div
@@ -667,6 +697,11 @@ function getSelectRows() {
       requestId: item.requestId,
       requestTable: item.adviceTable,
       dispenseStatus: item.dispenseStatus,
+      encounterId: item.encounterId,
+      patientId: item.patientId,
+      accountId: item.accountId,
+      therapyEnum: item.therapyEnum,
+      exePerformRecordList: item.exePerformRecordList,
     };
   });
 }
@@ -710,66 +745,6 @@ function getDateRange(startDate, endDate) {
 // 处理后端返回的时间集合
 function handleTime() {}
 
-defineExpose({
-  handleGetPrescription,
-});
-</script>
-
-<style scoped>
-.el-collapse-icon-position-left :deep(.el-collapse-item__header) {
-  padding: 10px;
-}
-
-:deep(.el-collapse-item__wrap) {
-  padding: 10px;
-}
-
-/* 表头背景色 */
-:deep(.prescription-table .vxe-table--header th) {
-  background-color: #eef9fd !important;
-}
-
-:deep(.vxe-body--row:hover > td) {
-  background-color: #eef9fd !important;
-}
-</style>
-
-        <!-- 未校对tab：显示核对通过/退回 -->
-        <template v-if="activeTab === 'unverified'">
-          <el-button
-            type="primary"
-            @click="handleCheck"
-          >
-            核对通过
-          </el-button>
-          <el-button
-            type="danger"
-            :disabled="hasDispensedSelected"
-            @click="handleCancel"
-          >
-            退回
-          </el-button>
-        </template>
-        <!-- 已校对tab：显示执行/不执行 -->
-        <template v-else-if="activeTab === 'verified'">
-          <el-button
-            type="success"
-            @click="handleExecute"
-          >
-            执行
-          </el-button>
-          <el-button
-            type="warning"
-            @click="handleVoid"
-          >
-            不执行
-          </el-button>
-        </template>
-      encounterId: item.encounterId,
-      patientId: item.patientId,
-      accountId: item.accountId,
-      therapyEnum: item.therapyEnum,
-      exePerformRecordList: item.exePerformRecordList,
 /**
  * 执行医嘱
  */
@@ -853,3 +828,27 @@ function handleVoid() {
     }
   });
 }
+
+defineExpose({
+  handleGetPrescription,
+});
+</script>
+
+<style scoped>
+.el-collapse-icon-position-left :deep(.el-collapse-item__header) {
+  padding: 10px;
+}
+
+:deep(.el-collapse-item__wrap) {
+  padding: 10px;
+}
+
+/* 表头背景色 */
+:deep(.prescription-table .vxe-table--header th) {
+  background-color: #eef9fd !important;
+}
+
+:deep(.vxe-body--row:hover > td) {
+  background-color: #eef9fd !important;
+}
+</style>

healthlink-his-ui/src/views/inpatientNurse/medicineCollect/index.vue

@@ -133,7 +133,7 @@
         <vxe-column
           title="医嘱内容"
           field="content"
-          min-width="300px"
+          min-width="300"
         >
           <template #default="{ row }">
             <span v-if="row.children">{{ row.content }}</span>

healthlink-his-ui/src/views/inpatientNurse/medicineReturn/index.vue

@@ -1,31 +1,10 @@
 <!--
- * @Author: sjjh
- * @Date: 2025-09-09 13:49:40
- * @Description: 
+ * @Description: 护士工作站 - 退药管理（复用住院退药组件）
 -->
 <template>
-  <div class="container" />
+  <ReturnDrug />
 </template>
-<script setup>
-import {getCurrentInstance, onBeforeMount, onMounted, reactive} from 'vue'
 
-const { proxy } = getCurrentInstance();
-const emits = defineEmits([])
-const props = defineProps({
- 
-})
-const state = reactive({
- 
-})
-onBeforeMount(() => {
- 
-})
-onMounted(() => {
- 
-})
-defineExpose({ state })
- 
-</script> 
-<style lang="scss" scoped>
- 
-</style>
+<script setup>
+import ReturnDrug from '@/views/drug/inpatientMedicationDispensing/components/ReturnDrug.vue';
+</script>

healthlink-his-ui/src/views/inpatientNurse/tprsheet/components/addAttr.vue

@@ -32,7 +32,6 @@
             placeholder="请选择"
             clearable
             filterable
-            @change=""
           >
             <el-option
               v-for="item in temOptions"
@@ -220,7 +219,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <!-- <vxe-column width="200px" title="血氧">
+          <!-- <vxe-column width="200" title="血氧">
             <template #default="scoped">
               <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodOxygen`">
                 <div style="margin-left: -80px">
@@ -232,7 +231,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="血糖">
+          <vxe-column width="200" title="血糖">
             <template #default="scoped">
               <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodGlucose`">
                 <div style="margin-left: -80px">
@@ -241,7 +240,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="物理降温">
+          <vxe-column width="200" title="物理降温">
             <template #default="scoped">
               <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.physicalCooling`">
                 <div style="margin-left: -80px">
@@ -250,7 +249,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="CCU心率">
+          <vxe-column width="200" title="CCU心率">
             <template #default="scoped">
               <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.ccuHeartRate`">
                 <div style="margin-left: -80px">
@@ -259,7 +258,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="新生儿箱温">
+          <vxe-column width="200" title="新生儿箱温">
             <template #default="scoped">
               <el-form-item
                 size="normal"
@@ -271,7 +270,7 @@
               </el-form-item>
             </template>
           </vxe-column>
-          <vxe-column width="200px" title="血酮">
+          <vxe-column width="200" title="血酮">
             <template #default="scoped">
               <el-form-item size="normal" :prop="`fillTableData.${scoped.rowIndex}.bloodKetone`">
                 <div style="margin-left: -80px">

healthlink-his-ui/src/views/medicationmanagement/statisticalManagement/outPatientCharge.vue

@@ -171,14 +171,14 @@
     >
       <vxe-column
         type="checkbox"
-        width="50px"
+        width="50"
         align="center"
       />
       <vxe-column
         key="busNo"
         title="门诊号"
         align="center"
-        min-width="150px"
+        min-width="150"
         show-overflow="title"
         resizable
       >
@@ -204,7 +204,7 @@
         title="姓名"
         align="center"
         field="name"
-        width="90px"
+        width="90"
         show-overflow="title"
         resizable
       />
@@ -213,7 +213,7 @@
         title="医保号"
         align="center"
         field="ybCode"
-        min-width="200px"
+        min-width="200"
         show-overflow="title"
         resizable
       />
@@ -230,7 +230,7 @@
         title="医保码"
         align="center"
         field="ybNo"
-        min-width="250px"
+        min-width="250"
         show-overflow="title"
         resizable
       />

healthlink-his-ui/src/views/tool/gen/editTable.vue

@@ -23,17 +23,17 @@
           <vxe-column
             title="序号"
             type="seq"
-            min-width="5%"
+            width="5%"
           />
           <vxe-column
             title="字段列名"
             field="columnName"
-            min-width="10%"
+            width="10%"
             show-overflow="title"
           />
           <vxe-column
             title="字段描述"
-            min-width="10%"
+            width="10%"
           >
             <template #default="scope">
               <el-input v-model="scope.row.columnComment" />
@@ -42,12 +42,12 @@
           <vxe-column
             title="物理类型"
             field="columnType"
-            min-width="10%"
+            width="10%"
             show-overflow="title"
           />
           <vxe-column
             title="Java类型"
-            min-width="11%"
+            width="11%"
           >
             <template #default="scope">
               <el-select v-model="scope.row.javaType">
@@ -84,7 +84,7 @@
           </vxe-column>
           <vxe-column
             title="java属性"
-            min-width="10%"
+            width="10%"
           >
             <template #default="scope">
               <el-input v-model="scope.row.javaField" />
@@ -93,7 +93,7 @@
 
           <vxe-column
             title="插入"
-            min-width="5%"
+            width="5%"
           >
             <template #default="scope">
               <el-checkbox
@@ -105,7 +105,7 @@
           </vxe-column>
           <vxe-column
             title="编辑"
-            min-width="5%"
+            width="5%"
           >
             <template #default="scope">
               <el-checkbox
@@ -117,7 +117,7 @@
           </vxe-column>
           <vxe-column
             title="列表"
-            min-width="5%"
+            width="5%"
           >
             <template #default="scope">
               <el-checkbox
@@ -129,7 +129,7 @@
           </vxe-column>
           <vxe-column
             title="查询"
-            min-width="5%"
+            width="5%"
           >
             <template #default="scope">
               <el-checkbox
@@ -141,7 +141,7 @@
           </vxe-column>
           <vxe-column
             title="查询方式"
-            min-width="10%"
+            width="10%"
           >
             <template #default="scope">
               <el-select v-model="scope.row.queryType">
@@ -182,7 +182,7 @@
           </vxe-column>
           <vxe-column
             title="必填"
-            min-width="5%"
+            width="5%"
           >
             <template #default="scope">
               <el-checkbox
@@ -194,7 +194,7 @@
           </vxe-column>
           <vxe-column
             title="显示类型"
-            min-width="12%"
+            width="12%"
           >
             <template #default="scope">
               <el-select v-model="scope.row.htmlType">
@@ -239,7 +239,7 @@
           </vxe-column>
           <vxe-column
             title="字典类型"
-            min-width="12%"
+            width="12%"
           >
             <template #default="scope">
               <el-select