merge: 合并远程 develop 分支，解决 package-lock.json 冲突

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/IOutpatientRegistrationAppService.java

@@ -48,6 +48,11 @@ public interface IOutpatientRegistrationAppService {
     IPage<PractitionerMetadata> getPractitionerMetadataByLocationId(Long orgId, String searchKey, Integer pageNo,
         Integer pageSize);
 
+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    IPage<PractitionerMetadata> getAllDoctors(String searchKey, Integer pageNo, Integer pageSize);
+
     /**
      * 根据机构id筛选服务项目
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java

@@ -243,6 +243,22 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
         return practitionerMetadataPage;
     }
 
+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    @Override
+    public IPage<PractitionerMetadata> getAllDoctors(String searchKey, Integer pageNo, Integer pageSize) {
+        QueryWrapper<PractitionerMetadata> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
+            new HashSet<>(Arrays.asList("name", "py_str", "wb_str")), null);
+        IPage<PractitionerMetadata> page =
+            outpatientRegistrationAppMapper.getAllDoctorPage(new Page<>(pageNo, pageSize),
+                PractitionerRoles.DOCTOR.getCode(), queryWrapper);
+        page.getRecords().forEach(e -> {
+            e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()));
+        });
+        return page;
+    }
+
     /**
      * 根据机构id筛选服务项目
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/controller/OutpatientRegistrationController.java

@@ -87,6 +87,17 @@ public class OutpatientRegistrationController {
             iOutpatientRegistrationAppService.getPractitionerMetadataByLocationId(orgId, searchKey, pageNo, pageSize));
     }
 
+    /**
+     * 查询全院医生（不限科室），用于手术申请等需跨科室选择医生的场景
+     */
+    @GetMapping(value = "/all-doctors")
+    public R<?> getAllDoctors(
+        @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+        @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+        @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize) {
+        return R.ok(iOutpatientRegistrationAppService.getAllDoctors(searchKey, pageNo, pageSize));
+    }
+
     /**
      * 根据机构id筛选服务项目
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/mapper/OutpatientRegistrationAppMapper.java

@@ -24,6 +24,13 @@ public interface OutpatientRegistrationAppMapper {
         @Param("orgId") Long orgId, @Param("RoleCode") String RoleCode,
         @Param(Constants.WRAPPER) QueryWrapper<PractitionerMetadata> queryWrapper);
 
+    /**
+     * 查询全院医生（不限科室），按角色过滤
+     */
+    IPage<PractitionerMetadata> getAllDoctorPage(@Param("page") Page<PractitionerMetadata> page,
+        @Param("RoleCode") String RoleCode,
+        @Param(Constants.WRAPPER) QueryWrapper<PractitionerMetadata> queryWrapper);
+
     /**
      * 根据病人id和科室id查询当日挂号次数
      */

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

@@ -39,6 +39,16 @@ public class HomeStatisticsDto {
      * 相对前日变化百分比
      */
     private Double revenueTrend;
+
+    /**
+     * 今日收入金额（数值，单位：元）
+     */
+    private java.math.BigDecimal todayRevenueAmount;
+
+    /**
+     * 昨日收入金额（数值，单位：元）
+     */
+    private java.math.BigDecimal yesterdayRevenueAmount;
     
     /**
      * 今日预约数量
@@ -69,4 +79,19 @@ public class HomeStatisticsDto {
      * 待写病历数量
      */
     private Integer pendingEmr;
-}
+
+    /**
+     * 今日处方数量
+     */
+    private Integer todayPrescriptions;
+
+    /**
+     * 昨日处方数量
+     */
+    private Integer yesterdayPrescriptions;
+
+    /**
+     * 处方相对前日变化百分比
+     */
+    private Double prescriptionTrend;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/service/impl/HomeStatisticsServiceImpl.java

@@ -13,7 +13,16 @@ import com.openhis.administration.service.IPatientService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.enums.ParticipantType;
 import com.openhis.web.dto.HomeStatisticsDto;
+import com.openhis.financial.domain.PaymentReconciliation;
+import com.openhis.financial.service.IPaymentReconciliationService;
+import com.openhis.medication.domain.MedicationRequest;
+import com.openhis.medication.service.IMedicationRequestService;
+import com.openhis.common.enums.PaymentStatus;
 import com.openhis.web.service.IHomeStatisticsService;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import com.openhis.web.patientmanage.mapper.PatientManageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +55,12 @@ public class HomeStatisticsServiceImpl implements IHomeStatisticsService {
     @Autowired
     private IPatientService patientService;
 
+    @Autowired
+    private IPaymentReconciliationService paymentReconciliationService;
+
+    @Autowired
+    private IMedicationRequestService medicationRequestService;
+
     /**
      * 获取首页统计数据
      *
@@ -105,18 +120,108 @@ public class HomeStatisticsServiceImpl implements IHomeStatisticsService {
         double patientTrend = calculateTrend(totalPatients, yesterdayPatients);
         statistics.setPatientTrend(patientTrend);
 
-        // 今日收入和预约等其他统计（暂时设为0，后续从相应表查询）
-        statistics.setTodayRevenue("¥ 0");
-        statistics.setYesterdayRevenue("¥ 0");
-        statistics.setRevenueTrend(0.0);
+        // 查询今日收入
+        BigDecimal todayRevenue = queryRevenueByDate(new Date());
+        BigDecimal yesterdayRevenue = queryRevenueByDate(getYesterday());
+        java.text.DecimalFormat df = new java.text.DecimalFormat("#,##0.00");
+        statistics.setTodayRevenue("¥ " + df.format(todayRevenue));
+        statistics.setYesterdayRevenue("¥ " + df.format(yesterdayRevenue));
+        statistics.setTodayRevenueAmount(todayRevenue);
+        statistics.setYesterdayRevenueAmount(yesterdayRevenue);
+        statistics.setRevenueTrend(calculateTrend(todayRevenue.doubleValue(), yesterdayRevenue.doubleValue()));
+
+        // 今日预约和待审核（暂时设为0，后续实现）
         statistics.setTodayAppointments(0);
         statistics.setYesterdayAppointments(0);
         statistics.setAppointmentTrend(0.0);
         statistics.setPendingApprovals(0);
 
+
+        // 查询今日处方数量
+        int todayPrescriptions = queryPrescriptionCountByDate(new Date(), practitioner);
+        int yesterdayPrescriptions = queryPrescriptionCountByDate(getYesterday(), practitioner);
+        statistics.setTodayPrescriptions(todayPrescriptions);
+        statistics.setYesterdayPrescriptions(yesterdayPrescriptions);
+        statistics.setPrescriptionTrend(calculateTrend(todayPrescriptions, yesterdayPrescriptions));
+
         return statistics;
     }
     
+    /**
+     * 查询指定日期的处方数量
+     *
+     * @param date 日期
+     * @param practitioner 当前医生（null 则查全部）
+     * @return 处方数量
+     */
+    private int queryPrescriptionCountByDate(Date date, Practitioner practitioner) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        Date dayStart = cal.getTime();
+
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        Date dayEnd = cal.getTime();
+
+        LambdaQueryWrapper<MedicationRequest> query = new LambdaQueryWrapper<>();
+        query.ge(MedicationRequest::getCreateTime, dayStart)
+             .lt(MedicationRequest::getCreateTime, dayEnd)
+             .eq(MedicationRequest::getDeleteFlag, "0");
+
+        // 如果是医生角色，只统计自己开的处方
+        if (practitioner != null) {
+            query.eq(MedicationRequest::getPractitionerId, practitioner.getId());
+        }
+
+        return (int) medicationRequestService.count(query);
+    }
+
+    /**
+     * 查询指定日期的收款总额（状态为支付成功且未全部退款）
+     *
+     * @param date 日期
+     * @return 收款总额
+     */
+    private BigDecimal queryRevenueByDate(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        Date dayStart = cal.getTime();
+
+        cal.add(Calendar.DAY_OF_MONTH, 1);
+        Date dayEnd = cal.getTime();
+
+        LambdaQueryWrapper<PaymentReconciliation> query = new LambdaQueryWrapper<>();
+        query.ge(PaymentReconciliation::getBillDate, dayStart)
+             .lt(PaymentReconciliation::getBillDate, dayEnd)
+             .eq(PaymentReconciliation::getStatusEnum, PaymentStatus.SUCCESS.getValue())
+             .eq(PaymentReconciliation::getDeleteFlag, "0")
+             .select(PaymentReconciliation::getDisplayAmount);
+
+        java.util.List<PaymentReconciliation> list = paymentReconciliationService.list(query);
+        if (list == null || list.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+        return list.stream()
+                .map(p -> p.getDisplayAmount() != null ? p.getDisplayAmount() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+
+    /**
+     * 获取昨天的日期
+     */
+    private Date getYesterday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
     /**
      * 计算相对前日的百分比变化
      *

openhis-server-new/openhis-application/src/main/resources/application-dev.yml.bak

@@ -0,0 +1,93 @@
+# 数据源配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: org.postgresql.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
+        username: postgresql
+        password: Jchl1528  # 请替换为实际的数据库密码
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1
+      testWhileIdle: true
+      testOnBorrow: true  # 改为true以确保连接有效
+      testOnReturn: false
+      # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+      filters: stat,wall,slf4j
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: openhis
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 192.168.110.252
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 1
+    # 密码
+    password: Jchl1528
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# 服务器配置
+server:
+  # 服务器的HTTP端口，默认为18080
+  port: 18080
+  servlet:
+    # 应用的访问路径
+    context-path: /openhis

openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml

@@ -31,6 +31,34 @@
             ${ew.customSqlSegment}
     </select>
 
+    <!-- 查询全院医生（不限科室），用于手术申请等需跨科室选择医生的场景 -->
+    <select id="getAllDoctorPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
+        SELECT T3.tenant_id,
+               T3.ID,
+               T3.NAME,
+               T3.gender_enum,
+               T3.py_str,
+               T3.wb_str,
+               T3.dr_profttl_code
+        FROM (
+                 SELECT T1.tenant_id,
+                        T1.ID,
+                        T1.NAME,
+                        T1.gender_enum,
+                        T1.py_str,
+                        T1.wb_str,
+                        T1.dr_profttl_code
+                 FROM adm_practitioner AS T1
+                 WHERE T1.delete_flag = '0'
+                   AND EXISTS(SELECT 1
+                              FROM adm_practitioner_role AS T2
+                              WHERE T2.practitioner_id = T1.ID
+                                AND T2.delete_flag = '0'
+                                AND T2.ROLE_code = #{RoleCode})
+             ) AS T3
+            ${ew.customSqlSegment}
+    </select>
+
     <select id="getNumByPatientIdAndOrganizationId" resultType="Integer">
         SELECT COUNT
                    (1)

openhis-ui-vue3/package.json

@@ -28,6 +28,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
+    "@vue/shared": "^3.5.25",
     "@vueup/vue-quill": "1.2.0",
     "@vueuse/core": "10.6.1",
     "axios": "0.27.2",
@@ -37,7 +38,7 @@
     "decimal.js": "^10.5.0",
     "echarts": "^5.4.3",
     "element-china-area-data": "^6.1.0",
-    "element-plus": "^2.12.0",
+    "element-plus": "^2.14.1",
     "file-saver": "^2.0.5",
     "fuse.js": "^7.0.0",
     "html2pdf.js": "^0.10.3",
@@ -59,7 +60,7 @@
     "segmentit": "^2.0.3",
     "sortablejs": "^1.15.6",
     "v-region": "^3.3.0",
-    "vue": "^3.5.13",
+    "vue": "^3.5.25",
     "vue-area-linkage": "^5.1.0",
     "vue-cropper": "^1.1.1",
     "vue-plugin-hiprint": "^0.0.19",
@@ -71,7 +72,6 @@
     "@playwright/test": "^1.58.2",
     "@types/node": "^25.0.1",
     "@vitejs/plugin-vue": "4.5.0",
-    "@vue/compiler-sfc": "3.3.9",
     "@vue/test-utils": "^2.4.6",
     "eslint": "^9.39.4",
     "eslint-import-resolver-alias": "^1.1.2",
@@ -81,10 +81,9 @@
     "happy-dom": "^20.8.3",
     "jsdom": "^28.1.0",
     "pg": "^8.18.0",
-    "sass": "1.69.5",
+    "sass": "^1.100.0",
     "typescript": "^5.9.3",
     "unplugin-auto-import": "0.17.1",
-    "unplugin-vue-setup-extend-plus": "1.0.0",
     "vite": "5.0.4",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1",

openhis-ui-vue3/src/assets/styles/btn.scss

@@ -1,3 +1,4 @@
+@use 'sass:color';
 @import './variables.module.scss';
 
 // Element Plus风格的颜色按钮样式
@@ -22,14 +23,14 @@
 
   &:hover,
   &:focus {
-    background-color: lighten($color, 10%);
-    border-color: lighten($color, 10%);
+    background-color: color.adjust($color, $lightness: 10%);
+    border-color: color.adjust($color, $lightness: 10%);
     color: #fff;
   }
 
   &:active {
-    background-color: darken($color, 5%);
-    border-color: darken($color, 5%);
+    background-color: color.adjust($color, $lightness: -5%);
+    border-color: color.adjust($color, $lightness: -5%);
     color: #fff;
   }
 
@@ -90,7 +91,7 @@
 
   &:hover,
   &:focus {
-    color: #409eff;
+    color: #3B82F6;
     border-color: #c6e2ff;
     background-color: #ecf5ff;
   }
@@ -149,7 +150,7 @@
 // 不同颜色的链接按钮
 .blue-btn-link {
   @extend .pan-btn-link;
-  color: #409eff;
+  color: #3B82F6;
   
   &:hover,
   &:focus {
@@ -159,7 +160,7 @@
 
 .red-btn-link {
   @extend .pan-btn-link;
-  color: #f56c6c;
+  color: #EF4444;
   
   &:hover,
   &:focus {
@@ -169,7 +170,7 @@
 
 .info-btn-link {
   @extend .pan-btn-link;
-  color: #909399;
+  color: #64748B;
   
   &:hover,
   &:focus {

openhis-ui-vue3/src/assets/styles/openhis.scss

@@ -145,7 +145,7 @@
 /** 表格更多操作下拉样式 */
 .el-table .el-dropdown-link {
 	cursor: pointer;
-	color: #409EFF;
+	color: #3B82F6;
 	margin-left: 10px;
 }
 

openhis-ui-vue3/src/assets/styles/ui-standard.scss

@@ -245,7 +245,7 @@
   padding: 60px 0;
 
   &__description {
-    color: #909399;
+    color: #64748B;
     font-size: 14px;
     margin-top: 16px;
   }
@@ -285,23 +285,23 @@
    14. 工具类
    ============================================ */
 .text-primary {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .text-success {
-  color: #67c23a;
+  color: #10B981;
 }
 
 .text-warning {
-  color: #e6a23c;
+  color: #F59E0B;
 }
 
 .text-danger {
-  color: #f56c6c;
+  color: #EF4444;
 }
 
 .text-info {
-  color: #909399;
+  color: #64748B;
 }
 
 .text-regular {
@@ -309,7 +309,7 @@
 }
 
 .text-secondary {
-  color: #909399;
+  color: #64748B;
 }
 
 /* ============================================

openhis-ui-vue3/src/assets/styles/variables.module.scss

@@ -8,39 +8,24 @@ $tiffany: #4AB7BD;
 $yellow: #FEC171;
 $panGreen: #30B08F;
 
-// 默认菜单主题风格
-$base-menu-color: #bfcbd9;
-$base-menu-color-active: #f4f4f5;
-$base-menu-background: #304156;
+// 菜单主题风格 — 微调为更深邃的午夜蓝
+$base-menu-color: rgba(255, 255, 255, 0.65);
+$base-menu-color-active: #FFFFFF;
+$base-menu-background: #0F172A;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color: rgba(0, 0, 0, 0.7);
 $base-menu-light-background: #ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background: #1f2d3d;
-$base-sub-menu-hover: #001528;
+$base-sub-menu-background: #0C1322;
+$base-sub-menu-hover: #1E293B;
 
-// 自定义暗色菜单风格
-/**
-$base-menu-color:hsla(0,0%,100%,.65);
-$base-menu-color-active:#fff;
-$base-menu-background:#001529;
-$base-logo-title-color: #ffffff;
-
-$base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #001529;
-
-$base-sub-menu-background:#000c17;
-$base-sub-menu-hover:#001528;
-*/
-
-$--color-primary: #409EFF;
-$--color-success: #67C23A;
-$--color-warning: #E6A23C;
-$--color-danger: #F56C6C;
-$--color-info: #909399;
+$--color-primary: #3B82F6;
+$--color-success: #10B981;
+$--color-warning: #F59E0B;
+$--color-danger: #EF4444;
+$--color-info: #64748B;
 
 // 侧边栏宽度（垂直菜单）
 $sideBarWidth: 200px;
@@ -49,8 +34,6 @@ $base-sidebar-width: $sideBarWidth;
 // Logo高度
 $logoHeight: 50px;
 
-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
 :export {
   menuColor: $base-menu-color;
   menuLightColor: $base-menu-light-color;
@@ -67,4 +50,4 @@ $logoHeight: 50px;
   dangerColor: $--color-danger;
   infoColor: $--color-info;
   warningColor: $--color-warning;
-}
+}

openhis-ui-vue3/src/components/Auto/printBills/changeShiftBill.vue

@@ -166,7 +166,7 @@ export default {
     height: 200px !important;
     width: 740px;
 
-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
       font-size: 10px !important;
     }
     .printView_header {

openhis-ui-vue3/src/components/Auto/printBills/exeOrderSheet.vue

@@ -230,7 +230,7 @@ export default {
     height: 500px !important;
     width: 680px;
 
-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
       font-size: 10px !important;
     }
     .printView_header {

openhis-ui-vue3/src/components/Auto/printBills/injectOrderSheet.vue

@@ -174,7 +174,7 @@ export default {
     height: 200px !important;
     width: 680px;
 
-    /deep/ .el-table .cell {
+    :deep(.el-table .cell) {
       font-size: 10px !important;
     }
     .printView_header {

openhis-ui-vue3/src/components/FileUpload/index.vue

@@ -26,10 +26,10 @@
     >
       请上传
       <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        大小不超过 <b style="color: #EF4444">{{ fileSize }}MB</b>
       </template>
       <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+        格式为 <b style="color: #EF4444">{{ fileType.join("/") }}</b>
       </template>
       的文件
     </div>

openhis-ui-vue3/src/components/ImagePreview/index.vue

@@ -85,7 +85,7 @@ const realHeight = computed(() =>
     align-items: center;
     width: 100%;
     height: 100%;
-    color: #909399;
+    color: #64748B;
     font-size: 30px;
   }
 }

openhis-ui-vue3/src/components/ImageUpload/index.vue

@@ -28,10 +28,10 @@
     >
       请上传
       <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+        大小不超过 <b style="color: #EF4444">{{ fileSize }}MB</b>
       </template>
       <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+        格式为 <b style="color: #EF4444">{{ fileType.join("/") }}</b>
       </template>
       的文件
     </div>

openhis-ui-vue3/src/components/NoticePanel.vue

@@ -263,7 +263,7 @@ defineExpose({
 
   &.is-read {
     .notice-title {
-      color: #909399;
+      color: #64748B;
     }
   }
 
@@ -284,7 +284,7 @@ defineExpose({
     display: inline-block;
     width: 6px;
     height: 6px;
-    background-color: #f56c6c;
+    background-color: #EF4444;
     border-radius: 50%;
     margin-right: 8px;
     flex-shrink: 0;
@@ -296,7 +296,7 @@ defineExpose({
   justify-content: space-between;
   align-items: center;
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   gap: 8px;
 
   .notice-type,
@@ -321,7 +321,7 @@ defineExpose({
 
 .detail-time {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }
 
 .detail-content {

openhis-ui-vue3/src/components/NoticePanel/index.vue

@@ -579,7 +579,7 @@ defineExpose({
 
 .priority-low {
   background: #f0f2f5;
-  color: #909399;
+  color: #64748B;
   border-color: #dcdfe6;
   
   &:hover {

openhis-ui-vue3/src/components/NoticePopup/index.vue

@@ -481,20 +481,20 @@ defineExpose({
       
       // 优先级标签样式
       .priority-high {
-        color: #f56c6c;
-        border-color: #f56c6c;
+        color: #EF4444;
+        border-color: #EF4444;
         background: #fef0f0;
       }
       
       .priority-medium {
-        color: #e6a23c;
-        border-color: #e6a23c;
+        color: #F59E0B;
+        border-color: #F59E0B;
         background: #fdf6ec;
       }
       
       .priority-low {
-        color: #909399;
-        border-color: #909399;
+        color: #64748B;
+        border-color: #64748B;
         background: #f4f4f5;
       }
       
@@ -612,7 +612,7 @@ defineExpose({
 
 .priority-low {
   background: #f0f2f5;
-  color: #909399;
+  color: #64748B;
   border-color: #dcdfe6;
   
   &:hover {

openhis-ui-vue3/src/components/OpenHis/TraceNoDialog/index.vue

@@ -95,7 +95,7 @@
                 justify-content: center;
                 width: 16px;
                 height: 16px;
-                background: #f56c6c;
+                background: #EF4444;
                 border-radius: 50%;
                 cursor: pointer;
               "

openhis-ui-vue3/src/components/PatientList/index.vue

@@ -303,15 +303,15 @@ const getStatusColor = (statusEnum?: number): string => {
 
   switch (statusEnum) {
     case 2: // REGISTERED - 待入科
-      return '#E6A23C'; // 橙色
+      return '#F59E0B'; // 橙色
     case 3: // AWAITING_DISCHARGE - 待出院
-      return '#F56C6C'; // 红色
+      return '#EF4444'; // 红色
     case 4: // DISCHARGED_FROM_HOSPITAL - 待出院结算
-      return '#909399'; // 灰色
+      return '#64748B'; // 灰色
     case 5: // ADMITTED_TO_THE_HOSPITAL - 已入院
-      return '#67C23A'; // 绿色
+      return '#10B981'; // 绿色
     case 6: // PENDING_TRANSFER - 待转科
-      return '#409EFF'; // 蓝色
+      return '#3B82F6'; // 蓝色
     default:
       return '';
   }

openhis-ui-vue3/src/components/TableLayout/index.vue

@@ -355,9 +355,9 @@ defineExpose({
       height: 24px;
 
       &:hover {
-        background-color: #409eff;
+        background-color: #3B82F6;
         color: #fff;
-        border-color: #409eff;
+        border-color: #3B82F6;
       }
     }
   }

openhis-ui-vue3/src/layout/components/Navbar.vue

@@ -361,7 +361,7 @@ function goToHelpCenter() {
           font-size: 20px;
 
           &:hover {
-            color: #409eff;
+            color: #3B82F6;
           }
         }
       }
@@ -441,7 +441,7 @@ function goToHelpCenter() {
           transition: color 0.3s;
 
           &:hover {
-            color: #409eff;
+            color: #3B82F6;
           }
         }
 
@@ -576,7 +576,7 @@ function goToHelpCenter() {
     }
 
     .el-dropdown-menu__item.is-active {
-      color: #409eff !important;
+      color: #3B82F6 !important;
       font-weight: 500 !important;
       background-color: #ecf5ff !important;
     }

openhis-ui-vue3/src/layout/components/Settings/index.vue

@@ -177,7 +177,7 @@ const showSettings = ref(false);
 const theme = ref(settingsStore.theme);
 const sideTheme = ref(settingsStore.sideTheme);
 const storeSettings = computed(() => settingsStore);
-const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
+const predefineColors = ref(["#3B82F6", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
 
 /** 是否需要topnav */
 function topNavChange(val) {

openhis-ui-vue3/src/template/inHospitalSurgicalRecord.vue

@@ -774,7 +774,7 @@ defineExpose({ submit, setFormData, printFun });
 
 .signature-tip {
   font-size: 12px;
-  color: #f56c6c;
+  color: #EF4444;
   margin-top: 4px;
 }
 

openhis-ui-vue3/src/template/inHosptialCommunicate.vue

@@ -659,7 +659,7 @@ defineExpose({ submit, setFormData });
 
 .signature-tip {
   font-size: 12px;
-  color: #f56c6c;
+  color: #EF4444;
   margin-top: 4px;
 }
 

openhis-ui-vue3/src/views/appoinmentmanage/deptManage/doctorschedule/index.vue

@@ -991,7 +991,7 @@ watch(
 
 .record-icon {
   font-size: 18px;
-  color: #409eff;
+  color: #3B82F6;
   cursor: pointer;
   transition: color 0.2s;
 }

openhis-ui-vue3/src/views/appoinmentmanage/deptManage/index.vue

@@ -2307,7 +2307,7 @@ onMounted(async () => {
 
 .record-icon {
   font-size: 18px;
-  color: #409eff;
+  color: #3B82F6;
   cursor: pointer;
   transition: color 0.2s;
 }
@@ -2377,7 +2377,7 @@ onMounted(async () => {
   font-size: 36px !important;
   width: 36px !important;
   height: 36px !important;
-  color: #F56C6C !important; /* 直接设置为红色 */
+  color: #EF4444 !important; /* 直接设置为红色 */
   transition: all 0.2s ease-in-out;
 }
 

openhis-ui-vue3/src/views/appoinmentmanage/deptappthoursManage/index.vue

@@ -1059,18 +1059,18 @@ $form-element-spacing: 16px;
   }
 
   &.el-button--danger {
-    color: #f56c6c;
+    color: #EF4444;
 
     &:hover {
-      color: lighten(#f56c6c, 10%);
+      color: lighten(#EF4444, 10%);
     }
   }
 
   &.el-button--info {
-    color: #909399;
+    color: #64748B;
 
     &:hover {
-      color: lighten(#909399, 10%);
+      color: lighten(#64748B, 10%);
     }
   }
 }

openhis-ui-vue3/src/views/basicmanage/InvoiceManagement/index.vue

@@ -1414,7 +1414,7 @@ export default {
 
 .role-badge.operator {
   background-color: #f6ffed;
-  color: #67c23a;
+  color: #10B981;
   border: 1px solid #d9f7be;
 }
 
@@ -1448,7 +1448,7 @@ export default {
   margin: 0 0 8px 0;
   font-size: 14px;
   font-weight: 600;
-  color: #f56c6c;
+  color: #EF4444;
 }
 
 .error-list {
@@ -1526,7 +1526,7 @@ export default {
 
 .employee-id {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   background-color: #f4f4f5;
   padding: 2px 6px;
   border-radius: 8px;
@@ -1555,7 +1555,7 @@ export default {
 }
 
 .form-control:focus {
-  border-color: #409eff;
+  border-color: #3B82F6;
   box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.1);
 }
 
@@ -1570,7 +1570,7 @@ export default {
 .no-data-row {
   text-align: center;
   padding: 30px 0 !important;
-  color: #909399;
+  color: #64748B;
   font-style: normal;
   background-color: #fafafa;
 }
@@ -1581,7 +1581,7 @@ export default {
 
 .info-card {
   background-color: #f5f7fa;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
   padding: 12px 16px;
   border-radius: 4px;
 }

openhis-ui-vue3/src/views/basicmanage/medicalOrderSet/components/adviceBaseList.vue

@@ -329,6 +329,6 @@ defineExpose({
   background: #fff;
 }
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff;
+  outline: 2px solid #3B82F6;
 }
 </style>

openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/adviceBaseList.vue

@@ -191,6 +191,6 @@ defineExpose({
     
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #3B82F6; /* 聚焦时的高亮效果 */
 }
 </style>

openhis-ui-vue3/src/views/basicmanage/ordersCombination/components/prescriptionlist.vue

@@ -1375,7 +1375,7 @@ defineExpose({ getListInfo });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/basicmanage/ordersCombination/index.vue

@@ -88,7 +88,7 @@
             </el-button>
             <el-button
               link
-              style="color: #f56c6c"
+              style="color: #EF4444"
               @click="deleteTemplate(row.id)"
             >
               删除
@@ -311,7 +311,7 @@ const deleteTemplate = (id) => {
 
 .card-header i {
   margin-right: 10px;
-  color: #409eff;
+  color: #3B82F6;
   font-size: 18px;
 }
 
@@ -345,7 +345,7 @@ const deleteTemplate = (id) => {
 
 .custom-tree-node i {
   margin-right: 8px;
-  color: #909399;
+  color: #64748B;
 }
 
 .node-label {
@@ -396,7 +396,7 @@ const deleteTemplate = (id) => {
 }
 
 .el-button--primary {
-  background: linear-gradient(135deg, #409eff, #337ecc);
+  background: linear-gradient(135deg, #3B82F6, #337ecc);
   border: none;
 }
 

openhis-ui-vue3/src/views/basicmanage/tcmMedicalOrderSet/components/tcmMedicineList.vue

@@ -294,6 +294,6 @@ defineExpose({
   background: #fff;
 }
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff;
+  outline: 2px solid #3B82F6;
 }
 </style>

openhis-ui-vue3/src/views/cardmanagement/components/AuditDrawer.vue

@@ -511,7 +511,7 @@ watch(() => props.visible, (val) => {
   color: #303133;
   margin: 0 0 16px 0;
   padding-bottom: 8px;
-  border-bottom: 2px solid #409eff;
+  border-bottom: 2px solid #3B82F6;
 }
 
 .card-form-section {
@@ -530,7 +530,7 @@ watch(() => props.visible, (val) => {
   color: #606266;
   margin: 16px 0 12px 0;
   padding-left: 8px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
 }
 
 .audit-records-section {
@@ -561,7 +561,7 @@ watch(() => props.visible, (val) => {
 
 .record-status {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }
 
 .audit-action-section {

openhis-ui-vue3/src/views/cardmanagement/index.vue

@@ -893,22 +893,22 @@ onMounted(() => {
 
 .stat-icon.pending {
   background: rgba(64, 158, 255, 0.1);
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .stat-icon.failed {
   background: rgba(245, 108, 108, 0.1);
-  color: #f56c6c;
+  color: #EF4444;
 }
 
 .stat-icon.success {
   background: rgba(103, 194, 58, 0.1);
-  color: #67c23a;
+  color: #10B981;
 }
 
 .stat-icon.reported {
   background: rgba(144, 147, 153, 0.1);
-  color: #909399;
+  color: #64748B;
 }
 
 .stat-content {
@@ -924,7 +924,7 @@ onMounted(() => {
 
 .stat-label {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
   margin-top: 4px;
 }
 

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue

@@ -385,7 +385,7 @@
                         right: 3px;
                         top: 50%;
                         transform: translateY(-50%);
-                        color: #909399;
+                        color: #64748B;
                       "
                       @click.stop="clearItem(index)"
                     />

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

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

openhis-ui-vue3/src/views/charge/patientCardRenewal/index.vue

@@ -175,13 +175,13 @@
           <div style="display: flex; justify-content: flex-start; gap: 10px; padding: 10px 20px; background-color: #e6f4ff;">
             <el-button
               type="primary"
-              style="background-color: #409eff; border-color: #409eff; padding: 8px 16px; font-size: 14px;"
+              style="background-color: #3B82F6; border-color: #3B82F6; padding: 8px 16px; font-size: 14px;"
               @click="confirmSelectPatient"
             >
               确认(Q)
             </el-button>
             <el-button
-              style="background-color: #f56c6c; border-color: #f56c6c; color: white; padding: 8px 16px; font-size: 14px;"
+              style="background-color: #EF4444; border-color: #EF4444; color: white; padding: 8px 16px; font-size: 14px;"
               @click="showPatientList = false; selectedPatient = null"
             >
               关闭(C)
@@ -656,8 +656,8 @@ const confirmSelectPatient = () => {
 
 .dialog-footer .el-button {
   min-width: 80px;
-  background-color: #f56c6c;
-  border-color: #f56c6c;
+  background-color: #EF4444;
+  border-color: #EF4444;
   color: white;
 }
 
@@ -726,7 +726,7 @@ const confirmSelectPatient = () => {
 }
 
 .title-bar {
-  background: #409eff;
+  background: #3B82F6;
   color: white;
   padding: 10px 15px;
   margin: -10px -10px 15px -10px;
@@ -803,7 +803,7 @@ const confirmSelectPatient = () => {
 .success-icon {
   width: 50px;
   height: 50px;
-  background: #67c23a;
+  background: #10B981;
   color: white;
   border-radius: 50%;
   display: flex;

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue

@@ -280,6 +280,6 @@ defineExpose({
     
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #3B82F6; /* 聚焦时的高亮效果 */
 }
 </style>

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -97,7 +97,7 @@
                     <!-- 库存为空时显示提示 -->
                     <span
                       v-else
-                      style="color: #f56c6c; margin-right: 20px; font-size: 14px;"
+                      style="color: #EF4444; margin-right: 20px; font-size: 14px;"
                     >
                       无可用库存
                     </span>
@@ -1402,7 +1402,7 @@ defineExpose({ getListInfo, closeAllPopovers });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue

@@ -608,7 +608,7 @@ getPharmacyCabinetLists();
 }
 
 .info-label {
-  color: #909399;
+  color: #64748B;
   font-size: 13px;
   white-space: nowrap;
   min-width: 90px;
@@ -661,7 +661,7 @@ getPharmacyCabinetLists();
 }
 
 .value-highlight {
-  color: #409eff;
+  color: #3B82F6;
   font-weight: 700;
   font-size: 15px;
 }
@@ -677,16 +677,16 @@ getPharmacyCabinetLists();
 
 .summary-label {
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .section-title {
   font-size: 15px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   padding: 8px 0 8px 12px;
   margin: 8px 0 6px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
   background: linear-gradient(90deg, rgba(64, 158, 255, 0.05) 0%, transparent 100%);
 }
 

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue

@@ -513,7 +513,7 @@ function cancel() {
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue

@@ -224,7 +224,7 @@ function close() {
 
   .total {
     margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
     font-weight: 500;
   }
 }

openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue

@@ -494,7 +494,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {
 
   &.active {
     background-color: #ecf5ff;
-    border-left: 4px solid #409eff;
+    border-left: 4px solid #3B82F6;
   }
 }
 
@@ -527,7 +527,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {
 
   .total {
     margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
     font-weight: 500;
   }
 }

openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue

@@ -592,7 +592,7 @@ getNurseListData();
 
 .title-info {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
 }
 
 .patient-cards {
@@ -612,12 +612,12 @@ getNurseListData();
 }
 
 .patient-card:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 
 .patient-card.actived {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background: #ecf5ff;
   box-shadow: 0 2px 12px 0 rgba(64, 158, 255, 0.2);
 }
@@ -637,7 +637,7 @@ getNurseListData();
 
 .patient-info {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
 }
 
 .card-divider {
@@ -658,7 +658,7 @@ getNurseListData();
 }
 
 .card-item .label {
-  color: #909399;
+  color: #64748B;
   min-width: 70px;
 }
 
@@ -672,15 +672,15 @@ getNurseListData();
 }
 
 .status-success {
-  color: #67c23a;
+  color: #10B981;
 }
 
 .status-warning {
-  color: #e6a23c;
+  color: #F59E0B;
 }
 
 .status-danger {
-  color: #f56c6c;
+  color: #EF4444;
 }
 
 :deep(.el-table tbody tr:hover > td) {

openhis-ui-vue3/src/views/consultationmanagement/consultationapplication/index.vue

@@ -994,11 +994,11 @@ onMounted(() => {
 
 :deep(.el-input.is-disabled .el-input__inner) {
   background-color: #f5f7fa;
-  color: #909399;
+  color: #64748B;
 }
 
 :deep(.el-textarea.is-disabled .el-textarea__inner) {
   background-color: #f5f7fa;
-  color: #909399;
+  color: #64748B;
 }
 </style>

openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue

@@ -832,7 +832,7 @@ onMounted(() => {
 .opinion-footer {
   margin-top: 8px;
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   text-align: right;
 }
 

openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue

@@ -21,7 +21,7 @@
           >
             <div
               class="stat-card-border"
-              style="border-left-color: #409eff;"
+              style="border-left-color: #3B82F6;"
             />
             <div class="stat-content">
               <div
@@ -30,7 +30,7 @@
               >
                 <el-icon
                   :size="28"
-                  color="#409eff"
+                  color="#3B82F6"
                 >
                   <Clock />
                 </el-icon>
@@ -54,7 +54,7 @@
           >
             <div
               class="stat-card-border"
-              style="border-left-color: #f56c6c;"
+              style="border-left-color: #EF4444;"
             />
             <div class="stat-content">
               <div
@@ -63,7 +63,7 @@
               >
                 <el-icon
                   :size="28"
-                  color="#f56c6c"
+                  color="#EF4444"
                 >
                   <CircleClose />
                 </el-icon>
@@ -87,7 +87,7 @@
           >
             <div
               class="stat-card-border"
-              style="border-left-color: #67c23a;"
+              style="border-left-color: #10B981;"
             />
             <div class="stat-content">
               <div
@@ -96,7 +96,7 @@
               >
                 <el-icon
                   :size="28"
-                  color="#67c23a"
+                  color="#10B981"
                 >
                   <CircleCheck />
                 </el-icon>
@@ -120,7 +120,7 @@
           >
             <div
               class="stat-card-border"
-              style="border-left-color: #e6a23c;"
+              style="border-left-color: #F59E0B;"
             />
             <div class="stat-content">
               <div
@@ -129,7 +129,7 @@
               >
                 <el-icon
                   :size="28"
-                  color="#e6a23c"
+                  color="#F59E0B"
                 >
                   <Document />
                 </el-icon>
@@ -995,7 +995,7 @@
       width="500px"
       :before-close="handleBatchReturnClose"
     >
-      <span style="color: #f56c6c;">即将退回 {{ selectedRows.length }} 张报卡，请谨慎操作</span>
+      <span style="color: #EF4444;">即将退回 {{ selectedRows.length }} 张报卡，请谨慎操作</span>
       <el-form
         :model="batchReturnForm"
         label-width="80px"
@@ -1838,7 +1838,7 @@ function getAuditTypeName(type) {
 
 .stat-label {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
   margin-top: 4px;
 }
 
@@ -1930,7 +1930,7 @@ function getAuditTypeName(type) {
   color: #303133;
   margin: 0 0 16px 0;
   padding-bottom: 8px;
-  border-bottom: 2px solid #409eff;
+  border-bottom: 2px solid #3B82F6;
 }
 
 .card-detail-section {
@@ -1949,7 +1949,7 @@ function getAuditTypeName(type) {
   color: #606266;
   margin: 16px 0 12px 0;
   padding-left: 8px;
-  border-left: 3px solid #409eff;
+  border-left: 3px solid #3B82F6;
 }
 
 .audit-records-section {
@@ -1980,7 +1980,7 @@ function getAuditTypeName(type) {
 
 .record-status {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }
 
 .audit-action-section {

openhis-ui-vue3/src/views/doctorstation/components/consultation.vue

@@ -181,7 +181,7 @@
               <el-button
                 type="danger"
                 size="small"
-                style="background-color: #f56c6c; border-color: #f56c6c;"
+                style="background-color: #EF4444; border-color: #EF4444;"
                 @click="handleCompleteRow(row)"
               >
                 结束
@@ -465,7 +465,7 @@
             v-if="selectedPhysiciansList.length > 0" 
             type="text" 
             size="small" 
-            style="margin-left: auto; color: #f56c6c;"
+            style="margin-left: auto; color: #EF4444;"
             @click="clearAllSelections"
           >
             清空
@@ -1501,7 +1501,7 @@ onUnmounted(() => {
         color: #303133;
         margin-bottom: 15px;
         padding-bottom: 10px;
-        border-bottom: 2px solid #409eff;
+        border-bottom: 2px solid #3B82F6;
       }
       
       .section-title {
@@ -1524,7 +1524,7 @@ onUnmounted(() => {
           min-height: 60px;
           padding: 10px;
           background: #f0f9ff;
-          border: 1px dashed #409eff;
+          border: 1px dashed #3B82F6;
           border-radius: 4px;
           
           .invited-list {
@@ -1534,7 +1534,7 @@ onUnmounted(() => {
           }
           
           .empty-invited {
-            color: #909399;
+            color: #64748B;
             font-size: 13px;
             text-align: center;
             padding: 10px 0;
@@ -1556,7 +1556,7 @@ onUnmounted(() => {
         color: #303133;
         margin-bottom: 15px;
         padding-bottom: 10px;
-        border-bottom: 2px solid #409eff;
+        border-bottom: 2px solid #3B82F6;
       }
       
       .selected-summary {
@@ -1576,7 +1576,7 @@ onUnmounted(() => {
         .summary-count {
           font-size: 18px;
           font-weight: bold;
-          color: #409eff;
+          color: #3B82F6;
           margin: 0 4px;
         }
       }
@@ -1634,7 +1634,7 @@ onUnmounted(() => {
                 height: 20px;
                 line-height: 20px;
                 text-align: center;
-                background: #67c23a;
+                background: #10B981;
                 color: #fff;
                 border-radius: 10px;
                 font-size: 12px;
@@ -1662,14 +1662,14 @@ onUnmounted(() => {
           }
           
                   &.is-checked .el-checkbox__label {
-                    color: #409eff;
+                    color: #3B82F6;
                     font-weight: 500;
                   }
             }
           }
           
               .no-physicians {
-            color: #909399;
+            color: #64748B;
                 font-size: 12px;
             text-align: center;
                 padding: 10px 0;

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -1145,7 +1145,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }
 
 .diagnosis-text:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
 }
 
 .diagnosis-text-content {
@@ -1158,12 +1158,12 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }
 
 .diagnosis-text-icon {
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
 }
 
 .diagnosis-text:hover .diagnosis-text-icon {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 /* 诊断选择弹窗样式 */
@@ -1202,7 +1202,7 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 }
 
 .diagnosis-text:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
 }
 
 .diagnosis-text:empty::before {

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue

@@ -2161,7 +2161,7 @@ defineExpose({ show, showReport, close: handleClose });
 }
 
 :deep(.el-input__wrapper.is-focus) {
-  box-shadow: 0 0 0 1px var(--el-input-focus-border-color, #409eff) inset;
+  box-shadow: 0 0 0 1px var(--el-input-focus-border-color, #3B82F6) inset;
 }
 
 /* 标题区样式 */
@@ -2294,7 +2294,7 @@ defineExpose({ show, showReport, close: handleClose });
 }
 
 .address-selects :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }
 
 .address-selects :deep(.el-input__inner) {
@@ -2321,7 +2321,7 @@ defineExpose({ show, showReport, close: handleClose });
 }
 
 .underline-input :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }
 
 .underline-input :deep(.el-input__inner) {
@@ -2352,7 +2352,7 @@ defineExpose({ show, showReport, close: handleClose });
 }
 
 .underline-select :deep(.el-input__wrapper.is-focus) {
-  border-bottom-color: #409eff;
+  border-bottom-color: #3B82F6;
 }
 
 .underline-select :deep(.el-input__inner) {

openhis-ui-vue3/src/views/doctorstation/components/eprescriptionlist.vue

@@ -616,7 +616,7 @@ defineExpose({ getList });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <div
     class="exam-app-container"
     style="width: 100%; max-width: 1200px;"
@@ -358,7 +358,7 @@
                         :value="opt.value"
                       />
                       <template #empty>
-                        <div style="padding: 10px 0; color: #909399; text-align: center;">
+                        <div style="padding: 10px 0; color: #64748B; text-align: center;">
                           {{ orgLoading ? '加载中...' : '暂无匹配科室' }}
                         </div>
                       </template>
@@ -569,7 +569,7 @@
                     </span>
                     <span
                       v-else-if="scope.row.methods && scope.row.methods.length > 0"
-                      style="color: #909399;"
+                      style="color: #64748B;"
                     >
                       未选择
                     </span>
@@ -2301,7 +2301,7 @@ defineExpose({ getList });
 .total-amount {
   font-size: 15px;
   font-weight: bold;
-  color: #f56c6c;
+  color: #EF4444;
   margin-left: 4px;
 }
 
@@ -2345,7 +2345,7 @@ defineExpose({ getList });
   min-height: 300px;   /* Bug #500: 增大最小高度，避免折叠动画期间容器高度突变 */
 }
 .empty-hint {
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
   text-align: center;
   padding: 20px 0;
@@ -2363,7 +2363,7 @@ defineExpose({ getList });
   width: 6px;
   height: 6px;
   border-radius: 50%;
-  background: #409eff;
+  background: #3B82F6;
   margin-left: 6px;
   animation: dotPulse 1s ease-in-out infinite;
 }
@@ -2407,7 +2407,7 @@ defineExpose({ getList });
 .method-section-title {
   font-size: 12px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   margin-bottom: 4px;
   padding-bottom: 3px;
   border-bottom: 1px dashed #d9ecff;
@@ -2437,7 +2437,7 @@ defineExpose({ getList });
 
 .method-price-tag {
   font-size: 11px;
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: 500;
   flex-shrink: 0;
   margin-left: 6px;
@@ -2510,7 +2510,7 @@ defineExpose({ getList });
 .divider-label {
   font-size: 11px;
   font-weight: 600;
-  color: #909399;
+  color: #64748B;
   letter-spacing: 0.03em;
   flex-shrink: 0;
 }
@@ -2539,7 +2539,7 @@ defineExpose({ getList });
 /* 方法卡片：子级缩进，表示从属于检查项目 */
 .selected-item-card.method-child-card {
   margin-left: 20px;
-  border-left: 3px solid #e6a23c;
+  border-left: 3px solid #F59E0B;
   border-radius: 0 6px 6px 0;
 }
 
@@ -2571,7 +2571,7 @@ defineExpose({ getList });
 
 .fold-chevron {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
   transition: transform 0.2s ease;
   flex-shrink: 0;
   margin-top: 2px;
@@ -2601,7 +2601,7 @@ defineExpose({ getList });
 .fold-kicker {
   font-size: 11px;
   font-weight: 600;
-  color: #909399;
+  color: #64748B;
   letter-spacing: 0.03em;
 }
 
@@ -2627,14 +2627,14 @@ defineExpose({ getList });
 
 .fold-price-strong {
   font-size: 13px;
-  color: #409eff;
+  color: #3B82F6;
   font-weight: 600;
   flex-shrink: 0;
   margin-top: 2px;
 }
 
 .fold-price-strong.warn {
-  color: #e6a23c;
+  color: #F59E0B;
 }
 
 .fold-strip-body {
@@ -2649,7 +2649,7 @@ defineExpose({ getList });
 
 .fold-strip-muted {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   padding: 10px 0 4px;
 }
 
@@ -2685,13 +2685,13 @@ defineExpose({ getList });
 
 .global-method-picker-scope {
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   flex-shrink: 0;
 }
 
 .method-picker-arrow {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
   transition: transform 0.2s ease;
   flex-shrink: 0;
   transform: rotate(-90deg);
@@ -2716,7 +2716,7 @@ defineExpose({ getList });
 
 .expand-icon {
   font-size: 14px;
-  color: #909399;
+  color: #64748B;
   transition: transform 0.2s ease;
   flex-shrink: 0;
   transform: rotate(-90deg);
@@ -2756,7 +2756,7 @@ defineExpose({ getList });
 }
 
 .detail-info {
-  color: #909399;
+  color: #64748B;
   font-size: 10px;
   white-space: nowrap;
 }
@@ -2769,7 +2769,7 @@ defineExpose({ getList });
 .selected-section-title {
   font-size: 12px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   margin-bottom: 8px;
   padding-bottom: 6px;
   border-bottom: 1px dashed #d9ecff;
@@ -2800,14 +2800,14 @@ defineExpose({ getList });
   padding: 10px;
   font-size: 12px;
   font-weight: 600;
-  color: #909399;
+  color: #64748B;
   cursor: pointer;
   border-bottom: 1px dashed #dcdfe6;
   background: #fffbe6;
 }
 
 .package-toggle:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 /* 收起态：仅展示折叠箭头，不显示「套餐明细」等冗余标题 */
@@ -2824,7 +2824,7 @@ defineExpose({ getList });
 }
 
 .package-toggle-minimal:hover {
-  color: #409eff;
+  color: #3B82F6;
   background: #f5f9ff;
 }
 
@@ -2857,7 +2857,7 @@ defineExpose({ getList });
 .package-details-empty {
   padding: 12px 10px;
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
   text-align: center;
 }
 
@@ -2872,7 +2872,7 @@ defineExpose({ getList });
 .package-details-head {
   font-size: 11px;
   font-weight: 600;
-  color: #909399;
+  color: #64748B;
   letter-spacing: 0.02em;
   margin-bottom: 8px;
   padding-bottom: 6px;
@@ -2916,14 +2916,14 @@ defineExpose({ getList });
 
 .detail-qty {
   font-size: 11px;
-  color: #909399;
+  color: #64748B;
   font-variant-numeric: tabular-nums;
 }
 
 .detail-price {
   font-size: 12px;
   font-weight: 600;
-  color: #e6a23c;
+  color: #F59E0B;
   font-variant-numeric: tabular-nums;
 }
 
@@ -2952,7 +2952,7 @@ defineExpose({ getList });
 }
 /* Bug #500: 分类加载中提示样式 */
 .category-loading-hint {
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
   text-align: center;
   padding: 8px 0;

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -152,7 +152,7 @@
             <template #default="scope">
               <el-icon
                 v-if="scope.row.priorityCode == 1"
-                color="#409EFF"
+                color="#3B82F6"
                 :size="18"
               >
                 <Check />
@@ -168,7 +168,7 @@
             <template #default="scope">
               <el-icon
                 v-if="scope.row.applyStatus == 1"
-                color="#409EFF"
+                color="#3B82F6"
                 :size="18"
               >
                 <Check />
@@ -184,7 +184,7 @@
             <template #default="scope">
               <el-icon
                 v-if="scope.row.needRefund"
-                color="#409EFF"
+                color="#3B82F6"
                 :size="18"
               >
                 <Check />
@@ -200,7 +200,7 @@
             <template #default="scope">
               <el-icon
                 v-if="scope.row.needExecute"
-                color="#409EFF"
+                color="#3B82F6"
                 :size="18"
               >
                 <Check />
@@ -243,7 +243,7 @@
                   link
                   size="default"
                   :icon="Delete"
-                  style="color: #f56c6c; font-size: 16px"
+                  style="color: #EF4444; font-size: 16px"
                   title="删除"
                   @click.stop="handleDelete(scope.row)"
                 />
@@ -1009,7 +1009,7 @@
                   <el-icon
                     v-if="category.loading"
                     class="is-loading"
-                    style="margin-left: 8px; color: #409eff;"
+                    style="margin-left: 8px; color: #3B82F6;"
                   >
                     <Loading />
                   </el-icon>
@@ -1122,7 +1122,7 @@
                     <el-button
                       link
                       size="small"
-                      style="color: #f56c6c; margin-left: auto"
+                      style="color: #EF4444; margin-left: auto"
                       @click.stop="removeInspectionItem(item)"
                     >
                       删除
@@ -2852,13 +2852,13 @@ defineExpose({
   }
 
   .el-pager li:hover {
-    border-color: #409eff;
-    color: #409eff;
+    border-color: #3B82F6;
+    color: #3B82F6;
   }
 
   .el-pager li.is-active {
-    border-color: #409eff;
-    background-color: #409eff;
+    border-color: #3B82F6;
+    background-color: #3B82F6;
     color: #fff;
   }
 
@@ -2937,12 +2937,12 @@ defineExpose({
 }
 
 .category-tab:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .category-tab.active {
-  color: #409eff;
-  border-bottom-color: #409eff;
+  color: #3B82F6;
+  border-bottom-color: #3B82F6;
   font-weight: bold;
 }
 
@@ -2964,12 +2964,12 @@ defineExpose({
 }
 
 .inspection-item:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background-color: #ecf5ff;
 }
 
 .inspection-item.selected {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background-color: #ecf5ff;
 }
 
@@ -2978,7 +2978,7 @@ defineExpose({
 }
 
 .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: bold;
 }
 
@@ -3027,7 +3027,7 @@ defineExpose({
 
 .category-item.active {
   background-color: #e6f7ff;
-  color: #409eff;
+  color: #3B82F6;
   font-weight: bold;
 }
 
@@ -3071,12 +3071,12 @@ defineExpose({
 }
 
 .inspection-selector .inspection-item:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background-color: #ecf5ff;
 }
 
 .inspection-selector .inspection-item.selected {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background-color: #ecf5ff;
   font-weight: bold;
 }
@@ -3142,7 +3142,7 @@ defineExpose({
 }
 
 :deep(.inspection-table .el-button--link) {
-  color: #409eff;
+  color: #3B82F6;
   transition: color 0.3s ease;
 }
 
@@ -3151,7 +3151,7 @@ defineExpose({
 }
 
 :deep(.inspection-table .el-button--link:last-child) {
-  color: #f56c6c;
+  color: #EF4444;
 }
 
 :deep(.inspection-table .el-button--link:last-child:hover) {
@@ -3225,7 +3225,7 @@ defineExpose({
   align-items: center;
   justify-content: center;
   padding: 20px;
-  color: #909399;
+  color: #64748B;
   font-size: 14px;
 }
 
@@ -3241,7 +3241,7 @@ defineExpose({
 .load-info {
   margin-left: 8px;
   font-size: 12px;
-  color: #909399;
+  color: #64748B;
 }
 
 /* 没有更多数据提示 */
@@ -3281,7 +3281,7 @@ defineExpose({
 }
 
 .inspection-tree-item .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: bold;
   margin-left: 10px;
 }
@@ -3321,7 +3321,7 @@ defineExpose({
 }
 
 .selected-item-content .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: bold;
   margin-right: 10px;
 }
@@ -3345,7 +3345,7 @@ defineExpose({
 }
 
 .selected-tree-header .item-price {
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: bold;
   margin-left: 16px;
   min-width: 60px;
@@ -3410,14 +3410,14 @@ defineExpose({
 .selected-tree-detail .detail-price {
   width: 60px;
   text-align: right;
-  color: #e6a23c;
+  color: #F59E0B;
   font-weight: 500;
 }
 
 .no-detail {
   text-align: center;
   padding: 10px;
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
 }
 
@@ -3426,7 +3426,7 @@ defineExpose({
   align-items: center;
   justify-content: center;
   padding: 15px;
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
 }
 
@@ -3439,20 +3439,20 @@ defineExpose({
 /* 表单验证错误样式 */
 .form-item-error .el-input__inner,
 .form-item-error .el-textarea__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }
 
 .form-item-error .el-select .el-input__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }
 
 .is-error.el-input .el-input__inner,
 .is-error.el-textarea .el-textarea__inner {
-  border-color: #f56c6c !important;
+  border-color: #EF4444 !important;
 }
 
 .error-message {
-  color: #f56c6c;
+  color: #EF4444;
   font-size: 12px;
   margin-top: 4px;
   line-height: 1;

openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue

@@ -73,7 +73,7 @@
               placement="top"
             >
               <span 
-                style="cursor: pointer; color: #409eff; font-weight: 500; text-decoration: underline;"
+                style="cursor: pointer; color: #3B82F6; font-weight: 500; text-decoration: underline;"
                 @click="handleEditGroup(scope.row)"
               >
                 {{ scope.row.name }}
@@ -129,7 +129,7 @@
       
       <div
         v-if="filteredOrderList.length === 0 && !loading"
-        style="text-align: center; padding: 40px; color: #909399;"
+        style="text-align: center; padding: 40px; color: #64748B;"
       >
         <el-icon
           :size="48"
@@ -350,7 +350,7 @@
         
         <div
           v-if="!editingGroup.detailList || editingGroup.detailList.length === 0" 
-          style="text-align: center; padding: 30px; color: #909399; border: 1px dashed #dcdfe6; margin-top: 10px;"
+          style="text-align: center; padding: 30px; color: #64748B; border: 1px dashed #dcdfe6; margin-top: 10px;"
         >
           <p>暂无项目，点击"添加项目"按钮添加</p>
         </div>
@@ -366,7 +366,7 @@
     >
       <div v-if="currentGroup">
         <h4>{{ currentGroup.name }}</h4>
-        <p style="color: #909399; font-size: 14px;">
+        <p style="color: #64748B; font-size: 14px;">
           使用范围：{{ currentGroup.rangeCode_dictText }} | 
           包含 {{ currentGroup.detailList?.length || 0 }} 个医嘱项
         </p>
@@ -500,7 +500,7 @@
       
       <div
         v-if="adviceItemList.length === 0 && !itemLoading" 
-        style="text-align: center; padding: 30px; color: #909399;"
+        style="text-align: center; padding: 30px; color: #64748B;"
       >
         <p>请输入关键词搜索医嘱项目</p>
       </div>

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -1352,7 +1352,7 @@
           width="160"
         >
           <template #default="scope">
-            <span v-if="!scope.row.isEdit" style="color: #e6a23c;">
+            <span v-if="!scope.row.isEdit" style="color: #F59E0B;">
               {{ scope.row.reasonText || '-' }}
             </span>
           </template>
@@ -5421,7 +5421,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 
@@ -5555,21 +5555,21 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 
 .order-group-action-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   font-size: 14px;
   transition: color 0.2s;
   padding: 2px;
 }
 
 .order-group-action-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .order-group-add {
   padding: 8px 12px;
   cursor: pointer;
   text-align: center;
-  color: #409eff;
+  color: #3B82F6;
   font-size: 13px;
   border-top: 1px solid #f2f3f5;
   display: flex;

openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue

@@ -349,7 +349,7 @@ function clickRow(row) {
 
   .total {
     margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
     font-weight: 500;
   }
 }

openhis-ui-vue3/src/views/doctorstation/components/reportQuery.vue

@@ -267,16 +267,16 @@ watch(
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-link {
-  color: #409eff;
+  color: #3B82F6;
   cursor: pointer;
   text-decoration: underline;
 }

openhis-ui-vue3/src/views/doctorstation/components/reservationRecord.vue

@@ -390,7 +390,7 @@ const getTagType = (appointmentType) => {
   width: 8px;
   height: 8px;
   border-radius: 50%;
-  background-color: #f56c6c;
+  background-color: #EF4444;
 }
 
 .appointment-section {
@@ -463,7 +463,7 @@ const getTagType = (appointmentType) => {
 .patient-info .el-icon,
 .remark .el-icon {
   margin-right: 8px;
-  color: #909399;
+  color: #64748B;
 }
 
 .card-actions {

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1762,12 +1762,12 @@ defineExpose({
   
   /* 表格样式 */
   .el-table {
-    ::v-deep(.cancelled-row) {
+    :deep(.cancelled-row) {
       background-color: #f5f5f5;
       color: #999;
       text-decoration: line-through;
       
-      ::v-deep(.cell) {
+      :deep(.cell) {
         opacity: 0.6;
       }
     }

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue

@@ -12,7 +12,7 @@
           <el-icon
             class="add-icon"
             title="新增处方"
-            style="font-size: 26px !important; margin-left: 10px; color: #409eff"
+            style="font-size: 26px !important; margin-left: 10px; color: #3B82F6"
             @click="addNewPrescription()"
           >
             <plus />
@@ -1521,7 +1521,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 
@@ -1572,7 +1572,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 }
 
 .first-prescription {
-  border-left: 2px solid #409eff;
+  border-left: 2px solid #3B82F6;
 }
 
 .section-header {

openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmMedicineList.vue

@@ -205,6 +205,6 @@ defineExpose({
     
 <style scoped>
 .popover-table-wrapper:focus {
-  outline: 2px solid #409eff; /* 聚焦时的高亮效果 */
+  outline: 2px solid #3B82F6; /* 聚焦时的高亮效果 */
 }
 </style>

openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientPatientList.vue

@@ -641,17 +641,17 @@ const getWaitingDurationClass = (duration) => {
     
     // 候诊时长颜色
     .waiting-short {
-      color: #67c23a;
+      color: #10B981;
       font-weight: 500;
     }
     
     .waiting-medium {
-      color: #e6a23c;
+      color: #F59E0B;
       font-weight: 500;
     }
     
     .waiting-long {
-      color: #f56c6c;
+      color: #EF4444;
       font-weight: 500;
     }
   }

openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/TodayOutpatientStats.vue

@@ -219,25 +219,25 @@ function refreshStats() {
     // 不同统计卡片的颜色
     &.total-registered {
       .stats-icon {
-        background: linear-gradient(135deg, #409eff, #79bbff);
+        background: linear-gradient(135deg, #3B82F6, #79bbff);
       }
     }
     
     &.waiting {
       .stats-icon {
-        background: linear-gradient(135deg, #e6a23c, #fab85c);
+        background: linear-gradient(135deg, #F59E0B, #fab85c);
       }
     }
     
     &.in-progress {
       .stats-icon {
-        background: linear-gradient(135deg, #67c23a, #95d475);
+        background: linear-gradient(135deg, #10B981, #95d475);
       }
     }
     
     &.completed {
       .stats-icon {
-        background: linear-gradient(135deg, #909399, #b1b3b8);
+        background: linear-gradient(135deg, #64748B, #b1b3b8);
       }
     }
   }
@@ -262,7 +262,7 @@ function refreshStats() {
       .el-icon {
         font-size: 32px;
         margin-right: 16px;
-        color: #409eff;
+        color: #3B82F6;
       }
       
       .time-info {
@@ -283,13 +283,13 @@ function refreshStats() {
       // 不同时间统计卡片的颜色
       &.waiting-time {
         .el-icon {
-          color: #e6a23c;
+          color: #F59E0B;
         }
       }
       
       &.visit-time {
         .el-icon {
-          color: #67c23a;
+          color: #10B981;
         }
       }
     }

openhis-ui-vue3/src/views/doctorstation/components/todayOutpatient/index.vue

@@ -11,7 +11,7 @@
             <div class="stats-content">
               <div
                 class="stats-icon"
-                style="background-color: #409eff;"
+                style="background-color: #3B82F6;"
               >
                 <el-icon><User /></el-icon>
               </div>
@@ -34,7 +34,7 @@
             <div class="stats-content">
               <div
                 class="stats-icon"
-                style="background-color: #e6a23c;"
+                style="background-color: #F59E0B;"
               >
                 <el-icon><Clock /></el-icon>
               </div>
@@ -57,7 +57,7 @@
             <div class="stats-content">
               <div
                 class="stats-icon"
-                style="background-color: #67c23a;"
+                style="background-color: #10B981;"
               >
                 <el-icon><VideoPlay /></el-icon>
               </div>
@@ -80,7 +80,7 @@
             <div class="stats-content">
               <div
                 class="stats-icon"
-                style="background-color: #909399;"
+                style="background-color: #64748B;"
               >
                 <el-icon><CircleCheck /></el-icon>
               </div>
@@ -882,7 +882,7 @@ const getStatusTagType = (status) => {
 
           .time-icon {
             font-size: 32px;
-            color: #409eff;
+            color: #3B82F6;
             margin-right: 12px;
           }
 

openhis-ui-vue3/src/views/doctorstation/index.vue

@@ -18,7 +18,7 @@
         <el-badge
           :value="waitCount > 0 ? waitCount : ''"
           :max="10"
-          style="color: #409eff; cursor: pointer;"
+          style="color: #3B82F6; cursor: pointer;"
         >
           <span
             style="font-weight: 600;"

openhis-ui-vue3/src/views/doctorstation/todayOutpatient.vue

@@ -332,7 +332,7 @@ onUnmounted(() => {
         color: #333;
         
         .el-icon-calendar {
-          color: #409eff;
+          color: #3B82F6;
         }
       }
     }

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationDetails.vue

@@ -1233,7 +1233,7 @@ function handleCancel() {
 }
 
 .editable-icon:hover {
-  color: #409eff; /* Element Plus 主题色，可根据需要调整 */
+  color: #3B82F6; /* Element Plus 主题色，可根据需要调整 */
   cursor: pointer;
 }
 /* 批次号容器样式 */
@@ -1251,7 +1251,7 @@ function handleCancel() {
 }
 
 .confirm-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
   cursor: pointer;
 }
 

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/ReturnDrug.vue

@@ -493,7 +493,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {
 
   &.active {
     background-color: #ecf5ff;
-    border-left: 4px solid #409eff;
+    border-left: 4px solid #3B82F6;
   }
 }
 
@@ -526,7 +526,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) {
 
   .total {
     margin-left: 20px;
-    color: #f56c6c;
+    color: #EF4444;
     font-weight: 500;
   }
 }

openhis-ui-vue3/src/views/features/config.vue

@@ -297,10 +297,10 @@ watch(selectedFunctions, () => {
 
 // 获取图标颜色
 const getIconColor = (data) => {
-  if (data.menuType === 'M') return '#409EFF' // 目录蓝色
-  if (data.menuType === 'C') return '#67C23A' // 菜单绿色
-  if (data.menuType === 'F') return '#E6A23C' // 按钮橙色
-  return '#909399' // 默认灰色
+  if (data.menuType === 'M') return '#3B82F6' // 目录蓝色
+  if (data.menuType === 'C') return '#10B981' // 菜单绿色
+  if (data.menuType === 'F') return '#F59E0B' // 按钮橙色
+  return '#64748B' // 默认灰色
 }
 
 // 加载菜单数据
@@ -746,7 +746,7 @@ onUnmounted(() => {
 
     p {
       font-size: 14px;
-      color: #909399;
+      color: #64748B;
     }
   }
 
@@ -846,14 +846,14 @@ onUnmounted(() => {
 }
 
 .selected-function-item.drag-over {
-  border: 2px dashed #409eff;
+  border: 2px dashed #3B82F6;
   background-color: #ecf5ff;
 }
 
 .drag-handle {
   cursor: move;
   padding: 0 8px;
-  color: #909399;
+  color: #64748B;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -906,7 +906,7 @@ onUnmounted(() => {
 
 .sortable-chosen {
   background-color: #ecf5ff;
-  border: 1px solid #409eff;
+  border: 1px solid #3B82F6;
   box-shadow: 0 0 8px rgba(64, 158, 255, 0.3);
 }
 

openhis-ui-vue3/src/views/features/index.vue

@@ -216,10 +216,10 @@ const getIconComponent = (iconName) => {
 
 // 获取图标颜色
 const getIconColor = (data) => {
-  if (data.menuType === 'M') return '#409EFF' // 目录蓝色
-  if (data.menuType === 'C') return '#67C23A' // 菜单绿色
-  if (data.menuType === 'F') return '#E6A23C' // 按钮橙色
-  return '#909399' // 默认灰色
+  if (data.menuType === 'M') return '#3B82F6' // 目录蓝色
+  if (data.menuType === 'C') return '#10B981' // 菜单绿色
+  if (data.menuType === 'F') return '#F59E0B' // 按钮橙色
+  return '#64748B' // 默认灰色
 }
 
 // 加载用户配置的快捷功能
@@ -319,7 +319,7 @@ onMounted(() => {
 
     p {
       font-size: 14px;
-      color: #909399;
+      color: #64748B;
     }
   }
 
@@ -357,7 +357,7 @@ onMounted(() => {
 
       .feature-path {
         font-size: 12px;
-        color: #409EFF;
+        color: #3B82F6;
         margin-bottom: 8px;
         word-break: break-all;
         padding: 2px 8px;
@@ -368,7 +368,7 @@ onMounted(() => {
 
       .feature-desc {
         font-size: 12px;
-        color: #909399;
+        color: #64748B;
         line-height: 1.5;
       }
     }
@@ -377,7 +377,7 @@ onMounted(() => {
       grid-column: 1 / -1;
       text-align: center;
       padding: 40px;
-      color: #909399;
+      color: #64748B;
       font-size: 16px;
 
       .el-link {

openhis-ui-vue3/src/views/gf/ratioApplicationRecord/index.vue

@@ -1422,11 +1422,11 @@ getList();
 }
 
 .completed {
-  background: #67c23a;
+  background: #10B981;
 }
 
 .current {
-  background: #409eff;
+  background: #3B82F6;
 }
 
 .pending {
@@ -1434,7 +1434,7 @@ getList();
 }
 
 .rejected {
-  background: #f56c6c;
+  background: #EF4444;
 }
 
 .approval-detail-dialog :deep(.el-dialog__body) {
@@ -1459,7 +1459,7 @@ getList();
 
 .section-header i {
   margin-right: 8px;
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .basic-info-section {
@@ -1592,11 +1592,11 @@ getList();
 }
 
 .flow-step.success {
-  border-top: 3px solid #67c23a;
+  border-top: 3px solid #10B981;
 }
 
 .flow-step.process {
-  border-top: 3px solid #409eff;
+  border-top: 3px solid #3B82F6;
   animation: pulse 2s infinite;
 }
 
@@ -1605,7 +1605,7 @@ getList();
 }
 
 .flow-step.error {
-  border-top: 3px solid #f56c6c;
+  border-top: 3px solid #EF4444;
 }
 
 .step-header {
@@ -1741,19 +1741,19 @@ getList();
 }
 
 .connector.success {
-  background: linear-gradient(to right, #67c23a, #67c23a);
+  background: linear-gradient(to right, #10B981, #10B981);
 }
 
 .connector.success::before {
-  background: #67c23a;
+  background: #10B981;
 }
 
 .connector.process {
-  background: linear-gradient(to right, #67c23a, #409eff);
+  background: linear-gradient(to right, #10B981, #3B82F6);
 }
 
 .connector.process::before {
-  background: #409eff;
+  background: #3B82F6;
 }
 
 .connector.pending {
@@ -1765,11 +1765,11 @@ getList();
 }
 
 .connector.error {
-  background: linear-gradient(to right, #67c23a, #f56c6c);
+  background: linear-gradient(to right, #10B981, #EF4444);
 }
 
 .connector.error::before {
-  background: #f56c6c;
+  background: #EF4444;
 }
 
 @keyframes pulse {

openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordSecond.vue

@@ -742,11 +742,11 @@ const msgSuccess = (msg) => {
         cursor: pointer;
         border: 1px solid #ccc;
         border-radius: 2px;
-        background: #409eff;
+        background: #3B82F6;
         color: #fff;
       }
       .itemCheckBox:hover {
-        border: 1px solid #409eff;
+        border: 1px solid #3B82F6;
       }
     }
     .tableBoxItem {
@@ -838,11 +838,11 @@ const msgSuccess = (msg) => {
         cursor: pointer;
         border: 1px solid #ccc;
         border-radius: 2px;
-        background: #409eff;
+        background: #3B82F6;
         color: #fff;
       }
       .itemCheckBox:hover {
-        border: 1px solid #409eff;
+        border: 1px solid #3B82F6;
       }
     }
   }
@@ -857,7 +857,7 @@ const msgSuccess = (msg) => {
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/hospitalRecord/components/medicalRecordThird.vue

@@ -1048,11 +1048,11 @@ const logHtml = () => {
             cursor: pointer;
             border: 1px solid #ccc;
             border-radius: 2px;
-            background: #409eff;
+            background: #3B82F6;
             color: #fff;
         }
         .tableBoxItem .itemCheckBox:hover {
-            border: 1px solid #409eff;
+            border: 1px solid #3B82F6;
         }
 
 
@@ -1951,11 +1951,11 @@ const logHtml = () => {
         cursor: pointer;
         border: 1px solid #ccc;
         border-radius: 2px;
-        background: #409eff;
+        background: #3B82F6;
         color: #fff;
       }
       .itemCheckBox:hover {
-        border: 1px solid #409eff;
+        border: 1px solid #3B82F6;
       }
     }
     .tableBoxItem {
@@ -2047,11 +2047,11 @@ const logHtml = () => {
         cursor: pointer;
         border: 1px solid #ccc;
         border-radius: 2px;
-        background: #409eff;
+        background: #3B82F6;
         color: #fff;
       }
       .itemCheckBox:hover {
-        border: 1px solid #409eff;
+        border: 1px solid #3B82F6;
       }
     }
   }
@@ -2103,7 +2103,7 @@ const logHtml = () => {
     justify-content: center;
   }
   .subItemCheckboxAct {
-    background: #409eff;
+    background: #3B82F6;
     width: 18px;
     height: 18px;
     cursor: pointer;
@@ -2122,7 +2122,7 @@ const logHtml = () => {
     color: #fff;
   }
   .subChooseAll:hover {
-    border: 1px solid #409eff;
+    border: 1px solid #3B82F6;
   }
   .subItem1 {
     display: flex;
@@ -2159,7 +2159,7 @@ const logHtml = () => {
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/inHospitalManagement/charge/advanceDeposit/index.vue

@@ -469,7 +469,7 @@ function handleTriggerSearch(busNo) {
 // 移除el-input-group__append的边框，使其与输入框融为一体
 :deep(.el-input-group__append) {
   border-left: 0;
-  background-color: #409eff;
+  background-color: #3B82F6;
   color: white;
   .el-button {
     color: white;

openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/patientInfo.vue

@@ -30,7 +30,7 @@
         </el-radio-group>
         <span
           v-if="!props.isRegistered"
-          style="cursor: pointer; margin: 0 12px 0 30px; color: #409eff"
+          style="cursor: pointer; margin: 0 12px 0 30px; color: #3B82F6"
           @click="handleReadCard(typeCode)"
         >
           {{ '读卡' }}

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

@@ -224,7 +224,7 @@ defineExpose({
   flex-direction: column;
 
   &:focus {
-    outline: 2px solid #409eff;
+    outline: 2px solid #3B82F6;
   }
 }
 </style>

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

@@ -368,13 +368,13 @@ defineExpose({
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
   font-size: 18px;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-refresh-icon.is-loading {

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

@@ -1302,13 +1302,13 @@ defineExpose({
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
   font-size: 18px;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-refresh-icon.is-loading {
@@ -1412,30 +1412,30 @@ defineExpose({
 :deep(.el-tag--info.is-plain) {
   background: #f4f4f5;
   border-color: #e9e9eb;
-  color: #909399;
+  color: #64748B;
 }
 
 :deep(.el-tag--primary.is-plain) {
   background: #ecf5ff;
   border-color: #d9ecff;
-  color: #409eff;
+  color: #3B82F6;
 }
 
 :deep(.el-tag--success.is-plain) {
   background: #f0f9eb;
   border-color: #e1f3d8;
-  color: #67c23a;
+  color: #10B981;
 }
 
 :deep(.el-tag--warning.is-plain) {
   background: #fdf6ec;
   border-color: #faecd8;
-  color: #e6a23c;
+  color: #F59E0B;
 }
 
 :deep(.el-tag--danger.is-plain) {
   background: #fef0f0;
   border-color: #fde2e2;
-  color: #f56c6c;
+  color: #EF4444;
 }
 </style>

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

@@ -1027,12 +1027,12 @@ const handleConfirm = async () => {
 .status-tag {
   padding: 4px 12px;
   border-radius: 4px;
-  background-color: #409eff; /* 蓝色背景 */
+  background-color: #3B82F6; /* 蓝色背景 */
   color: #ffffff; /* 白色文字 */
 }
 
 .condition-text {
-  color: #409eff;
+  color: #3B82F6;
   font-weight: 500;
 }
 
@@ -1071,13 +1071,13 @@ const handleConfirm = async () => {
 
 /* 增强选中状态样式的优先级 */
 .options-horizontal .option-item.selected {
-  background-color: #409eff !important;
+  background-color: #3B82F6 !important;
   color: #ffffff !important;
 }
 
 .option-item:hover:not(.selected) {
   background-color: #ecf5ff;
-  color: #409eff;
+  color: #3B82F6;
 }
 
 /* 响应式调整 */

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

@@ -256,16 +256,16 @@ watch(
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-link {
-  color: #409eff;
+  color: #3B82F6;
   cursor: pointer;
   text-decoration: underline;
 }

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

@@ -555,13 +555,13 @@ defineExpose({
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
   font-size: 18px;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-refresh-icon.is-loading {

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

@@ -931,13 +931,13 @@ defineExpose({
 
 .report-refresh-icon {
   cursor: pointer;
-  color: #909399;
+  color: #64748B;
   transition: color 0.2s;
   font-size: 18px;
 }
 
 .report-refresh-icon:hover {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .report-refresh-icon.is-loading {
@@ -947,7 +947,7 @@ defineExpose({
 .report-status-tag {
   cursor: pointer;
   background-color: #f0f9eb !important;
-  border-color: #67c23a !important;
+  border-color: #10B981 !important;
   color: #529b2e !important;
   font-weight: 600;
 }

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

@@ -250,7 +250,7 @@
               width="180"
             >
               <template #header>
-                <span>中医证候 <span style="color: #f56c6c;">*</span></span>
+                <span>中医证候 <span style="color: #EF4444;">*</span></span>
               </template>
               <template #default="scope">
                 <template v-if="scope.row.diagnosisSystem === '中医'">

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

@@ -694,7 +694,7 @@ defineExpose({ state, loadDiagnosisData })
 }
 
 .diagnosis-text:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
 }
 
 .diagnosis-text-content {
@@ -707,12 +707,12 @@ defineExpose({ state, loadDiagnosisData })
 }
 
 .diagnosis-text-icon {
-  color: #909399;
+  color: #64748B;
   font-size: 12px;
 }
 
 .diagnosis-text:hover .diagnosis-text-icon {
-  color: #409eff;
+  color: #3B82F6;
 }
 
 .diagnosis-popover-container {

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

@@ -818,7 +818,7 @@ defineExpose({
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js

@@ -111,6 +111,17 @@ export function getSurgery(data) {
   });
 }
 
+/**
+ * 查询全院医生（不限科室），用于手术申请
+ */
+export function getAllDoctors(params) {
+  return request({
+    url: '/charge-manage/register/all-doctors',
+    method: 'get',
+    params: params,
+  });
+}
+
 /**
  * 住院患者转科
  */

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

@@ -129,6 +129,8 @@ const showApplicationFormDialog = (name) => {
       applicationFormNameRef?.value.getLocationInfo();
       // 诊断目录列表
       applicationFormNameRef?.value.getDiagnosisList();
+      // 医生列表（手术申请单专用）
+      applicationFormNameRef?.value.loadDoctorOptions?.();
     }, 150);
   } else {
     applicationFormName.value = components.value[name];
@@ -140,6 +142,8 @@ const showApplicationFormDialog = (name) => {
       applicationFormNameRef?.value.getLocationInfo();
       // 诊断目录列表
       applicationFormNameRef?.value.getDiagnosisList();
+      // 医生列表（手术申请单专用）
+      applicationFormNameRef?.value.loadDoctorOptions?.();
     });
   }
 };

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

@@ -808,7 +808,7 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList,
 
       .total-count {
         font-size: 13px;
-        color: #909399;
+        color: #64748B;
         white-space: nowrap;
       }
     }

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

@@ -701,15 +701,15 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList, resetForm, getL
 
 <style lang="scss" scoped>
 // 医疗主题色
-$primary-color: #409eff;
-$success-color: #67c23a;
-$warning-color: #e6a23c;
-$danger-color: #f56c6c;
-$info-color: #909399;
+$primary-color: #3B82F6;
+$success-color: #10B981;
+$warning-color: #F59E0B;
+$danger-color: #EF4444;
+$info-color: #64748B;
 
 $text-primary: #303133;
 $text-regular: #606266;
-$text-secondary: #909399;
+$text-secondary: #64748B;
 $border-color: #dcdfe6;
 $bg-color: #f5f7fa;
 

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

@@ -173,7 +173,7 @@
                 v-model="form.mainSurgeonId"
                 filterable
                 clearable
-                placeholder="请选择主刀医生（支持搜索）"
+                placeholder="请输入关键字搜索医生"
                 style="width: 100%"
               >
                 <el-option
@@ -196,7 +196,7 @@
                 v-model="form.assistant1Id"
                 filterable
                 clearable
-                placeholder="请选择第一助手（支持搜索）"
+                placeholder="请输入关键字搜索医生"
                 style="width: 100%"
               >
                 <el-option
@@ -219,7 +219,7 @@
                 v-model="form.assistant2Id"
                 filterable
                 clearable
-                placeholder="请选择第二助手（支持搜索）"
+                placeholder="请输入关键字搜索医生"
                 style="width: 100%"
               >
                 <el-option
@@ -331,21 +331,22 @@
   </div>
 </template>
 <script setup name="Surgery">
-import {computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
+import {computed, defineEmits, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
-import {getSurgeryPage, saveSurgery} from './api';
+import {getAllDoctors, getSurgeryPage, saveSurgery} from './api';
 import {ElMessage} from 'element-plus';
 import {getDicts} from '@/api/system/dict/data';
-import {listUser} from '@/api/system/user';
 import useUserStore from '@/store/modules/user';
 
 const { proxy } = getCurrentInstance();
+const emits = defineEmits(['submitOk']);
 const userStore = useUserStore();
-// 模块级缓存：避免每次打开弹窗都重新请求手术项目列表
+// 模块级缓存：避免每次打开弹窗都重新请求
 let surgeryRecordsCache = null; // 原始 API 记录
 let surgeryMappedCache = null;  // 映射后的 el-transfer 数据
+let doctorCache = null;         // 医生列表（含默认主刀医生 ID）
 const transferRef = ref(null);
 const dbTotal = ref(0); // 数据库中的手术项目总数
 const checkedCount = computed(() => transferValue.value.length);
@@ -476,7 +477,11 @@ const form = reactive({
   primaryDiagnosisList: [], //主诊断目录
   otherDiagnosisList: [], //其他断目录
 });
-const rules = reactive({});
+const rules = reactive({
+  surgeryLevel: [{ required: true, message: '请选择手术等级', trigger: 'change' }],
+  anesthesiaType: [{ required: true, message: '请选择麻醉方式', trigger: 'change' }],
+  surgerySite: [{ required: true, message: '请选择手术部位', trigger: 'change' }],
+});
 const state = reactive({});
 // 字典选项
 const surgeryLevelOptions = ref([]);
@@ -525,29 +530,32 @@ const loadDictOptions = async () => {
 };
 
 /**
- * 加载医生选项列表
+ * 加载医生列表（全院 doctor 角色）+ 模块级缓存
+ * 后端 SQL 直接过滤 role_code='doctor'，无需前端过滤，快且数据完整
  */
 const loadDoctorOptions = async () => {
+  if (doctorCache) {
+    doctorOptions.value = doctorCache.list;
+    if (doctorCache.defaultId) form.mainSurgeonId = doctorCache.defaultId;
+    return;
+  }
   try {
-    const res = await listUser({ pageNo: 1, pageSize: 1000 });
+    const res = await getAllDoctors({ pageNo: 1, pageSize: 200 });
     if (res.code === 200) {
       const data = res.data?.records || res.rows || res.data || [];
       if (Array.isArray(data)) {
         doctorOptions.value = data.map(item => ({
-          id: item.practitionerId || item.id || item.userId,
-          name: item.nickName || item.name || item.userName,
+          id: item.id,
+          name: item.name,
         }));
       }
     }
-    // 默认主刀医生设为当前登录用户
+    let defaultId = '';
     if (userStore.nickName) {
-      const currentUser = doctorOptions.value.find(
-        doc => doc.name === userStore.nickName
-      );
-      if (currentUser) {
-        form.mainSurgeonId = currentUser.id;
-      }
+      const cur = doctorOptions.value.find(d => d.name === userStore.nickName);
+      if (cur) { defaultId = cur.id; form.mainSurgeonId = defaultId; }
     }
+    doctorCache = { list: doctorOptions.value, defaultId };
   } catch (e) {
     console.error('加载医生列表失败:', e);
   }
@@ -624,10 +632,19 @@ const submit = () => {
     }
   });
 };
+/** 递归规范化树形科室 ID 为字符串，确保与 el-tree-select / findTreeItem 兼容 */
+const normalizeOrgTreeIds = (nodes) => {
+  if (!Array.isArray(nodes)) return [];
+  return nodes.map((node) => ({
+    ...node,
+    id: node.id != null ? String(node.id) : node.id,
+    children: node.children?.length ? normalizeOrgTreeIds(node.children) : undefined,
+  }));
+};
 /** 查询科室 */
 const getLocationInfo = () => {
   getDepartmentList().then((res) => {
-    orgOptions.value = res.data || [];
+    orgOptions.value = normalizeOrgTreeIds(res.data || []);
   });
 };
 // 获取诊断目录
@@ -664,7 +681,7 @@ function getDiagnosisList() {
     }
   });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList, loadDoctorOptions });
 </script>
 <style lang="scss" scoped>
 .surgery-container {

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

@@ -136,7 +136,7 @@
             </el-radio-group>
             <span
               v-else
-              :style="scope.row.dischargeFlag ? 'color: #e6a23c' : (scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5')"
+              :style="scope.row.dischargeFlag ? 'color: #F59E0B' : (scope.row.therapyEnum == '1' ? 'color: #a6745c' : 'color: #3787a5')"
             >
               {{ scope.row.dischargeFlag ? '临时(出院带药)' : (scope.row.therapyEnum === '1' ? '长期' : '临时') }}
             </span>
@@ -2716,7 +2716,7 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 .total-amount {
   font-size: 16px;
   font-weight: 600;
-  color: #409eff;
+  color: #3B82F6;
   white-space: nowrap;
 }
 

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue

@@ -128,7 +128,7 @@
           <!-- 只显示暂无数据文本 -->
           <div
             v-if="AdviceBaseInfoList.length === 0"
-            style="text-align: center; color: #909399; padding: 20px"
+            style="text-align: center; color: #64748B; padding: 20px"
           >
             暂无数据
           </div>
@@ -1176,7 +1176,7 @@ function applyGroupSet() {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 .item-card:hover {
-  border-color: #409eff;
+  border-color: #3B82F6;
   background-color: #ecf5ff;
   box-shadow: 0 4px 12px rgba(64, 158, 255, 0.15);
 }
@@ -1191,7 +1191,7 @@ function applyGroupSet() {
 .status-dot {
   width: 8px;
   height: 8px;
-  background-color: #67c23a;
+  background-color: #10B981;
   border-radius: 50%;
   margin-right: 6px;
 }