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 91089646..7917e277 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1,71 +1,88 @@
 <template>
-  <div style="width: 100%">
-    <div style="margin-bottom: 5px">
-      <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
-        新增
-      </el-button>
-      <el-button type="primary" @click="handleSaveBatch()" :disabled="false"> 保存 </el-button>
-      <el-button type="primary" @click="handleSave()" :disabled="false"> 签发 </el-button>
-      <el-button type="warning" plain @click="handleSingOut()" :disabled="false"> 撤回 </el-button>
-      <el-button
-        type="primary"
-        plain
-        @click="proxy.$refs.orderFroupRef.handleOpen()"
-        :disabled="false"
-      >
-        组套
-      </el-button>
-      <el-button
-        type="primary"
-        plain
-        :disabled="false"
-        @click="proxy.$refs.prescriptionHistoryRef.handleOpen()"
-      >
-        历史
-      </el-button>
-      <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
-      <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
-      <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
-      <span class="descriptions-item-label"> 诊断： </span>
-      <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
-        <el-option
-          v-for="item in diagnosisList"
-          :key="item.conditionId"
-          :label="item.name"
-          :value="item.definitionId"
-          @click="handleDiagnosisChange(item)"
-        />
-      </el-select>
-      <span class="descriptions-item-label"> 费用性质： </span>
-      <el-select v-model="accountId" placeholder="费用性质" style="width: 180px">
-        <el-option
-          v-for="item in contractList"
-          :key="item.accountId"
-          :label="item.contractName"
-          :value="item.accountId"
-        />
-      </el-select>
-      <span class="descriptions-item-label">
-        合计金额：{{ totalAmount ? totalAmount.toFixed(2) : 0 }}元
-      </span>
-      <el-button type="primary" style="float: right" @click="refresh()" :disabled="false">
-        刷新
+  <div style="width: 100%; height: 100%; display: flex; flex-direction: column;">
+    <!-- 西药处方按钮区域 -->
+    <div style="margin-bottom: 10px; border-bottom: 1px solid #e4e7ed; padding-bottom: 10px; flex-shrink: 0;">
+      <el-button type="primary" @click="handleAddWesternPrescription">
+        +西药方
       </el-button>
     </div>
-    <el-table
-      max-height="650"
-      ref="prescriptionRef"
-      :data="prescriptionList"
-      row-key="uniqueKey"
-      border
-      @cell-click="clickRow"
-      @row-dblclick="clickRowDb"
-      v-loading="loading"
-      :expand-row-keys="expandOrder"
-    >
+    
+    <!-- 可滚动的内容区域 -->
+    <div class="prescription-scroll-container" style="flex: 1; overflow-y: auto; overflow-x: hidden; max-height: calc(100vh - 300px);">
+      <!-- 循环显示所有西药方 -->
+      <div v-for="(prescription, pIndex) in westernPrescriptions" :key="prescription.id" style="margin-bottom: 20px; border: 1px solid #e4e7ed; border-radius: 8px; padding: 10px;">
+      <!-- 西药方标题栏 -->
+      <div style="margin-bottom: 10px; display: flex; align-items: center; justify-content: space-between; background: #f5f7fa; padding: 10px 12px; border-radius: 4px;">
+        <span style="font-weight: 600; font-size: 14px; color: #409eff;">{{ prescription.name }}</span>
+        <el-button type="danger" plain size="small" @click="handleClosePrescription(prescription.id)">删除</el-button>
+      </div>
+      
+      <!-- 西药方操作区 -->
+      <div style="margin-bottom: 5px">
+        <el-button type="primary" @click="handleAddPrescription(prescription.id)" :disabled="false">
+          新增
+        </el-button>
+        <el-button type="primary" @click="handleSaveBatch(prescription.id)" :disabled="false"> 保存 </el-button>
+        <el-button type="primary" @click="handleSave(prescription.id)" :disabled="false"> 签发 </el-button>
+        <el-button type="warning" plain @click="handleSingOut(prescription.id)" :disabled="false"> 撤回 </el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="proxy.$refs.orderFroupRef.handleOpen()"
+          :disabled="false"
+        >
+          组套
+        </el-button>
+        <el-button
+          type="primary"
+          plain
+          :disabled="false"
+          @click="proxy.$refs.prescriptionHistoryRef.handleOpen()"
+        >
+          历史
+        </el-button>
+        <el-button type="default" @click="combination(prescription.id)" :disabled="false"> 组合 </el-button>
+        <el-button type="default" @click="split(prescription.id)" :disabled="false"> 拆组 </el-button>
+        <el-button type="danger" plain @click="handleDelete(prescription.id)" :disabled="false"> 删除 </el-button>
+        <span class="descriptions-item-label"> 诊断： </span>
+        <el-select v-model="prescription.conditionDefinitionId" placeholder="诊断" style="width: 180px" @change="handleDiagnosisChange(prescription.conditionDefinitionId, prescription.id)">
+          <el-option
+            v-for="item in diagnosisList"
+            :key="item.conditionId"
+            :label="item.name"
+            :value="item.definitionId"
+          />
+        </el-select>
+        <span class="descriptions-item-label"> 费用性质： </span>
+        <el-select v-model="prescription.accountId" placeholder="费用性质" style="width: 180px" @change="(value) => { accountId = value; }">
+          <el-option
+            v-for="item in contractList"
+            :key="item.accountId"
+            :label="item.contractName"
+            :value="item.accountId"
+          />
+        </el-select>
+        <span class="descriptions-item-label">
+          合计金额：{{ getPrescriptionTotalAmount(prescription.id) }}元
+        </span>
+        <el-button type="primary" style="float: right" @click="refresh(prescription.id)" :disabled="false">
+          刷新
+        </el-button>
+      </div>
+      <el-table
+        max-height="400"
+        :ref="'prescriptionRef' + pIndex"
+        :data="allPrescriptionsData[prescription.id] || []"
+        row-key="uniqueKey"
+        border
+        @cell-click="(row, column, cell, event) => clickRow(row, column, cell, event, prescription.id)"
+        @row-dblclick="(row, event) => clickRowDb(row, event, prescription.id)"
+        v-loading="loading"
+        :expand-row-keys="prescription.expandOrder || []"
+      >
       <el-table-column type="expand" width="1" style="width: 0">
         <template #default="scope">
-          <el-form :model="scope.row" :rules="rowRules" :ref="'formRef' + scope.$index">
+          <el-form :model="scope.row" :rules="rowRules" :ref="'formRef_' + prescription.id + '_' + scope.$index">
             <div class="expend_div" style="padding: 16px; background: #f8f9fa; border-radius: 8px">
               <template v-if="scope.row.adviceType == 1">
                 <div style="display: flex; align-items: center; margin-bottom: 16px; gap: 16px">
@@ -109,7 +126,7 @@
                         :key="item.inventoryId"
                         :value="item.inventoryId"
                         :label="item.locationName"
-                        @click="handleNumberClick(item, scope.$index)"
+                        @click="handleNumberClick(item, scope.$index, scope.row)"
                       />
                     </el-select>
                   </el-form-item>
@@ -126,7 +143,7 @@
                       controls-position="right"
                       :controls="false"
                       :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].executeNum = el; }"
