Merge branch 'develop' of http://192.168.110.253:3000/wangyizhe/his into develop

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java

@@ -2,6 +2,7 @@ package com.openhis.web.doctorstation.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -40,7 +41,8 @@ public class SurgeryItemDto {
     /** 单位编码 */
     private String unitCode;
 
-    /** 单位编码字典文本（前端用于显示单位） */
+    /** 单位编码字典文本（前端用于显示单位，输出为 unitCode_dictText 以下划线格式匹配前端） */
+    @JsonProperty("unitCode_dictText")
     private String unitCodeDictText;
 
     /** 所需标本编码（来自诊疗目录配置，对应字典 specimen_code 的 dictValue） */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -482,6 +482,13 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
             if (!checkReqIds.isEmpty()) {
                 serviceRequestService.updatePendingReceiveStatus(checkReqIds);
             }
+            // 手术类医嘱执行后，状态改为"已执行"（SurgeryAppStatusEnum.EXECUTED=4）
+            List<Long> surgeryReqIds = executedReqs.stream()
+                    .filter(sr -> ActivityDefCategory.PROCEDURE.getValue().equals(sr.getCategoryEnum()))
+                    .map(ServiceRequest::getId).toList();
+            if (!surgeryReqIds.isEmpty()) {
+                serviceRequestService.updateSurgeryAppStatus(surgeryReqIds, SurgeryAppStatusEnum.EXECUTED.getCode());
+            }
         }
 
         return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"医嘱执行"}));
@@ -726,6 +733,24 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
             deviceDispenseService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getId).toList());
             deviceRequestService.removeByIds(deviceDispenseList.stream().map(DeviceDispense::getDeviceReqId).toList());
         }
+        // 手术类医嘱取消执行后，状态回退为"已校对"（SurgeryAppStatusEnum.VERIFIED=3）
+        List<Long> surgeryCancelReqIds = adviceExecuteParam.getAdviceExecuteDetailList().stream()
+                .filter(e -> CommonConstants.TableName.WOR_SERVICE_REQUEST.equals(e.getAdviceTable()))
+                .map(AdviceExecuteDetailParam::getRequestId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .toList();
+        if (!surgeryCancelReqIds.isEmpty()) {
+            List<ServiceRequest> surgeryRequests = serviceRequestService.list(
+                    new LambdaQueryWrapper<ServiceRequest>()
+                            .in(ServiceRequest::getId, surgeryCancelReqIds)
+                            .eq(ServiceRequest::getCategoryEnum, ActivityDefCategory.PROCEDURE.getValue()));
+            if (!surgeryRequests.isEmpty()) {
+                serviceRequestService.updateSurgeryAppStatus(
+                        surgeryRequests.stream().map(ServiceRequest::getId).toList(),
+                        SurgeryAppStatusEnum.VERIFIED.getCode());
+            }
+        }
         return R.ok("取消执行成功,相关汇总领药单已重新生成");
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java

@@ -192,9 +192,10 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         // 药品
         List<RegAdviceSaveDto> medicineList = regAdviceSaveList.stream()
                 .filter(e -> ItemType.MEDICINE.getValue().equals(e.getAdviceType())).collect(Collectors.toList());
-        // 诊疗活动（包含护理adviceType=26）
+        // 诊疗活动（包含护理adviceType=26、手术adviceType=6）
         List<RegAdviceSaveDto> activityList = regAdviceSaveList.stream()
                 .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
+                        || ItemType.SURGERY.getValue().equals(e.getAdviceType())
                         || (e.getAdviceType() != null && e.getAdviceType() == 26))
                 .collect(Collectors.toList());
         // 耗材 🔧 Bug #147 修复

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -894,13 +894,17 @@
             t2.ID AS charge_item_definition_id,
             t2.price AS price,
             t1.permitted_unit_code AS unit_code,
-            t1.permitted_unit_code AS unit_code_dict_text
+            COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text
         FROM wor_activity_definition t1
         LEFT JOIN adm_charge_item_definition t2
             ON t2.instance_id = t1.ID
             AND t2.delete_flag = '0'
             AND t2.status_enum = #{statusEnum}
             AND t2.instance_table = 'wor_activity_definition'
