diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 6bb062fed..feb953bb3 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-253.33514.17">
+  <component name="dataSourceStorageLocal" created-in="IU-253.29346.138">
     <data-source name="postgresql@192.168.110.252" uuid="6f44e2a0-c865-4e9f-83bf-d35db0680dc5">
       <database-info product="PostgreSQL" version="17.6" jdbc-version="4.2" driver-name="PostgreSQL JDBC Driver" driver-version="42.7.3" dbms="POSTGRES" exact-version="17.6" exact-driver-version="42.7">
         <identifier-quote-string>&quot;</identifier-quote-string>
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
index 8e553904a..c31568565 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/AdviceBaseDto.java
@@ -236,7 +236,7 @@ public class AdviceBaseDto {
     /**
      * 用药说明
      */
-    @Dict(dictCode = "dosage_instruction")
+    @Dict(dictCode = "separate_decocting")
     private String dosageInstruction;
     private String dosageInstruction_dictText;
     /*
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
index b5dcc2e43..a935e1991 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
@@ -233,7 +233,7 @@ public class RequestBaseDto {
     /**
      * 用药说明
      */
-    @Dict(dictCode = "dosage_instruction")
+    @Dict(dictCode = "separate_decocting")
     private String dosageInstruction;
     private String dosageInstruction_dictText;
 
@@ -266,4 +266,22 @@ public class RequestBaseDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
     private Date stopTime;
 
+    /**
+     * 诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionId;
+
+    /**
+     * 诊断定义ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long conditionDefinitionId;
+
+    /**
+     * 就诊诊断ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long encounterDiagnosisId;
+
 }
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
index 1a9677f64..9cea1f143 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -196,6 +196,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
         List<RegAdviceSaveDto> activityList = regAdviceSaveList.stream()
                 .filter(e -> ItemType.ACTIVITY.getValue().equals(e.getAdviceType())
                         || ItemType.SURGERY.getValue().equals(e.getAdviceType())
+                        || ItemType.TEXT.getValue().equals(e.getAdviceType())
                         || (e.getAdviceType() != null && e.getAdviceType() == 26))
                 .collect(Collectors.toList());
         // 耗材 🔧 Bug #147 修复
@@ -687,7 +688,12 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 longServiceRequest.setRateCode(regAdviceSaveDto.getRateCode()); // 用药频次
                 longServiceRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
                 longServiceRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,长期(需要前端传)
-                longServiceRequest.setActivityId(regAdviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
+                // 文字医嘱(type=8)不走定价体系，activityId设置为0L占位
+                if (ItemType.TEXT.getValue().equals(regAdviceSaveDto.getAdviceType())) {
+                    longServiceRequest.setActivityId(0L);
+                } else {
+                    longServiceRequest.setActivityId(regAdviceSaveDto.getAdviceDefinitionId());// 诊疗定义id
+                }
                 longServiceRequest.setPatientId(regAdviceSaveDto.getPatientId()); // 患者
                 longServiceRequest.setRequesterId(regAdviceSaveDto.getPractitionerId()); // 开方医生
                 longServiceRequest.setEncounterId(regAdviceSaveDto.getEncounterId()); // 就诊id
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
index 56a20a217..ab13d3f68 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
@@ -63,6 +63,9 @@
         T1.dosage_instruction AS dosage_instruction,
         T2.part_percent AS part_percent,
         ccd.name AS condition_definition_name,
+        T1.condition_id AS condition_id,
+        cc.definition_id AS condition_definition_id,
+        T1.encounter_diagnosis_id AS encounter_diagnosis_id,
         T4.account_id AS account_id
         FROM med_medication_request AS T1
         LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
diff --git a/healthlink-his-ui/src/views/catalog/medicine/components/medicineDialog.vue b/healthlink-his-ui/src/views/catalog/medicine/components/medicineDialog.vue
index 600c808f8..be153885a 100755
--- a/healthlink-his-ui/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/healthlink-his-ui/src/views/catalog/medicine/components/medicineDialog.vue
@@ -348,7 +348,7 @@
                     filterable
                   >
                     <el-option
-                      v-for="category in dosage_instruction"
+                      v-for="category in separate_decocting"
                       :key="category.value"
                       :label="category.label"
                       :value="category.value"
@@ -971,7 +971,7 @@ const {
   ddd_code,
   dose_from_code,
   rx_flag,
-  dosage_instruction,
+  separate_decocting,
   chrgitm_lv,
 } = proxy.useDict(
   'med_category_code',
@@ -987,7 +987,7 @@ const {
   'ddd_code',
   'dose_from_code',
   'rx_flag',
-  'dosage_instruction',
+  'separate_decocting',
   'chrgitm_lv'
 );
 
diff --git a/healthlink-his-ui/src/views/doctorstation/components/diagnosis/diagnosis.vue b/healthlink-his-ui/src/views/doctorstation/components/diagnosis/diagnosis.vue
index a859c1dbf..a4b33a4f9 100755
--- a/healthlink-his-ui/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -557,9 +557,10 @@ async function getList() {
             return;
           }
           existingTcmGroups.add(item.syndromeGroupNo);
-          console.log('[diagnosis] getList() 添加中医诊断到表格: illness=', item.name, 'symptom=', tcmRes.data.symptom[index]?.name, 'syndromeGroupNo=', item.syndromeGroupNo);
+          const symptom = tcmRes.data?.symptom?.[index];
+          const symptomName = symptom?.name || '';
           form.value.diagnosisList.push({
-            name: item.name + '-' + tcmRes.data.symptom[index].name,
+            name: item.name + (symptomName ? '-' + symptomName : ''),
             diagSrtNo: item.diagSrtNo,
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
@@ -567,10 +568,10 @@ async function getList() {
             typeName: '中医诊断',
             classification: '中医', // 中医诊断默认分类
             onsetDate: item.onsetDate,
-            updateId:item.encounterDiagnosisId+'-'+tcmRes.data.symptom[index].encounterDiagnosisId,
+            updateId: item.encounterDiagnosisId + '-' + (symptom?.encounterDiagnosisId || ''),
             illnessDefinitionId : item.definitionId,
-            symptomDefinitionId : tcmRes.data.symptom[index].definitionId,
-            symptomYbNo: tcmRes.data.symptom[index].ybNo,
+            symptomDefinitionId : symptom?.definitionId || '',
+            symptomYbNo: symptom?.ybNo || '',
           });
         });
       }
diff --git a/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue b/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 7a5324004..c752e90e4 100755
--- a/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div style="width: 100%; display: flex; flex-direction: column;">
     <div style="margin-bottom: 5px">
       <el-button
@@ -69,13 +69,19 @@
         删除
       </el-button>
       <span class="descriptions-item-label"> 诊断： </span>
-      <el-input
-        :model-value="diagnosisName"
-        placeholder=""
+      <el-select
+        v-model="conditionDefinitionId"
+        placeholder="请选择诊断"
         style="width: 180px"
-        readonly
-        disabled
-      />
+        @change="handleDiagnosisChange"
+      >
+        <el-option
+          v-for="item in diagnosisList"
+          :key="item.definitionId"
+          :label="item.name"
+          :value="item.definitionId"
+        />
+      </el-select>
       <span class="descriptions-item-label"> 费用性质： </span>
       <el-select
         v-model="accountId"
@@ -2430,7 +2436,9 @@ function clickRowDb(row, column, event) {
   }
 }
 
-function handleDiagnosisChange(item) {
+function handleDiagnosisChange(val) {
+  const item = diagnosisList.value.find(d => d.definitionId === val);
+  if (!item) return;
   diagnosisName.value = item.name;
   conditionId.value = item.conditionId;
   encounterDiagnosisId.value = item.encounterDiagnosisId;
diff --git a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue
index a381ab6d8..ed4c8c2fa 100755
--- a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue
@@ -93,13 +93,13 @@
             v-model="prescription.conditionDefinitionId"
             placeholder="诊断"
             style="width: 180px"
+            @change="(val) => handleDiagnosisChange(val, pIndex)"
           >
             <el-option
               v-for="item in diagnosisList"
               :key="item.definitionId"
               :label="item.name"
               :value="item.definitionId"
-              @click="handleDiagnosisChange(item, pIndex)"
             />
           </el-select>
           <span class="doctor-station"> 费用性质： </span>
@@ -288,7 +288,7 @@
                           placeholder=" "
                         >
                           <template
-                            v-for="item in dosage_instruction"
+                            v-for="item in separate_decocting"
                             :key="item.value"
                           >
                             <el-option
@@ -514,6 +514,7 @@ import {
   getOrgTree,
   getTcmAdviceList,
   getTcmDiagnosis,
+  getEncounterDiagnosis,
   savePrescription,
   saveTcmAdvice,
   signOutTcmAdvice,
@@ -601,13 +602,13 @@ const inputRefs = ref({});
 const requiredProps = ref([]); // 存储必填项 prop 顺序
 const totalAmount = ref(0);
 const tcmDianosis = ref();
-const { method_code, unit_code, rate_code, distribution_category_code, dosage_instruction, method_of_decocting_medicine } =
+const { method_code, unit_code, rate_code, distribution_category_code, separate_decocting, method_of_decocting_medicine } =
   proxy.useDict(
     'method_code',
     'unit_code',
     'rate_code',
     'distribution_category_code',
-    'dosage_instruction',
+    'separate_decocting',
     'method_of_decocting_medicine'
   );
 
@@ -718,6 +719,18 @@ async function getListInfo(addNewRow) {
         if (firstItem.dosageInstruction !== undefined && firstItem.dosageInstruction !== null) {
           prescription.dosageInstruction = firstItem.dosageInstruction;
         }
+        if (firstItem.conditionDefinitionId !== undefined && firstItem.conditionDefinitionId !== null) {
+          prescription.conditionDefinitionId = firstItem.conditionDefinitionId;
+        }
+        if (firstItem.conditionId !== undefined && firstItem.conditionId !== null) {
+          prescription.conditionId = firstItem.conditionId;
+        }
+        if (firstItem.encounterDiagnosisId !== undefined && firstItem.encounterDiagnosisId !== null) {
+          prescription.encounterDiagnosisId = firstItem.encounterDiagnosisId;
+        }
+        if (firstItem.conditionDefinitionName !== undefined && firstItem.conditionDefinitionName !== null) {
+          prescription.diagnosisName = firstItem.conditionDefinitionName;
+        }
       }
 
       return prescription;
@@ -755,6 +768,7 @@ async function getListInfo(addNewRow) {
 
   tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId);
   accountId.value = props.patientInfo.accountId;
+  getDiagnosisInfo();
 }
 
 function getDiagnosisInfo() {
@@ -766,29 +780,60 @@ function getDiagnosisInfo() {
   }
   
   diagnosisList.value = [];
-  console.log('【中医诊断】调用API,encounterId:', props.patientInfo.encounterId)
-  getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
-    if (res.data.illness.length > 0) {
-      res.data.illness.forEach((item, index) => {
-        diagnosisList.value.push({
-          name: item.name + '-' + res.data.symptom[index].name,
+  console.log('【中医诊断】开始获取就诊诊断, encounterId:', props.patientInfo.encounterId)
+  
+  // 同时获取中医就诊诊断和西医就诊诊断
+  const p1 = getTcmDiagnosis({ encounterId: props.patientInfo.encounterId });
+  const p2 = getEncounterDiagnosis(props.patientInfo.encounterId);
+  
+  Promise.all([p1, p2]).then(([tcmRes, westernRes]) => {
+    const mergedList = [];
+    
+    // 1. 解析中医诊断
+    if (tcmRes && tcmRes.data && tcmRes.data.illness && tcmRes.data.illness.length > 0) {
+      const symptomList = tcmRes.data.symptom || [];
+      tcmRes.data.illness.forEach((item, index) => {
+        const symptomName = symptomList[index]?.name || '';
+        mergedList.push({
+          name: item.name + (symptomName ? '-' + symptomName : '') + ' (中医)',
           definitionId: item.definitionId,
           encounterDiagnosisId: item.encounterDiagnosisId,
           conditionId: item.conditionId,
         });
       });
     }
-    console.log('【中医诊断】获取数据成功,诊断数量:', diagnosisList.value.length)
-    // 默认选择第一个诊断
-    if (diagnosisList.value.length > 0) {
-      const firstDiagnosis = diagnosisList.value[0];
-      tcmPrescriptionList.value.forEach((prescription) => {
-        prescription.diagnosisName = firstDiagnosis.name;
-        prescription.conditionId = firstDiagnosis.conditionId;
-        prescription.encounterDiagnosisId = firstDiagnosis.encounterDiagnosisId;
-        prescription.conditionDefinitionId = firstDiagnosis.definitionId;
+    
+    // 2. 解析西医诊断
+    const westernData = westernRes?.data || westernRes || [];
+    if (Array.isArray(westernData) && westernData.length > 0) {
+      westernData.forEach((item) => {
+        mergedList.push({
+          name: item.name + ' (西医)',
+          definitionId: item.definitionId,
+          encounterDiagnosisId: item.encounterDiagnosisId,
+          conditionId: item.conditionId,
+        });
       });
     }
+    
+    diagnosisList.value = mergedList;
+    console.log('【中医诊断】获取数据成功,总诊断数量:', diagnosisList.value.length)
+    
+    // 默认选择第一个诊断 (仅当没有选择或原本选择的值不在列表中时)
+    if (diagnosisList.value.length > 0) {
+      tcmPrescriptionList.value.forEach((prescription) => {
+        const exists = diagnosisList.value.some(d => d.definitionId === prescription.conditionDefinitionId);
+        if (!exists || !prescription.conditionDefinitionId) {
+          const firstDiagnosis = diagnosisList.value[0];
+          prescription.diagnosisName = firstDiagnosis.name;
+          prescription.conditionId = firstDiagnosis.conditionId;
+          prescription.encounterDiagnosisId = firstDiagnosis.encounterDiagnosisId;
+          prescription.conditionDefinitionId = firstDiagnosis.definitionId;
+        }
+      });
+    }
+  }).catch(err => {
+    console.error('【中医诊断】获取诊断信息失败:', err);
   });
 }
 
@@ -852,7 +897,9 @@ function clickRowDb(row, pIndex) {
   }
 }
 
-function handleDiagnosisChange(item, pIndex) {
+function handleDiagnosisChange(val, pIndex) {
+  const item = diagnosisList.value.find(d => d.definitionId === val);
+  if (!item) return;
   const prescription = tcmPrescriptionList.value[pIndex];
   prescription.diagnosisName = item.name;
   prescription.conditionId = item.conditionId;
diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
index cd8c78174..3b7fef9e7 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -274,11 +274,11 @@
                       filterable
                       clearable
                       style="width: 100%"
-                      @focus="loadSyndromeOptions(scope.row.ybNo)"
+                      @focus="loadSyndromeOptions(scope.row)"
                       @change="(val) => handleSyndromeSelect(val, scope.row)"
                     >
                       <el-option
-                        v-for="item in syndromeOptions"
+                        v-for="item in (scope.row.syndromeOptions || [])"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
@@ -547,6 +547,7 @@ function getList() {
             syndromeGroupNo: '',
             showPopover: false,
             diagnosisTime: formatDisplayDate(item.diagnosisTime),
+            syndromeOptions: []
           };
           if (obj.diagSrtNo == null) {
             obj.diagSrtNo = 1;
@@ -566,6 +567,9 @@ function getList() {
           diagnosisNetDatas.value = res.data.illness;
           const newList = [];
           res.data.illness.forEach((item, index) => {
+            const syndromeCode = res.data.symptom[index]?.ybNo || '';
+            const syndromeName = res.data.symptom[index]?.name || '';
+            const syndromeId = res.data.symptom[index]?.definitionId || '';
             newList.push({
               conditionId: item.conditionId || '',
               encounterDiagnosisId: item.encounterDiagnosisId || '',
@@ -575,9 +579,10 @@ function getList() {
               ybNo: item.ybNo,
               definitionId: item.definitionId || '',
               diagnosisSystem: '中医',
-              tcmSyndromeCode: res.data.symptom[index]?.ybNo || '',
-              tcmSyndromeName: res.data.symptom[index]?.name || '',
-              syndromeDefinitionId: res.data.symptom[index]?.definitionId || '',
+              tcmSyndromeCode: syndromeCode,
+              tcmSyndromeName: syndromeName,
+              syndromeDefinitionId: syndromeId,
+              syndromeOptions: syndromeCode ? [{ value: syndromeCode, label: syndromeName, id: syndromeId }] : [],
               diagSrtNo: item.diagSrtNo,
               medTypeCode: item.medTypeCode,
               maindiseFlag: item.maindiseFlag,
@@ -793,6 +798,7 @@ function addDiagnosisItem() {
     tcmSyndromeName: '',
     syndromeDefinitionId: '',
     syndromeGroupNo: '',
+    syndromeOptions: [],
     verificationStatusEnum: 4,
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
@@ -825,17 +831,18 @@ function handleDiagnosisSystemChange(row) {
 }
 
 // 加载中医证候选项（按诊断名称关联过滤）
-function loadSyndromeOptions(conditionCode) {
+function loadSyndromeOptions(row) {
+  const conditionCode = row.ybNo;
   const params = conditionCode ? { conditionCode } : {};
   getTcmSyndrome(params).then((res) => {
     if (res.data && res.data.records) {
-      syndromeOptions.value = res.data.records.map((item) => ({
+      row.syndromeOptions = res.data.records.map((item) => ({
         value: item.ybNo,
         label: item.name,
         id: item.id,
       }));
     } else {
-      syndromeOptions.value = [];
+      row.syndromeOptions = [];
     }
   });
 }
@@ -843,7 +850,7 @@ function loadSyndromeOptions(conditionCode) {
 // 中医证候选中赋值
 function handleSyndromeSelect(val, row) {
   if (val) {
-    const selected = syndromeOptions.value.find((item) => item.value === val);
+    const selected = (row.syndromeOptions || []).find((item) => item.value === val);
     row.tcmSyndromeName = selected ? selected.label : '';
     row.syndromeDefinitionId = selected ? selected.id : '';
   } else {
@@ -1166,6 +1173,7 @@ function handleNodeClick(data) {
     tcmSyndromeName: '',
     syndromeDefinitionId: '',
     syndromeGroupNo: '',
+    syndromeOptions: [],
     verificationStatusEnum: 4,
     medTypeCode: undefined,
     diagSrtNo: form.value.diagnosisList.length + 1,
diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
index 54c53c609..02e8e484c 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
@@ -811,6 +811,7 @@ const popoverJustClosedByKey = ref(null);
 
 // 医嘱检索下拉浮框对齐：跟踪表格水平滚动偏移与主体区域边界限制
 const tableScrollLeft = ref(0);
+const scrollLeftAtOpen = ref(0);
 const mainBoundary = ref(null);
 const advicePopperWidth = computed(() => {
   // 取主体区域宽度与 900px 中较小值，避免小屏幕溢出；下限 500px
@@ -819,15 +820,17 @@ const advicePopperWidth = computed(() => {
 });
 const advicePopperStyle = computed(() => ({
   padding: '0',
-  marginLeft: `-${tableScrollLeft.value}px`,
+  marginLeft: `-${tableScrollLeft.value - scrollLeftAtOpen.value}px`,
 }));
 const advicePopperOptions = computed(() => ({
   modifiers: [
     {
       name: 'preventOverflow',
-      options: {
-        boundary: mainBoundary.value || 'viewport',
-      },
+      enabled: false,
+    },
+    {
+      name: 'flip',
+      enabled: false,
     },
   ],
 }));
@@ -1066,6 +1069,12 @@ function refresh() {
 }
 // 获取列表信息
 function getListInfo(addNewRow) {
+  if (!localPatient.value || !localPatient.value.encounterId) {
+    loading.value = false;
+    prescriptionList.value = [];
+    isCategoryLoaded.value = false;
+    return;
+  }
   loading.value = true;
   isAdding.value = false;
   collapseAllExpanded();
@@ -1229,6 +1238,10 @@ const filterPrescriptionList = computed(() => {
 });
 
 function getDiagnosisInfo() {
+  if (!localPatient.value || !localPatient.value.encounterId) {
+    diagnosisList.value = [];
+    return;
+  }
   getEncounterDiagnosis(localPatient.value.encounterId).then((res) => {
     diagnosisList.value = res.data;
     let diagnosisInfo = diagnosisList.value.filter((item) => {
@@ -1477,6 +1490,10 @@ function handleFocus(row, index) {
   const scrollWrapper = document.querySelector('.vxe-table--body-wrapper');
   if (scrollWrapper) {
     tableScrollLeft.value = scrollWrapper.scrollLeft || 0;
+    scrollLeftAtOpen.value = scrollWrapper.scrollLeft || 0;
+  } else {
+    tableScrollLeft.value = 0;
+    scrollLeftAtOpen.value = 0;
   }
   // 文字医嘱(type=8)不弹药品搜索框，直接展开填写面板
   const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
@@ -1531,6 +1548,14 @@ function handleChange(value, row, index) {
   adviceQueryParams.value.searchKey = value;
   // popover 被 blur 关闭后，用户继续输入时自行打开
   if (!row.showPopover) {
+    const scrollWrapper = document.querySelector('.vxe-table--body-wrapper');
+    if (scrollWrapper) {
+      tableScrollLeft.value = scrollWrapper.scrollLeft || 0;
+      scrollLeftAtOpen.value = scrollWrapper.scrollLeft || 0;
+    } else {
+      tableScrollLeft.value = 0;
+      scrollLeftAtOpen.value = 0;
+    }
     row.showPopover = true;
   }
   const tableRef = getAdviceTableRef();