-                      @keyup.enter.prevent="handleEnter('executeNum', scope.row, scope.$index)"
+                      @keyup.enter.prevent="handleEnter('executeNum', scope.row, scope.$index, prescription.id)"
                       style="width: 70px; margin-right: 20px"
                     />
                   </el-form-item>
@@ -134,8 +151,8 @@
                   <el-form-item label="皮试：" prop="skinTestFlag" style="margin: 0; margin-right: 20px">
                     <el-checkbox
                       v-model="scope.row.skinTestFlag"
-                      :true-label="1"
-                      :false-label="0"
+                      :true-value="1"
+                      :false-value="0"
                     >
                       是
                     </el-checkbox>
@@ -162,7 +179,7 @@
                         style="width: 70px; margin-right: 20px"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].doseQuantity = el; }"
                         @input="convertValues(scope.row, scope.$index)"
-                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index, prescription.id)"
                       />
                     </el-form-item>
                     <!-- 剂量单位 -->
@@ -193,7 +210,7 @@
                         style="width: 70px; margin: 0 20px"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].dose = el; }"
                         @input="convertDoseValues(scope.row, scope.$index)"
-                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index, prescription.id)"
                       />
                     </el-form-item>
                     <!-- 全部单位 -->
@@ -334,7 +351,7 @@
                         controls-position="right"
                         :controls="false"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].quantity = el; }"
-                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index, prescription.id)"
                         @input="calculateTotalPrice(scope.row, scope.$index)"
                       />
                     </el-form-item>
@@ -363,7 +380,7 @@
                       </template>
                     </el-select>
                   </div>
-                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index, prescription.id)">
                     确定
                   </el-button>
                 </div>
@@ -410,7 +427,7 @@
                         :key="item.inventoryId"
                         :value="item.inventoryId"
                         :label="item.locationName"
-                        @click="handleNumberClick(item, scope.$index)"
+                        @click="handleNumberClick(item, scope.$index, scope.row)"
                       />
                     </el-select>
                   </el-form-item>
@@ -427,7 +444,7 @@
                       controls-position="right"
                       :controls="false"
                       :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].executeNum = el; }"
-                      @keyup.enter.prevent="handleEnter('executeNum', scope.row, scope.$index)"
+                      @keyup.enter.prevent="handleEnter('executeNum', scope.row, scope.$index, prescription.id)"
                       style="width: 70px; margin-right: 20px"
                     />
                   </el-form-item>
@@ -435,8 +452,8 @@
                   <el-form-item label="皮试：" prop="skinTestFlag" style="margin: 0; margin-right: 20px">
                     <el-checkbox
                       v-model="scope.row.skinTestFlag"
-                      :true-label="1"
-                      :false-label="0"
+                      :true-value="1"
+                      :false-value="0"
                     >
                       是
                     </el-checkbox>
@@ -463,7 +480,7 @@
                         style="width: 70px; margin-right: 20px"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].doseQuantity = el; }"
                         @input="convertValues(scope.row, scope.$index)"
-                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('doseQuantity', scope.row, scope.$index, prescription.id)"
                       />
                     </el-form-item>
                     <!-- 剂量单位 -->
@@ -494,7 +511,7 @@
                         style="width: 70px; margin: 0 20px"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].dose = el; }"
                         @input="convertDoseValues(scope.row, scope.$index)"
-                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('dose', scope.row, scope.$index, prescription.id)"
                       />
                     </el-form-item>
                     <!-- 全部单位 -->
@@ -635,7 +652,7 @@
                         controls-position="right"
                         :controls="false"
                         :ref="(el) => { if (!inputRefs[scope.$index]) inputRefs[scope.$index] = {}; inputRefs[scope.$index].quantity = el; }"
-                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index, prescription.id)"
                         @input="calculateTotalPrice(scope.row, scope.$index)"
                       />
                     </el-form-item>
@@ -664,7 +681,7 @@
                       </template>
                     </el-select>
                   </div>
-                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index, prescription.id)">
                     确定
                   </el-button>
                 </div>
@@ -692,7 +709,7 @@
                         v-model="scope.row.quantity"
                         controls-position="right"
                         :controls="false"
-                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
+                        @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index, prescription.id)"
                         @input="calculateTotalPrice(scope.row, scope.$index)"
                       />
                     </el-form-item>
@@ -711,7 +728,7 @@
                         value-key="id"
                         check-strictly
                         default-expand-all
-                        @change="(value) => handleOrgChange(value, scope.$index)"
+                        @change="(value) => handleOrgChange(value, scope.$index, scope.row)"
                         placeholder="请选择执行科室"
                       />
                     </el-form-item>
@@ -731,7 +748,7 @@
                       <!-- 金额: {{ scope.row.priceList[0].price }} -->
                     </span>
                   </div>
-                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index, prescription.id)">
                     确定
                   </el-button>
 </div>
@@ -779,7 +796,7 @@
           <template v-if="getRowDisabled(scope.row)">
             <el-select
               v-model="scope.row.adviceType"
-              :ref="'adviceTypeRef' + scope.$index"
+              :ref="'adviceTypeRef_' + prescription.id + '_' + scope.$index"
               placeholder="请选择"
               style="width: 100%"
               @change="handleAdviceTypeChange(scope.row, scope.$index)">
@@ -814,7 +831,7 @@
               />
               <template #reference>
                 <el-input
-                  :ref="'adviceRef' + scope.$index"
+                  :ref="'adviceRef_' + prescription.id + '_' + scope.$index"
                   v-model="scope.row.adviceName"
                   placeholder="请选择项目"
                   @input="handleChange"
@@ -924,7 +941,12 @@
           <el-icon @click="down(scope.row)"><Download /></el-icon>
         </template>
       </el-table-column> -->
-    </el-table>
+      </el-table>
+      </div>
+      <!-- End of v-for loop -->
+    </div>
+    <!-- End of scrollable content area -->
+    
     <OrderGroupDrawer
       ref="orderFroupRef"
       :diagnosis="diagnosisInfo"
@@ -1063,8 +1085,18 @@ const adviceTypeList = ref([
     value: '',
   },
 ]);
