diff --git a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
index a8fa2b51..59b0d269 100644
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java
@@ -116,8 +116,11 @@ public class DictAspect {
     }
 
     private String queryDictLabel(String dictTable, String dictCode, String dictText, String dictValue) {
-        if (StringUtils.hasText(dictTable)) {
-            // 场景 1：查询指定表
+        if (!StringUtils.hasText(dictTable)) {
+            // 场景 1：默认字典走DictUtils缓存
+            return DictUtils.getDictLabel(dictCode, dictValue);
+        } else {
+            // 场景 2：查询指定表
             String sql = String.format("SELECT %s FROM %s WHERE %s::varchar = ? LIMIT 1", dictText, dictTable, dictCode);
             try {
                 return jdbcTemplate.queryForObject(sql, String.class, dictValue);
@@ -125,9 +128,6 @@ public class DictAspect {
                 // 如果查询结果为空，返回 空字符串
                 return "";
             }
-        } else {
-            // 场景 2：默认字典走DictUtils缓存
-            return DictUtils.getDictLabel(dictCode, dictValue);
         }
     }
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 01dcc0c7..129764da 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -741,7 +741,7 @@
                         check-strictly
                         default-expand-all
                         :ref="(el) => (inputRefs.orgId = el)"
-                        @change="(value) => handleOrgChange(value, scope.$index)"
+                        @change="(value) => handleOrgChange(value, scope.$index, scope.row)"
                         placeholder="请选择执行科室"
                       />
                     </el-form-item>
@@ -1104,6 +1104,10 @@ const isAdding = ref(false);
 const isSaving = ref(false);
 const prescriptionRef = ref();
 const expandOrder = ref([]); //目前的展开行
+// 更新展开行的函数
+const updateExpandOrder = (keys) => {
+  expandOrder.value = keys;
+};
 const stockList = ref([]);
 const contractList = ref([]);
 const conditionId = ref('');
@@ -2261,7 +2265,7 @@ function handleSaveSign(row, index, prescriptionId) {
     return;
   }
 
-  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  const formRefName = 'formRef' + actualIndex;
   let formRef = proxy.$refs[formRefName];
 
   console.log('handleSaveSign - 查找表单引用:', formRefName, '是否找到:', !!formRef, '类型:', typeof formRef, 'formRef:', formRef);
@@ -2663,7 +2667,7 @@ const handleEnter = (currentProp, row, rowIndex, prescriptionId) => {
     return;
   }
 
-  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  const formRefName = 'formRef' + actualIndex;
   let formRef = proxy.$refs[formRefName];
 
   // 如果 formRef 是数组，取第一个元素