+        LEFT JOIN sys_dict_data sdd
+            ON sdd.dict_value = t1.permitted_unit_code
+            AND sdd.dict_type = 'unit_code'
+            AND sdd.status = '0'
         WHERE t1.delete_flag = '0'
           AND (t1.category_code = '手术' OR t1.category_code = '24')
           <if test="searchKey != null and searchKey != ''">
@@ -920,7 +924,7 @@
             t2.ID AS charge_item_definition_id,
             t2.price AS price,
             t1.permitted_unit_code AS unit_code,
-            t1.permitted_unit_code AS unit_code_dict_text,
+            COALESCE(sdd.dict_label, t1.permitted_unit_code) AS unit_code_dict_text,
             t1.specimen_code AS specimen_code
         FROM wor_activity_definition t1
         LEFT JOIN adm_charge_item_definition t2
@@ -931,6 +935,10 @@
         LEFT JOIN adm_organization t3
             ON t3.id = t1.org_id
             AND t3.delete_flag = '0'
+        LEFT JOIN sys_dict_data sdd
+            ON sdd.dict_value = t1.permitted_unit_code
+            AND sdd.dict_type = 'unit_code'
+            AND sdd.status = '0'
         WHERE t1.delete_flag = '0'
           AND t1.category_code = #{categoryCode}
           <if test="searchKey != null and searchKey != ''">

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -30,6 +30,44 @@
                    drf.create_time,
                    ap.NAME AS patient_name,
                    CASE