+
+// 西药处方管理相关变量
+const westernPrescriptions = ref([]); // 西药处方列表
+const currentPrescriptionId = ref(null); // 当前活跃的处方ID
+const prescriptionCounter = ref(0); // 处方计数器
+const allPrescriptionsData = ref({}); // 存储所有处方的数据，格式: { prescriptionId: [...prescriptionList] }
 onMounted(() => {
   document.addEventListener('keydown', escKeyListener);
+  // 初始化时自动创建第一个西药处方
+  if (westernPrescriptions.value.length === 0) {
+    handleAddWesternPrescription();
+  }
 });
 
 onBeforeUnmount(() => {
@@ -1074,12 +1106,49 @@ watch(
   () => expandOrder.value,
   (newValue) => {
     if (newValue.length > 0) {
-      nextTick(() => {
-        const index = prescriptionList.value.findIndex((row) => row.uniqueKey === newValue[0]);
-        const items = proxy.$refs['formRef' + index]?.$el?.querySelectorAll('[data-prop]');
-        requiredProps.value = Array.from(items).map((item) => item.dataset.prop);
-        console.log(requiredProps.value, 'requiredProps.value');
-      });
+      // 使用 setTimeout 延迟执行，等待表格展开动画完成和表单渲染
+      setTimeout(() => {
+        // 需要查找所有处方中的索引，因为 expandOrder 可能来自任何一个处方
+        let foundIndex = -1;
+        let foundPrescriptionId = null;
+        
+        // 遍历所有处方找到对应的行
+        for (const prescription of westernPrescriptions.value) {
+          const prescriptionData = allPrescriptionsData.value[prescription.id] || [];
+          const index = prescriptionData.findIndex((row) => row.uniqueKey === newValue[0]);
+          if (index !== -1) {
+            foundIndex = index;
+            foundPrescriptionId = prescription.id;
+            break;
+          }
+        }
+        
+        if (foundIndex === -1) {
+          console.warn('找不到对应的行数据, uniqueKey:', newValue[0]);
+          requiredProps.value = [];
+          return;
+        }
+        
+        const formRefName = 'formRef_' + foundPrescriptionId + '_' + foundIndex;
+        let formRef = proxy.$refs[formRefName];
+        
+        // 如果 formRef 是数组，取第一个元素
+        if (Array.isArray(formRef)) {
+          formRef = formRef[0];
+        }
+        
+        console.log('查找表单引用:', formRefName, '是否找到:', !!formRef);
+        
+        if (formRef && formRef.$el) {
+          const items = formRef.$el.querySelectorAll('[data-prop]');
+          requiredProps.value = Array.from(items).map((item) => item.dataset.prop);
+          console.log(requiredProps.value, 'requiredProps.value');
+        } else {
+          // 表单可能还在渲染中，这是正常的，不输出错误
+          console.log('表单正在渲染中，等待下次更新...');
+          requiredProps.value = [];
+        }
+      }, 100); // 延迟 100ms，等待表格展开动画完成
     } else {
       requiredProps.value = {};
     }
@@ -1194,7 +1263,12 @@ function getList() {
     total.value = res.data.total;
   });
 }
-function refresh() {
+function refresh(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   getListInfo(false);
 }
 function getListInfo(addNewRow) {
@@ -1264,6 +1338,57 @@ function getListInfo(addNewRow) {
     })));
     
     groupMarkers.value = getGroupMarkers(prescriptionList.value); // 更新标记
+    
+    // 按处方ID分组数据
+    const prescriptionGroups = {};
+    const prescriptionInfoMap = {}; // 存储处方信息（处方号等）
+    
+    prescriptionList.value.forEach(item => {
+      const prescriptionId = item.prescriptionId || 'default';
+      if (!prescriptionGroups[prescriptionId]) {
+        prescriptionGroups[prescriptionId] = [];
+      }
+      prescriptionGroups[prescriptionId].push(item);
+      
+      // 记录处方号
+      if (item.prescriptionNo && !prescriptionInfoMap[prescriptionId]) {
+        prescriptionInfoMap[prescriptionId] = {
+          prescriptionNo: item.prescriptionNo
+        };
+      }
+    });
+    
+    // 更新 allPrescriptionsData
+    allPrescriptionsData.value = prescriptionGroups;
+    
+    // 更新西药处方列表
+    const existingPrescriptionIds = Object.keys(prescriptionGroups);
+    if (existingPrescriptionIds.length > 0 && existingPrescriptionIds[0] !== 'default') {
+      // 如果有保存的处方数据，重建处方列表
+      westernPrescriptions.value = existingPrescriptionIds.map((id, index) => {
+        const info = prescriptionInfoMap[id] || {};
+        // 查找是否已存在该处方，保留其属性
+        const existing = westernPrescriptions.value.find(p => p.id === id);
+        return {
+          id: id,
+          name: info.prescriptionNo ? `西药方${index + 1}` : `西药方${index + 1}`,
+          prescriptionNo: info.prescriptionNo || '',
+          conditionDefinitionId: existing?.conditionDefinitionId || conditionDefinitionId.value,
+          accountId: existing?.accountId || accountId.value,
+          expandOrder: existing?.expandOrder || []
+        };
+      });
+      
+      // 设置当前活跃处方
+      if (!currentPrescriptionId.value || !existingPrescriptionIds.includes(currentPrescriptionId.value)) {
+        currentPrescriptionId.value = existingPrescriptionIds[0];
+      }
+      
+      // 加载当前处方的数据
+      prescriptionList.value = [...(allPrescriptionsData.value[currentPrescriptionId.value] || [])];
+      prescriptionCounter.value = westernPrescriptions.value.length;
+    }
+    
     if (props.activeTab == 'prescription' && addNewRow) {
       handleAddPrescription();
     }
@@ -1293,7 +1418,12 @@ function getRowDisabled(row) {
 }
 
 // 新增医嘱
-function handleAddPrescription() {
+function handleAddPrescription(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   if (diagnosisList.value.length == 0) {
     proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
     return;
@@ -1302,6 +1432,15 @@ function handleAddPrescription() {
     proxy.$modal.msgWarning('请先保存当前医嘱');
     return;
   }
+  
+  // 检查当前处方的药品数量（西药和中成药）
+  const currentPrescriptionData = allPrescriptionsData.value[prescriptionId || currentPrescriptionId.value] || [];
+  const medicineCount = currentPrescriptionData.filter(item => item.adviceType == 1 || item.adviceType == 2).length;
+  if (medicineCount >= 5) {
+    proxy.$modal.msgWarning('每张处方单最多只能开5个药品，请新建处方单');
+    return;
+  }
+  
   isAdding.value = true;
   // 重置查询参数
   adviceQueryParams.value = {
@@ -1318,22 +1457,43 @@ function handleAddPrescription() {
     isEdit: true,
     statusEnum: 1,
     isSaved: false, // 新增医嘱默认为未保存状态
+    prescriptionId: prescriptionId || currentPrescriptionId.value, // 添加当前处方ID
   });
+  
+  // 更新对应处方的数据
+  if (prescriptionId) {
+    allPrescriptionsData.value[prescriptionId] = [...prescriptionList.value];
+  }
+  
   groupMarkers.value = getGroupMarkers(prescriptionList.value);
   nextTick(() => {
-    proxy.$refs['adviceRef0'].focus();
+    const adviceRefName = 'adviceRef_' + (prescriptionId || currentPrescriptionId.value) + '_0';
+    const adviceRef = proxy.$refs[adviceRefName];
+    if (adviceRef && adviceRef.focus) {
+      adviceRef.focus();
+    }
   });
 }
 
 /**
  * 点击行赋值
  */
-function clickRow(row) {
+function clickRow(row, column, cell, event, prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   emit('selectDiagnosis', row);
 }
 
 // 行双击打开编辑块，仅待发送的可编辑
-function clickRowDb(row) {
+function clickRowDb(row, event, prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   if (row.statusEnum == 1) {
     row = { ...row, ...JSON.parse(row.contentJson), uniqueKey: row.uniqueKey };
     row.isEdit = true;
@@ -1341,8 +1501,7 @@ function clickRowDb(row) {
     const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
     prescriptionList.value[index] = row;
     // 确保只有当前行展开，先清空数组再添加当前行的uniqueKey
-    expandOrder.value = [];
-    expandOrder.value.push(row.uniqueKey);
+    updateExpandOrder([row.uniqueKey]);
   }
 }
 
@@ -1350,10 +1509,26 @@ function up(index, row) {}
 
 function down(index, row) {}
 
-function handleDiagnosisChange(item) {
-  diagnosisName.value = item.name;
-  conditionId.value = item.conditionId;
-  encounterDiagnosisId.value = item.encounterDiagnosisId;
+function handleDiagnosisChange(definitionId, prescriptionId) {
+  // 查找对应的诊断信息
+  const diagnosis = diagnosisList.value.find(item => item.definitionId === definitionId);
+  if (!diagnosis) {
+    return;
+  }
+  
+  // 更新全局诊断信息
+  diagnosisName.value = diagnosis.name;
+  conditionId.value = diagnosis.conditionId;
+  conditionDefinitionId.value = diagnosis.definitionId;
+  encounterDiagnosisId.value = diagnosis.encounterDiagnosisId;
+  
+  // 如果指定了处方ID，更新该处方的诊断信息
+  if (prescriptionId) {
+    const prescription = westernPrescriptions.value.find(p => p.id === prescriptionId);
+    if (prescription) {
+      prescription.conditionDefinitionId = definitionId;
+    }
+  }
 }
 
 function handleFocus(row, index) {
@@ -1424,8 +1599,50 @@ function handleSkinTestChange(row, index) {
  * 选择药品回调
  */
 function selectAdviceBase(key, row) {
+  // 通过 uniqueKey 查找对应的处方和索引
+  let targetPrescriptionId = null;
+  let targetIndex = -1;
+  let targetRow = null;
+  
+  // 遍历所有处方找到对应的行
+  for (const prescription of westernPrescriptions.value) {
+    const prescriptionData = allPrescriptionsData.value[prescription.id] || [];
+    const index = prescriptionData.findIndex((item) => item.uniqueKey === key);
+    if (index !== -1) {
+      targetPrescriptionId = prescription.id;
+      targetIndex = index;
+      targetRow = prescriptionData[index];
+      break;
+    }
+  }
+  
+  if (targetIndex === -1) {
+    console.error('找不到对应的行数据, uniqueKey:', key);
+    return;
+  }
+  
+  // 如果选择的是西药或中成药，检查是否会超过5个药品限制
+  if (row.adviceType == 1 || row.adviceType == 2) {
+    const currentPrescriptionData = allPrescriptionsData.value[targetPrescriptionId] || [];
+    const medicineCount = currentPrescriptionData.filter(item => 
+      item.uniqueKey !== key && (item.adviceType == 1 || item.adviceType == 2)
+    ).length;
+    
+    if (medicineCount >= 5) {
+      proxy.$modal.msgWarning('每张处方单最多只能开5个药品，请新建处方单');
+      // 关闭弹窗并清除该行
+      prescriptionList.value[targetIndex].showPopover = false;
+      return;
+    }
+  }
+  
+  // 切换到目标处方
+  if (targetPrescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(targetPrescriptionId);
+  }
+  
   // 立即关闭当前弹窗
-  prescriptionList.value[rowIndex.value].showPopover = false;
+  prescriptionList.value[targetIndex].showPopover = false;
   if (row.adviceType == 3) {
     getActivityBindDevice({ activityId: row.adviceDefinitionId }).then((res) => {
       if (res.data.activityBindDeviceInfos?.length > 0) {
@@ -1469,7 +1686,7 @@ function selectAdviceBase(key, row) {
     });
   }
   // 保存当前已选择的医嘱类型
-  const currentAdviceType = prescriptionList.value[rowIndex.value].adviceType;
+  const currentAdviceType = prescriptionList.value[targetIndex].adviceType;
   
   // 如果医嘱类型是"全部"（5）或未选择，根据药品的categoryCode自动判断
   // drord_doctor_type: 1=西药, 2=中成药, 3=诊疗, 4=耗材, 5=全部
@@ -1524,8 +1741,8 @@ if (row.categoryCode == '1') {
     ? (typeof row.skinTestFlag === 'number' ? row.skinTestFlag : (row.skinTestFlag ? 1 : 0))
     : 0;
   
-  prescriptionList.value[rowIndex.value] = {
-    ...prescriptionList.value[rowIndex.value],
+  prescriptionList.value[targetIndex] = {
+    ...prescriptionList.value[targetIndex],
     ...JSON.parse(JSON.stringify(row)),
     adviceType: finalAdviceType, // 确保是数字类型
     skinTestFlag: skinTestFlag, // 确保皮试字段是数字类型
@@ -1536,25 +1753,25 @@ if (row.categoryCode == '1') {
     // 如果字典已加载，强制更新视图以确保显示正确的文本
     if (drord_doctor_type.value && drord_doctor_type.value.length > 0) {
       // 触发响应式更新
-      const currentRow = prescriptionList.value[rowIndex.value];
-      prescriptionList.value[rowIndex.value] = {
+      const currentRow = prescriptionList.value[targetIndex];
+      prescriptionList.value[targetIndex] = {
         ...currentRow
       };
     }
   });
-  prescriptionList.value[rowIndex.value].orgId = undefined;
-  prescriptionList.value[rowIndex.value].dose = undefined;
-  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
-  // prescriptionList.value[rowIndex.value].doseUnitCode =
+  prescriptionList.value[targetIndex].orgId = undefined;
+  prescriptionList.value[targetIndex].dose = undefined;
+  prescriptionList.value[targetIndex].unitCodeList = unitCodeList.value;
+  // prescriptionList.value[targetIndex].doseUnitCode =
   //   row.minUnitCode != row.unitCode ? row.minUnitCode : row.unitCode;
-  // prescriptionList.value[rowIndex.value].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
-  prescriptionList.value[rowIndex.value].doseUnitCode = row.doseUnitCode;
-  prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
-  prescriptionList.value[rowIndex.value].unitCode =
+  // prescriptionList.value[targetIndex].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
+  prescriptionList.value[targetIndex].doseUnitCode = row.doseUnitCode;
+  prescriptionList.value[targetIndex].minUnitCode = row.minUnitCode;
+  prescriptionList.value[targetIndex].unitCode =
     row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
-  prescriptionList.value[rowIndex.value].categoryEnum = row.categoryCode;
-  // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
-  prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
+  prescriptionList.value[targetIndex].categoryEnum = row.categoryCode;
+  // prescriptionList.value[targetIndex].doseUnitCode_dictText = row.minUnitCode_dictText;
+  prescriptionList.value[targetIndex].definitionId = JSON.parse(
     JSON.stringify(row)
   ).chargeItemDefinitionId;
 
@@ -1565,14 +1782,14 @@ if (row.categoryCode == '1') {
   if (row.adviceType != 3 && !isConsumables) {
     // 药品类型（西药、中成药）需要检查库存
     if (row.inventoryList && row.inventoryList.length == 0) {
-      expandOrder.value = [];
+      updateExpandOrder([]);
       proxy.$modal.msgWarning('该项目无库存');
       return;
     }
     stockList.value = row.inventoryList.map((item, index) => {
       return { ...item, ...row.priceList[index] };
     });
-    prescriptionList.value[rowIndex.value].stockList = stockList.value;
+    prescriptionList.value[targetIndex].stockList = stockList.value;
     // 获取默认批次号的库存，如果没有让医生重新选
     let stock = stockList.value.filter((item) => {
       return item.lotNumber == row.defaultLotNumber;
@@ -1589,32 +1806,32 @@ if (row.categoryCode == '1') {
         // proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
         // return;
       }
-      prescriptionList.value[rowIndex.value].lotNumber = stock.lotNumber;
-      prescriptionList.value[rowIndex.value].inventoryId = stock.inventoryId;
-      prescriptionList.value[rowIndex.value].locationId = stock.locationId;
-      prescriptionList.value[rowIndex.value].unitPrice = stock.price;
-      prescriptionList.value[rowIndex.value].unitTempPrice = stock.price;
-      prescriptionList.value[rowIndex.value].minUnitPrice = new Decimal(stock.price)
+      prescriptionList.value[targetIndex].lotNumber = stock.lotNumber;
+      prescriptionList.value[targetIndex].inventoryId = stock.inventoryId;
+      prescriptionList.value[targetIndex].locationId = stock.locationId;
+      prescriptionList.value[targetIndex].unitPrice = stock.price;
+      prescriptionList.value[targetIndex].unitTempPrice = stock.price;
+      prescriptionList.value[targetIndex].minUnitPrice = new Decimal(stock.price)
         .div(row.partPercent)
         .toFixed(2);
-      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
+      prescriptionList.value[targetIndex].positionName = stock.locationName;
     }
   } else if (isConsumables) {
     // 耗材类型：设置价格和位置信息
     const price = row.price || row.retailPrice || (row.priceList && row.priceList.length > 0 ? row.priceList[0].price : 0);
-    prescriptionList.value[rowIndex.value].unitPrice = price;
-    prescriptionList.value[rowIndex.value].unitTempPrice = price;
-    prescriptionList.value[rowIndex.value].minUnitPrice = price;
-    prescriptionList.value[rowIndex.value].positionId = row.locationId;
-    prescriptionList.value[rowIndex.value].positionName = row.locationId_dictText || row.positionName || '';
+    prescriptionList.value[targetIndex].unitPrice = price;
+    prescriptionList.value[targetIndex].unitTempPrice = price;
+    prescriptionList.value[targetIndex].minUnitPrice = price;
+    prescriptionList.value[targetIndex].positionId = row.locationId;
+    prescriptionList.value[targetIndex].positionName = row.locationId_dictText || row.positionName || '';
     // 耗材可能没有库存列表，设置为空数组
-    prescriptionList.value[rowIndex.value].stockList = [];
-    prescriptionList.value[rowIndex.value].inventoryList = [];
+    prescriptionList.value[targetIndex].stockList = [];
+    prescriptionList.value[targetIndex].inventoryList = [];
   } else {
     // 诊疗类型：执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
     const defaultOrgId = row.positionId || props.patientInfo.orgId;
-    prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
-    prescriptionList.value[rowIndex.value].unitPrice = row.priceList && row.priceList.length > 0 ? row.priceList[0].price : 0;
+    prescriptionList.value[targetIndex].orgId = defaultOrgId;
+    prescriptionList.value[targetIndex].unitPrice = row.priceList && row.priceList.length > 0 ? row.priceList[0].price : 0;
   }
 
   // 检查是否是皮试药品，如果是则弹出确认提示
@@ -1639,15 +1856,15 @@ if (row.categoryCode == '1') {
     )
       .then(() => {
         // 用户点击"是"，自动勾选皮试字段
-        prescriptionList.value[rowIndex.value].skinTestFlag = 1;
-        prescriptionList.value[rowIndex.value].skinTestFlag_enumText = '是';
+        prescriptionList.value[targetIndex].skinTestFlag = 1;
+        prescriptionList.value[targetIndex].skinTestFlag_enumText = '是';
         // 展开订单并继续后续流程
         expandOrderAndFocus(key, row);
       })
       .catch((action) => {
         // 用户点击"否"或关闭，不勾选皮试字段
-        prescriptionList.value[rowIndex.value].skinTestFlag = 0;
-        prescriptionList.value[rowIndex.value].skinTestFlag_enumText = '否';
+        prescriptionList.value[targetIndex].skinTestFlag = 0;
+        prescriptionList.value[targetIndex].skinTestFlag_enumText = '否';
         // 展开订单并继续后续流程
         expandOrderAndFocus(key, row);
       });
@@ -1655,15 +1872,19 @@ if (row.categoryCode == '1') {
     // 不是皮试药品，直接展开订单
     expandOrderAndFocus(key, row);
   }
+  
+  // 同步数据到对应的处方
+  if (targetPrescriptionId) {
+    allPrescriptionsData.value[targetPrescriptionId] = [...prescriptionList.value];
+  }
 }
 
 /**
  * 展开订单并聚焦输入框
  */
 function expandOrderAndFocus(key, row) {
-  // 确保只有当前行展开，先清空数组再添加当前行的uniqueKey
-  expandOrder.value = [];
-  expandOrder.value.push(key);
+  // 确保只有当前行展开
+  updateExpandOrder([key]);
 
   nextTick(() => {
     // 找到当前行的索引
@@ -1695,7 +1916,12 @@ function getOrgList() {
   });
 }
 
-function handleDelete() {
+function handleDelete(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   let selectRow = groupIndexList.value.map((index) => prescriptionList.value[index]);
   if (selectRow.length == 0) {
     proxy.$modal.msgWarning('请选择要删除的医嘱');
@@ -1718,7 +1944,7 @@ function handleDelete() {
     }
   }
   handleEmrTreatment();
-  expandOrder.value = [];
+  updateExpandOrder([]);
   isAdding.value = false;
   adviceQueryParams.value.adviceType = undefined;
   adviceQueryParams.value.categoryCode = undefined;
@@ -1743,23 +1969,28 @@ function handleDelete() {
 }
 
 // 选择药房/耗材房处理
-function handleNumberClick(item, index) {
-  prescriptionList.value[index].unitPrice = item.price;
-  prescriptionList.value[index].lotNumber = item.lotNumber;
-  prescriptionList.value[index].locationId = item.locationId;
-  prescriptionList.value[index].positionId = item.locationId;
-  prescriptionList.value[index].positionName = item.locationName;
+function handleNumberClick(item, index, row) {
+  row.unitPrice = item.price;
+  row.lotNumber = item.lotNumber;
+  row.locationId = item.locationId;
+  row.positionId = item.locationId;
+  row.positionName = item.locationName;
 }
 
 // 选择执行科室处理
-function handleOrgChange(value, index) {
-  prescriptionList.value[index].positionId = value;
+function handleOrgChange(value, index, row) {
+  row.positionId = value;
 }
 
 /**
  * 签发处方
  */
-function handleSave() {
+function handleSave(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   // 验证费用性质是否已选择
   if (!accountId.value) {
     proxy.$modal.msgWarning('请先选择费用性质');
@@ -1770,10 +2001,10 @@ function handleSave() {
     proxy.$modal.msgWarning('请先保存当前医嘱');
     return;
   }
-  if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
+  if (prescriptionList.value[0]?.isEdit && !prescriptionList.value[0].adviceType) {
     prescriptionList.value.shift();
     isAdding.value = false;
-    expandOrder.value = [];
+    updateExpandOrder([]);
   }
   let saveList = prescriptionList.value.filter((item) => {
     return item.statusEnum == 1;
@@ -1907,18 +2138,56 @@ function stockFormat(partPercent, unit, minUnit, quantity) {
 }
 
 // 单行处方保存
-function handleSaveSign(row, index) {
+function handleSaveSign(row, index, prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  const targetPrescriptionId = prescriptionId || currentPrescriptionId.value;
+  if (targetPrescriptionId && targetPrescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(targetPrescriptionId);
+  }
+  
   // 验证费用性质是否已选择
   if (!accountId.value) {
     proxy.$modal.msgWarning('请先选择费用性质');
     return;
   }
   
-  proxy.$refs['formRef' + index].validate((valid) => {
+  // 重新查找索引，确保使用当前处方列表中的正确索引
+  const actualIndex = prescriptionList.value.findIndex(item => item.uniqueKey === row.uniqueKey);
+  if (actualIndex === -1) {
+    console.error('找不到对应的行数据, uniqueKey:', row.uniqueKey);
+    proxy.$modal.msgError('数据同步失败，请重试');
+    return;
+  }
+  
+  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  let formRef = proxy.$refs[formRefName];
+  
+  console.log('handleSaveSign - 查找表单引用:', formRefName, '是否找到:', !!formRef, '类型:', typeof formRef, 'formRef:', formRef);
+  
+  // 如果 formRef 是数组，取第一个元素
+  if (Array.isArray(formRef)) {
+    formRef = formRef[0];
+    console.log('formRef 是数组，取第一个元素:', formRef);
+  }
+  
+  if (!formRef) {
+    console.error('找不到表单引用:', formRefName);
+    proxy.$modal.msgError('表单验证失败，请重试');
+    return;
+  }
+  
+  // 检查 validate 方法是否存在
+  if (typeof formRef.validate !== 'function') {
+    console.error('表单引用没有 validate 方法:', formRefName, 'formRef keys:', Object.keys(formRef));
+    proxy.$modal.msgError('表单验证方法不可用，请重试');
+    return;
+  }
+  
+  formRef.validate((valid) => {
     if (valid) {
       row.isEdit = false;
       isAdding.value = false;
-      expandOrder.value = [];
+      updateExpandOrder([]);
       row.contentJson = undefined;
       row.patientId = props.patientInfo.patientId;
       row.encounterId = props.patientInfo.encounterId;
@@ -1990,7 +2259,12 @@ function handleSaveSign(row, index) {
   });
 }
 
-function handleSaveBatch() {
+function handleSaveBatch(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   // 验证费用性质是否已选择
   if (!accountId.value) {
     proxy.$modal.msgWarning('请先选择费用性质');
@@ -2004,7 +2278,7 @@ function handleSaveBatch() {
   if (prescriptionList.value[0].isEdit && !prescriptionList.value[0].adviceType) {
     prescriptionList.value.shift();
     isAdding.value = false;
-    expandOrder.value = [];
+    updateExpandOrder([]);
   }
   let saveList = prescriptionList.value
     .filter((item) => {
@@ -2019,6 +2293,7 @@ function handleSaveBatch() {
         ...item,
         adviceType: saveAdviceType,
         isSaved: true, // 保存后设置为待签发状态
+        prescriptionId: prescriptionId || currentPrescriptionId.value, // 添加当前处方ID标识
         contentJson: undefined // 避免循环引用
       };
       
@@ -2029,6 +2304,7 @@ function handleSaveBatch() {
         ...item,
         dbOpType: item.requestId ? '2' : '1',
         isSaved: true,
+        prescriptionId: prescriptionId || currentPrescriptionId.value, // 添加当前处方ID标识
         contentJson: contentJson // 使用新的 contentJson
       };
     });
@@ -2077,41 +2353,41 @@ function setValue(row) {
     ? (typeof row.skinTestFlag === 'number' ? row.skinTestFlag : (row.skinTestFlag ? 1 : 0))
     : 0;
   
-  prescriptionList.value[rowIndex.value] = {
-    ...prescriptionList.value[rowIndex.value],
+  prescriptionList.value[targetIndex] = {
+    ...prescriptionList.value[targetIndex],
     ...JSON.parse(JSON.stringify(row)),
     // 确保adviceType为数字类型，避免类型不匹配导致的显示问题
     adviceType: Number(row.adviceType),
     skinTestFlag: skinTestFlag, // 确保皮试字段是数字类型
     skinTestFlag_enumText: skinTestFlag == 1 ? '是' : '否', // 更新显示文本
   };
-  prescriptionList.value[rowIndex.value].orgId = undefined;
-  prescriptionList.value[rowIndex.value].dose = undefined;
-  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
-  // prescriptionList.value[rowIndex.value].doseUnitCode =
+  prescriptionList.value[targetIndex].orgId = undefined;
+  prescriptionList.value[targetIndex].dose = undefined;
+  prescriptionList.value[targetIndex].unitCodeList = unitCodeList.value;
+  // prescriptionList.value[targetIndex].doseUnitCode =
   //   row.minUnitCode != row.unitCode ? row.minUnitCode : row.unitCode;
-  // prescriptionList.value[rowIndex.value].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
-  prescriptionList.value[rowIndex.value].doseUnitCode = row.doseUnitCode;
-  prescriptionList.value[rowIndex.value].minUnitCode = row.minUnitCode;
-  prescriptionList.value[rowIndex.value].categoryEnum = row.categoryCode;
-  prescriptionList.value[rowIndex.value].unitCode =
+  // prescriptionList.value[targetIndex].minUnitCode = JSON.parse(JSON.stringify(row.doseUnitCode));
+  prescriptionList.value[targetIndex].doseUnitCode = row.doseUnitCode;
+  prescriptionList.value[targetIndex].minUnitCode = row.minUnitCode;
+  prescriptionList.value[targetIndex].categoryEnum = row.categoryCode;
+  prescriptionList.value[targetIndex].unitCode =
     row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode;
-  // prescriptionList.value[rowIndex.value].doseUnitCode_dictText = row.minUnitCode_dictText;
-  prescriptionList.value[rowIndex.value].definitionId = JSON.parse(
+  // prescriptionList.value[targetIndex].doseUnitCode_dictText = row.minUnitCode_dictText;
+  prescriptionList.value[targetIndex].definitionId = JSON.parse(
     JSON.stringify(row)
   ).chargeItemDefinitionId;
 
   // 库存列表 + 价格列表拼成批次号的下拉框
   if (row.adviceType != 3) {
     if (row.inventoryList && row.inventoryList.length == 0) {
-      // expandOrder.value = [];
+      // updateExpandOrder([]);
       proxy.$modal.msgWarning('该项目无库存');
       return;
     }
     stockList.value = row.inventoryList.map((item, index) => {
       return { ...item, ...row.priceList[index] };
     });
-    prescriptionList.value[rowIndex.value].stockList = stockList.value;
+    prescriptionList.value[targetIndex].stockList = stockList.value;
     // 获取默认批次号的库存，如果没有让医生重新选
     let stock = stockList.value.filter((item) => {
       return item.lotNumber == row.defaultLotNumber;
@@ -2127,20 +2403,20 @@ function setValue(row) {
         // proxy.$modal.msgWarning('该项目库存不足，请选择其它库房');
         // return;
       }
-      prescriptionList.value[rowIndex.value].lotNumber = stock.lotNumber;
-      prescriptionList.value[rowIndex.value].inventoryId = stock.inventoryId;
-      prescriptionList.value[rowIndex.value].locationId = stock.locationId;
-      prescriptionList.value[rowIndex.value].unitPrice = stock.price;
-      prescriptionList.value[rowIndex.value].positionName = stock.locationName;
-      prescriptionList.value[rowIndex.value].minUnitPrice = new Decimal(stock.price)
+      prescriptionList.value[targetIndex].lotNumber = stock.lotNumber;
+      prescriptionList.value[targetIndex].inventoryId = stock.inventoryId;
+      prescriptionList.value[targetIndex].locationId = stock.locationId;
+      prescriptionList.value[targetIndex].unitPrice = stock.price;
+      prescriptionList.value[targetIndex].positionName = stock.locationName;
+      prescriptionList.value[targetIndex].minUnitPrice = new Decimal(stock.price)
         .div(row.partPercent)
         .toFixed(2);
     }
   } else {
   // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
   const defaultOrgId = row.positionId || props.patientInfo.orgId;
-  prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
-  prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
+  prescriptionList.value[targetIndex].orgId = defaultOrgId;
+  prescriptionList.value[targetIndex].unitPrice = row.priceList[0].price;
 }
 }
 
@@ -2173,20 +2449,20 @@ function handleSaveGroup(orderGroupList) {
     //   (k) => k.adviceDefinitionId == item.adviceDefinitionId
     // );
 
-    prescriptionList.value[rowIndex.value] = {
-      ...prescriptionList.value[rowIndex.value],
+    prescriptionList.value[targetIndex] = {
+      ...prescriptionList.value[targetIndex],
       // ...orderGroupValue,
       uniqueKey: nextId.value++,
       patientId: props.patientInfo.patientId,
       encounterId: props.patientInfo.encounterId,
       accountId: accountId.value,
       quantity: item.quantity,
-      totalPrice: item.quantity * prescriptionList.value[rowIndex.value].unitPrice,
+      totalPrice: item.quantity * prescriptionList.value[targetIndex].unitPrice,
       unitCode: item.unitCode,
       unitCode_dictText: item.unitCodeName ? item.unitCodeName : '',
       statusEnum: 1,
       isSaved: false, // 组套保存默认为未保存状态
-      dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
+      dbOpType: prescriptionList.value[targetIndex].requestId ? '2' : '1',
       minUnitQuantity:
         unitCodeList.value.find((k) => k.value == item.unitCode).type == 'minUnit'
           ? item.quantity
@@ -2195,8 +2471,8 @@ function handleSaveGroup(orderGroupList) {
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
     };
-    prescriptionList.value[rowIndex.value].contentJson = JSON.stringify(
-      prescriptionList.value[rowIndex.value]
+    prescriptionList.value[targetIndex].contentJson = JSON.stringify(
+      prescriptionList.value[targetIndex]
     );
   });
   console.log(prescriptionList.value);
@@ -2235,8 +2511,34 @@ function handleSaveHistory(value) {
 }
 
 // 处理回车事件
-const handleEnter = (currentProp, row, rowIndex, e) => {
-  proxy.$refs['formRef' + rowIndex].validateField(currentProp, (valid) => {
+const handleEnter = (currentProp, row, rowIndex, prescriptionId) => {
+  // 如果传入了处方ID，先切换到该处方
+  const targetPrescriptionId = prescriptionId || currentPrescriptionId.value;
+  if (targetPrescriptionId && targetPrescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(targetPrescriptionId);
+  }
+  
+  // 重新查找索引，确保使用当前处方列表中的正确索引
+  const actualIndex = prescriptionList.value.findIndex(item => item.uniqueKey === row.uniqueKey);
+  if (actualIndex === -1) {
+    console.error('找不到对应的行数据, uniqueKey:', row.uniqueKey);
+    return;
+  }
+  
+  const formRefName = 'formRef_' + targetPrescriptionId + '_' + actualIndex;
+  let formRef = proxy.$refs[formRefName];
+  
+  // 如果 formRef 是数组，取第一个元素
+  if (Array.isArray(formRef)) {
+    formRef = formRef[0];
+  }
+  
+  if (!formRef || typeof formRef.validateField !== 'function') {
+    console.log('handleEnter - 找不到表单引用或方法:', formRefName, 'formRef:', formRef);
+    return;
+  }
+  
+  formRef.validateField(currentProp, (valid) => {
     if (valid) {
       const index = requiredProps.value.indexOf(currentProp);
       if (index === -1) return;
@@ -2246,10 +2548,10 @@ const handleEnter = (currentProp, row, rowIndex, e) => {
         setTimeout(() => {
           const nextProp = requiredProps.value[nextIndex];
           // 确保只聚焦当前行的输入框
-          inputRefs.value[rowIndex]?.[nextProp]?.focus();
+          inputRefs.value[actualIndex]?.[nextProp]?.focus();
         }, 100);
       } else {
-        handleSaveSign(row, rowIndex);
+        handleSaveSign(row, actualIndex, targetPrescriptionId);
       }
     }
   });
@@ -2263,7 +2565,7 @@ function escKeyListener(e) {
         index = prescriptionList.value.findIndex((item) => item.uniqueKey == expandOrder.value[0]);
       }
       if (index == 0) {
-        expandOrder.value = [];
+        updateExpandOrder([]);
       }
       prescriptionList.value.shift();
       isAdding.value = false;
@@ -2273,7 +2575,12 @@ function escKeyListener(e) {
 }
 
 // 签退
-function handleSingOut() {
+function handleSingOut(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   let requestIdList = prescriptionList.value
     .filter((item) => {
       return item.check && item.statusEnum == 2;
@@ -2299,7 +2606,12 @@ function handleGroupId(paramList) {
 }
 
 // 组合
-function combination() {
+function combination(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   console.log(groupIndexList.value);
 
   if (groupIndexList.value.length <= 1) {
@@ -2368,7 +2680,12 @@ function combination() {
 }
 
 // 拆组
-function split() {
+function split(prescriptionId) {
+  // 如果传入了处方ID，先切换到该处方
+  if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
+    switchToActivePrescription(prescriptionId);
+  }
+  
   if (groupIndexList.value.length < 1) {
     proxy.$modal.msgWarning('至少选择一项');
     return;
@@ -2503,6 +2820,11 @@ function convertValues(row, index) {
       return item.value == row.doseUnitCode;
     })[0];
 
+    if (!code) {
+      console.warn('convertValues: 找不到对应的单位代码');
+      return;
+    }
+
     switch (code.type) {
       case 'dose':
         row.dose = row.doseQuantity * row.unitConversionRatio;
@@ -2525,6 +2847,11 @@ function convertDoseValues(row, index) {
       return item.value == row.doseUnitCode;
     })[0];
 
+    if (!code) {
+      console.warn('convertDoseValues: 找不到对应的单位代码');
+      return;
+    }
+
     switch (code.type) {
       case 'dose':
         row.doseQuantity = row.dose / row.unitConversionRatio;
@@ -2552,8 +2879,8 @@ function calculateTotalAmount(row, index) {
           let quantity;
           if (row.unitCode == row.minUnitCode) {
             quantity = calculateQuantityBySplitType(row.partAttributeEnum, row.doseQuantity, count);
-            prescriptionList.value[index].quantity = quantity;
-            prescriptionList.value[index].totalPrice = (quantity * row.minUnitPrice).toFixed(2);
+            row.quantity = quantity;
+            row.totalPrice = (quantity * row.minUnitPrice).toFixed(2);
           } else {
             quantity = calculateQuantity(
               row.partAttributeEnum,
@@ -2561,8 +2888,8 @@ function calculateTotalAmount(row, index) {
               count,
               row.partPercent
             );
-            prescriptionList.value[index].quantity = quantity;
-            prescriptionList.value[index].totalPrice = (quantity * row.unitPrice).toFixed(2);
+            row.quantity = quantity;
+            row.totalPrice = (quantity * row.unitPrice).toFixed(2);
           }
         }
       } else {
@@ -2585,7 +2912,6 @@ function calculateTotalAmount(row, index) {
       }
     }
   });
-  // proxy.$refs['formRef' + index].validate();
 }
 
 /**
@@ -2739,6 +3065,137 @@ function validateGroups(saveList) {
   }
   return true;
 }
+
+// ==================== 西药处方管理相关方法 ====================
+
+/**
+ * 新增西药处方
+ */
+function handleAddWesternPrescription() {
+  prescriptionCounter.value++;
+  const newPrescriptionId = `prescription_${Date.now()}_${prescriptionCounter.value}`;
+  const newPrescription = {
+    id: newPrescriptionId,
+    name: `西药方${prescriptionCounter.value}`,
+    prescriptionNo: '', // 处方单号码，保存时由后端生成
+    conditionDefinitionId: conditionDefinitionId.value, // 诊断
+    accountId: accountId.value, // 费用性质
+    expandOrder: [], // 展开的行
+  };
+  
+  westernPrescriptions.value.push(newPrescription);
+  allPrescriptionsData.value[newPrescriptionId] = []; // 初始化空数据
+  
+  console.log('新增西药处方:', newPrescription);
+}
+
+/**
+ * 切换到活跃处方（用于操作前的上下文切换）
+ */
+function switchToActivePrescription(prescriptionId) {
+  // 保存当前处方的数据和展开状态
+  if (currentPrescriptionId.value) {
+    allPrescriptionsData.value[currentPrescriptionId.value] = [...prescriptionList.value];
+    const currentPrescription = westernPrescriptions.value.find(p => p.id === currentPrescriptionId.value);
+    if (currentPrescription) {
+      currentPrescription.expandOrder = [...expandOrder.value];
+    }
+  }
+  
+  // 切换到新处方
+  currentPrescriptionId.value = prescriptionId;
+  
+  // 加载新处方的数据
+  if (allPrescriptionsData.value[prescriptionId]) {
+    prescriptionList.value = [...allPrescriptionsData.value[prescriptionId]];
+  } else {
+    prescriptionList.value = [];
+    allPrescriptionsData.value[prescriptionId] = [];
+  }
+  
+  // 恢复该处方的展开状态、诊断和费用性质
+  const prescription = westernPrescriptions.value.find(p => p.id === prescriptionId);
+  if (prescription) {
+    expandOrder.value = prescription.expandOrder || [];
+    conditionDefinitionId.value = prescription.conditionDefinitionId || conditionDefinitionId.value;
+    accountId.value = prescription.accountId || accountId.value;
+  }
+  
+  // 重新计算总金额
+  handleTotalAmount();
+  
+  console.log('切换到处方:', prescriptionId, '数据数量:', prescriptionList.value.length);
+}
+
+/**
+ * 将当前处方数据同步回存储
+ */
+function syncCurrentPrescriptionData() {
+  if (currentPrescriptionId.value) {
+    allPrescriptionsData.value[currentPrescriptionId.value] = [...prescriptionList.value];
+  }
+}
+
+/**
+ * 更新展开行状态（同时更新全局和当前处方的 expandOrder）
+ */
+function updateExpandOrder(keys) {
+  expandOrder.value = Array.isArray(keys) ? keys : [];
+  
+  // 同步到当前处方
+  const currentPrescription = westernPrescriptions.value.find(p => p.id === currentPrescriptionId.value);
+  if (currentPrescription) {
+    currentPrescription.expandOrder = Array.isArray(keys) ? [...keys] : [];
+  }
+}
+
+/**
+ * 关闭处方
+ */
+function handleClosePrescription(prescriptionId) {
+  // 检查该处方是否有数据
+  const prescriptionData = allPrescriptionsData.value[prescriptionId] || [];
+  const hasData = prescriptionData.length > 0;
+  
+  if (hasData) {
+    // 如果有数据，提示用户确认
+    proxy.$modal.confirm('该处方包含数据，确定要关闭吗？').then(() => {
+      doClosePrescription(prescriptionId);
+    }).catch(() => {
+      console.log('取消关闭处方');
+    });
+  } else {
+    // 如果没有数据，直接关闭
+    doClosePrescription(prescriptionId);
+  }
+}
+
+/**
+ * 执行关闭处方操作
+ */
+function doClosePrescription(prescriptionId) {
+  const index = westernPrescriptions.value.findIndex(p => p.id === prescriptionId);
+  if (index === -1) return;
+  
+  // 删除处方
+  westernPrescriptions.value.splice(index, 1);
+  delete allPrescriptionsData.value[prescriptionId];
+  
+  console.log('关闭处方:', prescriptionId);
+}
+
+/**
+ * 获取指定处方的总金额
+ */
+function getPrescriptionTotalAmount(prescriptionId) {
+  const prescriptionData = allPrescriptionsData.value[prescriptionId] || [];
+  const total = prescriptionData.reduce((sum, item) => {
+    return sum + (Number(item.totalPrice) || 0);
+  }, 0);
+  return total.toFixed(2);
+}
+
+
 defineExpose({ getListInfo, getDiagnosisInfo });
 </script>
     
@@ -2790,4 +3247,28 @@ defineExpose({ getListInfo, getDiagnosisInfo });
 .el-table__cell .el-form-item--default {
   margin-bottom: 0px;
 }
+
+/* 优化滚动条样式 */
+.prescription-scroll-container {
+  scrollbar-width: thin;
+  scrollbar-color: #c1c1c1 #f1f1f1;
+}
+
+.prescription-scroll-container::-webkit-scrollbar {
+  width: 8px;
+}
+
+.prescription-scroll-container::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 4px;
+}
+
+.prescription-scroll-container::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 4px;
+}
+
+.prescription-scroll-container::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
+}
 </style>
\ No newline at end of file