Merge remote-tracking branch 'origin/develop' into develop

2026-01-26 11:08:59 +08:00
parent 4f7fc1c09a bd873f81d2
commit 2df1ed645f
18 changed files with 382 additions and 118 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -124,9 +124,10 @@ function getCategoryName(row) {
  } else if (row.adviceType === 2) { // 耗材类型
    return '耗材';
  } else if (row.adviceType === 3) { // 诊疗类型
-    return '诊疗';
+    // 使用目录类别的字典文本显示
+    return row.categoryCode_dictText || row.categoryCode || '诊疗';
  }
-  return row.activityType_enumText || '-';
+  return row.activityType_dictText || '-';
 }

 // 获取医保等级 - 简单直接的实现