+                       -- ========== 手术专用映射 (categoryEnum=24) ==========
+                       -- 手术申请单状态枚举: 1=待签发 2=已签发 3=已校对 4=已执行 5=已安排 6=已完成 10=已作废
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 10
+                       ) THEN 10
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 6
+                       ) THEN 6
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 5
+                       ) THEN 5
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 4
+                       ) THEN 4
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 3
+                       ) THEN 3
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 2
+                       ) THEN 2
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.category_enum = 24 AND ws.status_enum = 1
+                       ) THEN 1
+                       -- ========== 通用映射 (非手术类型: 检查/检验/药品/输血) ==========
                        WHEN EXISTS (
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/SurgeryAppStatusEnum.java

@@ -0,0 +1,84 @@
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 手术申请单状态枚举
+ * <p>
+ * 区别于 {@link SurgeryStatusEnum}（手术管理状态：待排期/已排期/手术中/已完成/已取消/暂停），
+ * 本枚举用于手术申请单的业务流转状态，覆盖从医生开立到手术完成的完整生命周期。
+ *
+ * <pre>
+ * 正向流转:
+ *   待签发(1) → 已签发(2) → 已校对(3) → 已执行(4) → 已安排(5) → 已完成(6)
+ *
+ * 逆向流转:
+ *   已签发(2) → 待签发(1)   （医生撤回 / 护士退回）
+ *   已执行(4) → 已校对(3)   （护士取消执行）
+ *   任意状态 → 已作废(10)   （医生撤销）
+ * </pre>
+ *
+ * @author system
+ * @date 2026-06-02
+ */
+@Getter
+@AllArgsConstructor
+public enum SurgeryAppStatusEnum {
+
+    /** 待签发 — 医生已保存但尚未提交，仅在医生站可见 */
+    PENDING_SIGN(1, "待签发"),
+
+    /** 已签发 — 医生已提交，自动流转至护士工作站待校对 */
+    SIGNED(2, "已签发"),
+
+    /** 已校对 — 病区护士已校对手术医嘱 */
+    VERIFIED(3, "已校对"),
+
+    /** 已执行 — 病区护士已执行手术医嘱，已向手麻科提交申请 */
+    EXECUTED(4, "已执行"),
+
+    /** 已安排 — 手麻科已排好手术间及时间，待手术 */
+    SCHEDULED(5, "已安排"),
+
+    /** 已完成 — 手术已结束并录入完毕（终态只读） */
+    COMPLETED(6, "已完成"),
+
+    /** 已作废 — 医生中途撤销了手术申请（终态） */
+    CANCELLED(10, "已作废");
+
+    private final Integer code;
+    private final String info;
+
+    /**
+     * 根据状态码获取枚举
+     *
+     * @param code 状态码
+     * @return 对应的枚举，未匹配返回 null
+     */
+    public static SurgeryAppStatusEnum getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (SurgeryAppStatusEnum val : values()) {
+            if (val.getCode().equals(code)) {
+                return val;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 判断是否为终态（不可再变更）
+     */
+    public boolean isFinal() {
+        return this == COMPLETED || this == CANCELLED;
+    }
+
+    /**
+     * 判断是否允许医生编辑
+     */
+    public boolean isEditable() {
+        return this == PENDING_SIGN;
+    }
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java

@@ -149,4 +149,12 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
      * @return 请求信息列表
      */
     List<ServiceRequest> getServiceRequestListByEncounterId(Long encounterId);
+
+    /**
+     * 更新手术申请单状态（批量）
+     *
+     * @param serReqIdList 服务请求id列表
+     * @param statusCode 手术申请单状态码 (SurgeryAppStatusEnum)
+     */
+    void updateSurgeryAppStatus(List<Long> serReqIdList, Integer statusCode);
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java

@@ -278,4 +278,19 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
         return baseMapper.selectList(new LambdaQueryWrapper<ServiceRequest>()
                 .eq(ServiceRequest::getEncounterId, encounterId).eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
     }
+
+    /**
+     * 更新手术申请单状态（批量）
+     *
+     * @param serReqIdList 服务请求id列表
+     * @param statusCode 手术申请单状态码 (SurgeryAppStatusEnum: 1=待签发,2=已签发,3=已校对,4=已执行,5=已安排,6=已完成,10=已作废)
+     */
+    @Override
+    public void updateSurgeryAppStatus(List<Long> serReqIdList, Integer statusCode) {
+        baseMapper.update(null,
+                new LambdaUpdateWrapper<ServiceRequest>()
+                        .set(ServiceRequest::getStatusEnum, statusCode)
+                        .in(ServiceRequest::getId, serReqIdList)
+                        .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
+    }
 }

openhis-ui-vue3/package-lock.json

@@ -46,7 +46,9 @@
         "vue-area-linkage": "^5.1.0",
         "vue-cropper": "^1.1.1",
         "vue-plugin-hiprint": "^0.0.19",
-        "vue-router": "^4.3.0"
+        "vue-router": "^4.3.0",
+        "vxe-table": "^4.19.6",
+        "xe-utils": "^3.9.1"
       },
       "devDependencies": {
         "@playwright/test": "^1.58.2",
@@ -700,6 +702,24 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/netbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
@@ -716,6 +736,24 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/openbsd-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
@@ -732,6 +770,24 @@
         "node": ">=12"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
       "version": "0.19.12",
       "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
@@ -1894,6 +1950,7 @@
       "version": "2.5.6",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
       "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
+      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -1933,6 +1990,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1953,6 +2011,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1973,6 +2032,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1993,6 +2053,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2013,6 +2074,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2033,6 +2095,7 @@
       "cpu": [
         "arm"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2053,6 +2116,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2073,6 +2137,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2093,6 +2158,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2113,6 +2179,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2133,6 +2200,7 @@
       "cpu": [
         "arm64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2153,6 +2221,7 @@
       "cpu": [
         "ia32"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2173,6 +2242,7 @@
       "cpu": [
         "x64"
       ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3422,6 +3492,25 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/@vxe-ui/core": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmmirror.com/@vxe-ui/core/-/core-4.4.13.tgz",
+      "integrity": "sha512-ViWvzmsW7ZWrowzJrXxQzOJhJwEqOgcX9LNjddF1B5KD49tyNsG5UkeMMAtgV8qSpR8qvJ8TukdIqRN4wgmH4w==",
+      "license": "MIT",
+      "dependencies": {
+        "dom-zindex": "^1.0.7",
+        "xe-utils": "^4.0.8"
+      },
+      "peerDependencies": {
+        "vue": "^3.2.0"
+      }
+    },
+    "node_modules/@vxe-ui/core/node_modules/xe-utils": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-4.0.8.tgz",
+      "integrity": "sha512-l+p++9iPtSxpf/5ZCzkPXsyV0avE34KzieAC9oAhi+3e98PLJaBQHNiY2V8Lnbiux4JFAbU10p8AT6oujXkP9A==",
+      "license": "MIT"
+    },
     "node_modules/abbrev": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-2.0.0.tgz",
@@ -5291,6 +5380,12 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/dom-zindex": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/dom-zindex/-/dom-zindex-1.0.7.tgz",
+      "integrity": "sha512-cKU/h8v8IPBgdZOTPbPmq3Ib+Ac5C+kKoh9I4LbGR9BM3GwbmB16KYWKJcj5M2BavnA66EbgYzxYDLd1IytnlQ==",
+      "license": "MIT"
+    },
     "node_modules/domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz",
@@ -6745,6 +6840,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -7586,7 +7682,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7637,7 +7733,7 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -8939,6 +9035,7 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
       "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true,
       "license": "MIT",
       "optional": true
     },
@@ -9566,7 +9663,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
       "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
-      "devOptional": true,
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -12690,6 +12787,464 @@
         }
       }
     },
+    "node_modules/vitest/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/linux-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
+      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vitest/node_modules/esbuild": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.27.7.tgz",
+      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.27.7",
+        "@esbuild/android-arm": "0.27.7",
+        "@esbuild/android-arm64": "0.27.7",
+        "@esbuild/android-x64": "0.27.7",
+        "@esbuild/darwin-arm64": "0.27.7",
+        "@esbuild/darwin-x64": "0.27.7",
+        "@esbuild/freebsd-arm64": "0.27.7",
+        "@esbuild/freebsd-x64": "0.27.7",
+        "@esbuild/linux-arm": "0.27.7",
+        "@esbuild/linux-arm64": "0.27.7",
+        "@esbuild/linux-ia32": "0.27.7",
+        "@esbuild/linux-loong64": "0.27.7",
+        "@esbuild/linux-mips64el": "0.27.7",
+        "@esbuild/linux-ppc64": "0.27.7",
+        "@esbuild/linux-riscv64": "0.27.7",
+        "@esbuild/linux-s390x": "0.27.7",
+        "@esbuild/linux-x64": "0.27.7",
+        "@esbuild/netbsd-arm64": "0.27.7",
+        "@esbuild/netbsd-x64": "0.27.7",
+        "@esbuild/openbsd-arm64": "0.27.7",
+        "@esbuild/openbsd-x64": "0.27.7",
+        "@esbuild/openharmony-arm64": "0.27.7",
+        "@esbuild/sunos-x64": "0.27.7",
+        "@esbuild/win32-arm64": "0.27.7",
+        "@esbuild/win32-ia32": "0.27.7",
+        "@esbuild/win32-x64": "0.27.7"
+      }
+    },
     "node_modules/vitest/node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
