diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue
index 30785ce8d..e357cf3e5 100755
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -443,7 +443,7 @@ import { nextTick } from 'vue';
 import { updatePatientInfo } from './components/store/patient.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
 
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 // // 监听路由离开事件
 // onBeforeRouteLeave((to, from, next) => {
@@ -460,6 +460,7 @@ defineOptions({
 });
 
 const route = useRoute();
+const router = useRouter();
 
 // 监听路由参数变化
 watch(
@@ -621,6 +622,21 @@ function getPatientList() {
         active: currentEncounterId.value ? item.encounterId == currentEncounterId.value : false,
       };
     });
+
+    // Bug #626: 从待写病历页面跳转过来时，自动选中对应患者
+    const targetEncounterId = route.query.encounterId;
+    if (targetEncounterId && patientList.value.length > 0) {
+      const targetIndex = patientList.value.findIndex(
+        (item) => String(item.encounterId) === String(targetEncounterId)
+      );
+      if (targetIndex !== -1) {
+        handleCardClick(patientList.value[targetIndex], targetIndex);
+      }
+      // 清除URL参数，避免刷新时重复选中
+      if (route.query.encounterId) {
+        router.replace({ query: {} });
+      }
+    }
   });
 }
 function setVisitType(type) {
diff --git a/openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue b/openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue
index 1ebe07e7d..b10a48e2b 100755
--- a/openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue
@@ -129,23 +129,79 @@
       :total="total"
       @pagination="getList"
     />
+
+    <!-- 患者详情弹窗 -->
+    <el-dialog
+      v-model="patientDetailVisible"
+      title="患者详情"
+      width="700px"
+      destroy-on-close
+    >
+      <el-descriptions
+        v-if="patientDetailData"
+        :column="2"
+        border
+      >
+        <el-descriptions-item label="患者姓名">
+          {{ patientDetailData.patientName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="性别">
+          {{ getGenderText(patientDetailData.gender) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="年龄">
+          {{ patientDetailData.age || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="病历号">
+          {{ patientDetailData.busNo || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="身份证号">
+          {{ patientDetailData.idCard || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="联系电话">
+          {{ patientDetailData.phone || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item
+          label="地址"
+          :span="2"
+        >
+          {{ patientDetailData.address || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="挂号时间">
+          {{ parseTime(patientDetailData.registerTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+        </el-descriptions-item>
+        <el-descriptions-item label="就诊科室">
+          {{ patientDetailData.organizationName || '-' }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <template #footer>
+        <el-button @click="patientDetailVisible = false">
+          关闭
+        </el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { listPendingEmr, getPendingEmrCount } from '@/views/doctorstation/components/api.js'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { listPendingEmr, getPatientDetails } from '@/views/doctorstation/components/api.js'
 import { parseTime } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
 import { Document, Refresh, Search, Delete } from '@element-plus/icons-vue'
-import { ElDivider } from 'element-plus'
+
+const router = useRouter()
 
 // 响应式数据
 const loading = ref(true)
 const total = ref(0)
 const emrList = ref([])
 
+// 患者详情弹窗
+const patientDetailVisible = ref(false)
+const patientDetailData = ref(null)
+
 // 查询参数
 const queryParams = reactive({
   pageNum: 1,
@@ -208,40 +264,40 @@ const handleRowClick = (row) => {
   console.log('点击行:', row)
 }
 
-// 写病历
+// 写病历 - 跳转到医生工作站并自动选中该患者
 const handleWriteEmr = (row) => {
-  console.log('写病历:', row)
-  // 弹出写病历弹窗
-  ElMessageBox.confirm('确定要为患者 ' + row.patientName + ' 写病历吗？', '确认', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'info'
-  }).then(() => {
-    // 这里可以跳转到病历编辑页面或弹出病历编辑弹窗
-    ElMessage.success('正在打开病历编辑页面...')
-    // TODO: 实现写病历的具体逻辑
-    // 例如：router.push({ path: '/doctorstation/emr', query: { encounterId: row.encounterId } })
-  }).catch(() => {
-    // 取消操作
+  if (!row.encounterId) {
+    ElMessage.error('患者就诊信息不完整，无法写病历')
+    return
+  }
+  router.push({
+    path: '/doctorstation/index',
+    query: { encounterId: row.encounterId }
   })
 }
 
-// 查看患者
-const handleViewPatient = (row) => {
-  console.log('查看患者:', row)
-  // 弹出查看患者弹窗
-  ElMessageBox.confirm('确定要查看患者 ' + row.patientName + ' 的详细信息吗？', '确认', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'info'
-  }).then(() => {
-    // 这里可以跳转到患者详情页面或弹出患者详情弹窗
-    ElMessage.success('正在打开患者详情页面...')
-    // TODO: 实现查看患者的具体逻辑
-    // 例如：router.push({ path: '/doctorstation/patient-details', query: { encounterId: row.encounterId } })
-  }).catch(() => {
-    // 取消操作
-  })
+// 查看患者 - 弹窗显示患者详情
+const handleViewPatient = async (row) => {
+  if (!row.encounterId) {
+    ElMessage.error('患者就诊信息不完整')
+    return
+  }
+  try {
+    const response = await getPatientDetails(row.encounterId)
+    if (response.code === 200) {
+      patientDetailData.value = response.data || row
+      patientDetailVisible.value = true
+    } else {
+      // 接口失败时使用列表行数据展示
+      patientDetailData.value = row
+      patientDetailVisible.value = true
+    }
+  } catch (error) {
+    console.error('获取患者详情失败:', error)
+    // 接口异常时使用列表行数据展示
+    patientDetailData.value = row
+    patientDetailVisible.value = true
+  }
 }
 
 // 获取性别文本