@@ -12781,6 +13336,24 @@
         }
       }
     },
+    "node_modules/vitest/node_modules/yaml": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmmirror.com/yaml/-/yaml-2.9.0.tgz",
+      "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.1.0.tgz",
@@ -12920,6 +13493,24 @@
         "typescript": ">=5.0.0"
       }
     },
+    "node_modules/vxe-pc-ui": {
+      "version": "4.14.26",
+      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.14.26.tgz",
+      "integrity": "sha512-JtOShAA2HG+M9QybmuY0+ufagCFJpKWIMNcgHM9X8yysmZC/J7ivqFjn3tXTGzv5IA7JsaF6uelMzx2O0FKksQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@vxe-ui/core": "^4.4.13"
+      }
+    },
+    "node_modules/vxe-table": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.19.6.tgz",
+      "integrity": "sha512-KMFjriaQSpHbLPD8O7hc+FtVE521mLiDhif+oDilqMd7Zf8+oTvt7RLUW/KqN+vur4A2RqQtRWBs2vlrk0dc0g==",
+      "license": "MIT",
+      "dependencies": {
+        "vxe-pc-ui": "^4.14.0"
+      }
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -13199,6 +13790,12 @@
         }
       }
     },
+    "node_modules/xe-utils": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmmirror.com/xe-utils/-/xe-utils-3.9.1.tgz",
+      "integrity": "sha512-Ujk5UmoH6Iaqhgz3oGwfCXVcMdUJKlXnfvLABdnMyseMG0eHsX2mcCvLd/8sGlIXtfwsprI9bW7vgcVognLmqQ==",
+      "license": "MIT"
+    },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
       "resolved": "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz",

openhis-ui-vue3/src/views/catalog/disease/index.vue

@@ -675,7 +675,7 @@ getList();
   }
   
   /* 表格样式调整，移除默认的最大宽度限制 */
-  .table-scroll-container { :deep(.el-table) {
+  .table-scroll-container :deep(.el-table) {
     min-width: 100%;
     width: auto;
   }

openhis-ui-vue3/src/views/inpatientDoctor/home/components/adviceBaseList.vue

@@ -49,7 +49,7 @@ const tableWrapper = ref<HTMLDivElement | null>(null);
 const currentIndex = ref<number>(0);
 const currentSelectRow = ref<any>({});
 const queryParams = ref({
-  pageSize: 100,
+  pageSize: 30,
   pageNo: 1,
   adviceTypes: [1, 2, 3, 6],
   searchKey: '',

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/surgeryApplication.vue

@@ -48,31 +48,31 @@
               />
               <el-option
                 label="待签发"
-                value="0"
-              />
-              <el-option
-                label="已签发"
                 value="1"
               />
               <el-option
-                label="已校对"
+                label="已签发"
                 value="2"
               />
               <el-option
-                label="已执行"
+                label="已校对"
                 value="3"
               />
               <el-option
-                label="已安排"
+                label="已执行"
                 value="4"
               />
               <el-option
-                label="已完成"
+                label="已安排"
                 value="5"
               />
+              <el-option
+                label="已完成"
+                value="6"
+              />
               <el-option
                 label="已作废"
-                value="7"
+                value="10"
               />
             </el-select>
           </el-form-item>
@@ -118,7 +118,7 @@
           />
           <el-table-column
             label="手术单号"
-            width="160"
+            min-width="160"
             align="center"
           >
             <template #default="scope">
@@ -133,25 +133,40 @@
           <el-table-column
             prop="patientName"
             label="患者姓名"
-            width="120"
+            min-width="100"
           />
           <el-table-column
             prop="name"
             label="申请单名称"
-            width="140"
+            min-width="140"
           />
           <el-table-column
             prop="createTime"
             label="创建时间"
-            width="160"
+            min-width="160"
           />
           <el-table-column
             prop="requesterId_dictText"
             label="申请者"
-            width="120"
+            min-width="100"
           />
+          <el-table-column
+            label="状态"
+            min-width="100"
+            align="center"
+          >
+            <template #default="scope">
+              <el-tag
+                :type="getStatusType(scope.row.status)"
+                size="small"
+              >
+                {{ getStatusText(scope.row.status) }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
+            min-width="100"
             align="center"
             fixed="right"
           >
@@ -397,6 +412,25 @@ const handleRefresh = async () => {
   await fetchData();
 };
 
+/** 手术申请单状态映射 (与后端 SurgeryAppStatusEnum 对齐) */
+const statusMap = {
+  1: { text: '待签发', type: 'info' },
+  2: { text: '已签发', type: 'primary' },
+  3: { text: '已校对', type: 'success' },
+  4: { text: '已执行', type: 'warning' },
+  5: { text: '已安排', type: 'warning' },
+  6: { text: '已完成', type: 'success' },
+  10: { text: '已作废', type: 'danger' },
+};
+
+const getStatusText = (status) => {
+  return statusMap[status]?.text || '未知';
+};
+
+const getStatusType = (status) => {
+  return statusMap[status]?.type || 'info';
+};
+
 const labelMap = {
   categoryType: '项目类别',
   targetDepartment: '发往科室',

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/OrderForm.vue

@@ -649,18 +649,18 @@ onMounted(() => {
   nextTick(() => {
     registerFormRef();
   });
-  // Bug #589: 出院带药不自动设置频次为ST，由医生手动选择
+  // Bug #615: 临时医嘱频次默认改为 ONCE（临时一次），不再强制设为 ST
   if (props.row.therapyEnum == '2' && !props.row.rateCode && props.row.adviceType != 7) {
-    setRateCodeToST();
+    setDefaultRateCode();
   }
 });
 
 watch(
   () => props.row.therapyEnum,
   (newVal) => {
-    // Bug #589: 出院带药不自动设置频次为ST，由医生手动选择
+    // Bug #615: 临时医嘱频次仅在字段为空时给默认值，允许医生自主修改
-    if (newVal == '2' && props.row.adviceType != 7) {
+    if (newVal == '2' && !props.row.rateCode && props.row.adviceType != 7) {
-      setRateCodeToST();
+      setDefaultRateCode();
     } else if (newVal == '1') {
       props.row.rateCode = '';
       props.row.rateCode_dictText = '';
@@ -668,15 +668,22 @@ watch(
   }
 );
 
-const setRateCodeToST = () => {
+const setDefaultRateCode = () => {
   if (Array.isArray(props.config.rateCode)) {
-    const stOption = props.config.rateCode.find((item) => item.value === 'ST');
+    // 临时医嘱默认频次：优先选 ONCE（临时一次），其次 ST（立即）
-    if (stOption) {
+    const onceOption = props.config.rateCode.find((item) => item.value === 'ONCE');
-      props.row.rateCode = 'ST';
+    if (onceOption) {
-      props.row.rateCode_dictText = 'ST ' + stOption.label;
+      props.row.rateCode = 'ONCE';
+      props.row.rateCode_dictText = 'ONCE ' + onceOption.label;
     } else {
-      props.row.rateCode = 'ST';
+      const stOption = props.config.rateCode.find((item) => item.value === 'ST');
-      props.row.rateCode_dictText = 'ST 立即';
+      if (stOption) {
+        props.row.rateCode = 'ST';
+        props.row.rateCode_dictText = 'ST ' + stOption.label;
+      } else {
+        props.row.rateCode = 'ST';
+        props.row.rateCode_dictText = 'ST 立即';
+      }
     }
   }
 };

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue

@@ -450,7 +450,7 @@ const filterMethod = (query, item) => {
 
 const mapToTransferItem = (item) => ({
   key: String(item.adviceDefinitionId),
-  label: `${item.adviceName} - ${item.unitCode || ''}`,
+  label: `${item.adviceName} - ${item.unitCode_dictText || item.unitCode || ''}`,
   disabled: false,
 });
 

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -1031,8 +1031,7 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
   rowIndex.value = index;
   row.showPopover = true;
-  // Bug #555: handleFocus 只负责开 popover 和初始化查询参数，搜索由 handleChange 统一处理
+  // Bug #555: handleFocus 初始化查询参数并加载初始数据（searchKey 为空，无竞态风险）
-  // 避免异步 refresh 用旧闭包 searchKey 覆盖 handleChange 的搜索结果
   const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
   let categoryCode = '';
   if (row.adviceType !== undefined) {
@@ -1041,6 +1040,11 @@ function handleFocus(row, index) {
     categoryCode = selectedItem ? selectedItem.categoryCode : (row.categoryCode || '');
   }
   adviceQueryParams.value = { adviceType, categoryCode, searchKey: '' };
+  // 弹窗首次打开时加载初始数据
+  const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
+  if (tableRef && tableRef.refresh) {
+    tableRef.refresh(adviceType, categoryCode, '');
+  }
 }
 
 function handleBlur(row) {