diff --git a/openhis-ui-vue3/src/views/doctorstation/index.vue b/openhis-ui-vue3/src/views/doctorstation/index.vue
index 19d5b390..53620319 100644
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -3,43 +3,24 @@
     <div style="width: 15%; height: 100%; border: 1px solid #eee; border-right: 0">
       <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-right: 0">
         <span>现诊患者</span>
-        <el-badge
-          :value="waitCount > 0 ? waitCount : ''"
-          :max="10"
-          style="float: right; color: #409eff; cursor: pointer; margin-right: 10px"
-        >
+        <el-badge :value="waitCount > 0 ? waitCount : ''" :max="10"
+          style="float: right; color: #409eff; cursor: pointer; margin-right: 10px">
           <span @click="openDrawer"> 患者队列 </span>
         </el-badge>
       </div>
       <div style="width: 100%; padding: 10px">
-        <el-input
-          v-model="queryParams.searchKey"
-          placeholder="请输入患者名"
-          clearable
-          style="width: 100%; margin-bottom: 10px"
-          @keyup.enter="getPatientList"
-        >
+        <el-input v-model="queryParams.searchKey" placeholder="请输入患者名" clearable
+          style="width: 100%; margin-bottom: 10px" @keyup.enter="getPatientList">
           <template #append>
             <el-button icon="Search" @click="getPatientList" />
           </template>
         </el-input>
-        <el-date-picker
-          v-model="registerTime"
-          @change="handleTimeChange"
-          type="date"
-          style="width: 100%; margin-bottom: 10px"
-          :clearable="false"
-          placeholder="挂号时间"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-        />
+        <el-date-picker v-model="registerTime" @change="handleTimeChange" type="daterange"
+          style="width: 100%; margin-bottom: 10px" :clearable="false" placeholder="挂号时间" format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD" />
         <el-scrollbar height="700px">
-          <div
-            v-for="(item, index) in patientList"
-            :class="item.active ? 'patient-card actived' : 'patient-card'"
-            :key="item.id"
-            @click="handleCardClick(item, index)"
-          >
+          <div v-for="(item, index) in patientList" :class="item.active ? 'patient-card actived' : 'patient-card'"
+            :key="item.id" @click="handleCardClick(item, index)">
             <div class="main-info-container">
               <!-- <el-avatar
                 :size="30"
@@ -78,29 +59,32 @@
     </div>
     <div class="disabled-wrapper" style="width: 85%; border: 1px solid #eee; position: relative">
       <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-left: 0">
-        <el-descriptions :column="5" class="patient-info-descriptions">
-          <el-descriptions-item label="患者信息:" width="420">
+        <el-descriptions :column="4">
+          <el-descriptions-item label="患者信息:" width="150">
             {{
               Object.keys(patientInfo).length !== 0
                 ? patientInfo.patientName +
-                  ' / ' +
-                  patientInfo.age +
-                  ' / ' +
-                  patientInfo.genderEnum_enumText +
-                  ' / ' +
-                  patientInfo.contractName +
-                  '/' +
-                  patientInfo.phone
+                ' / ' +
+                patientInfo.age +
+                ' / ' +
+                patientInfo.genderEnum_enumText +
+                ' / ' +
+                patientInfo.contractName
                 : '-'
             }}
           </el-descriptions-item>
-          <el-descriptions-item label="挂号时间：" width="300">
+          <el-descriptions-item label="挂号时间：" width="150">
             {{ Object.keys(patientInfo).length !== 0 ? formatDate(patientInfo.registerTime) : '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="医生：" width="250">
-            {{ userStore.nickName }}
-          </el-descriptions-item>
-          <el-descriptions-item label="" width="300">
+          <el-descriptions-item label="医生：" width="150">{{
+            userStore.name
+            }}</el-descriptions-item>
+          <el-descriptions-item label="" width="350">
+            <!-- 初诊 / 复诊 按钮 -->
+            <el-radio v-model="visitType" label="FIRST" :disabled="visitTypeDisabled">初诊</el-radio>
+            <el-radio v-model="visitType" label="FOLLOW_UP" :disabled="visitTypeDisabled">复诊</el-radio>
+
+            <!-- 原有按钮 -->
             <el-button type="primary" plain @click.stop="handleFinish(patientInfo.encounterId)">
               完诊
             </el-button>
@@ -110,121 +94,44 @@
             <el-button type="primary" plain @click.stop="handleRefund(patientInfo.encounterId)">
               退费
             </el-button>
-            <el-button
-              type="primary"
-              plain
-              @click.stop="getEnPrescription(patientInfo.encounterId)"
-            >
+            <el-button type="primary" plain @click.stop="getEnPrescription(patientInfo.encounterId)">
               处方单
             </el-button>
-            <el-button
-              type="primary"
-              plain
-              @click.stop="
-                () => {
-                  openDialog = true;
-                }
-              "
-            >
+            <el-button type="primary" plain @click.stop="openDialog = true">
               办理住院
             </el-button>
+            <el-button type="primary" plain @click.stop="handleCancelEncounter">
+              取消接诊
+            </el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="医生：" width="150">{{
-            userStore.name
-          }}</el-descriptions-item>
-          <el-descriptions-item label="" width="350">
-  <!-- 初诊 / 复诊 按钮 -->
-<el-radio v-model="visitType" label="FIRST" :disabled="visitTypeDisabled">初诊</el-radio>
-  <el-radio v-model="visitType" label="FOLLOW_UP" :disabled="visitTypeDisabled">复诊</el-radio>
-
-  <!-- 原有按钮 -->
-  <el-button type="primary" plain @click.stop="handleFinish(patientInfo.encounterId)">
-    完诊
-  </el-button>
-  <el-button type="primary" plain @click.stop="handleLeave(patientInfo.encounterId)">
-    暂离
-  </el-button>
-  <el-button type="primary" plain @click.stop="handleRefund(patientInfo.encounterId)">
-    退费
-  </el-button>
-  <el-button
-    type="primary"
-    plain
-    @click.stop="getEnPrescription(patientInfo.encounterId)"
-  >
-    处方单
-  </el-button>
-  <el-button
-    type="primary"
-    plain
-    @click.stop="openDialog = true"
-  >
-    办理住院
-  </el-button>
-  <el-button
-    type="primary"
-    plain
-    @click.stop="handleCancelEncounter"
-  >
-    取消接诊
-  </el-button>
-</el-descriptions-item>
         </el-descriptions>
       </div>
       <div style="padding: 10px">
-        <el-tabs
-          type="card"
-          style="width: 100%; height: 100%"
-          v-loading="loading"
-          v-model="activeTab"
-          @tab-change="handleClick(activeTab)"
-        >
-          <el-tab-pane label="门诊病历" name="hospitalizationEmr">
-            <hospitalizationEmr
-              :patientInfo="patientInfo"
-              :activeTab="activeTab"
-              @emrSaved="handleEmrSaved"
-            />
-          </el-tab-pane>
+        <el-tabs type="card" style="width: 100%; height: 100%" v-loading="loading" v-model="activeTab"
+          @tab-change="handleClick(activeTab)">
           <el-tab-pane label="病历" name="emr">
-            <Emr
-              :patientInfo="patientInfo"
-              ref="emrRef"
-              @save="
-                (value) => {
-                  saveStatus = value;
-                }
-              "
-              :visitType="visitType" 
-              :firstVisitDate="firstVisitDate"
-            />
+            <Emr :patientInfo="patientInfo" ref="emrRef" @save="
+              (value) => {
+                saveStatus = value;
+              }
+            " :visitType="visitType" :firstVisitDate="firstVisitDate" />
           </el-tab-pane>
           <el-tab-pane label="诊断" name="diagnosis">
-            <Diagnosis
-              :patientInfo="patientInfo"
-              ref="diagnosisRef"
-              @diagnosisSave="
-                (value) => {
-                  saveStatus = value;
-                }
-              "
-            />
+            <Diagnosis :patientInfo="patientInfo" ref="diagnosisRef" @diagnosisSave="
+              (value) => {
+                saveStatus = value;
+              }
+            " />
           </el-tab-pane>
           <el-tab-pane label="医嘱" name="prescription">
-            <prescriptionlist
-              :patientInfo="patientInfo"
-              ref="prescriptionRef"
-              :activeTab="activeTab"
-              :outpatientEmrSaved="outpatientEmrSaved"
-            />
+            <prescriptionlist :patientInfo="patientInfo" ref="prescriptionRef" :activeTab="activeTab" />
           </el-tab-pane>
           <el-tab-pane label="中医" name="tcm">
             <tcmAdvice :patientInfo="patientInfo" ref="tcmRef" />
           </el-tab-pane>
-          <!-- <el-tab-pane label="电子处方" name="eprescription">
+          <el-tab-pane label="电子处方" name="eprescription">
             <eprescriptionlist :patientInfo="patientInfo" ref="eprescriptionRef" />
           </el-tab-pane>
-          -->
         </el-tabs>
         <div class="overlay" v-if="disabled"></div>
       </div>
@@ -232,27 +139,15 @@
     <el-drawer v-model="drawer" title="患者队列" direction="ltr" @open="handleOpen">
       <PatientList ref="patientDrawerRef" @toCurrent="handleReceive" />
     </el-drawer>
-    <RefundListDialog
-      :open="openRefundListDialog"
-      :encounterId="currentEncounterId"
-      @close="openRefundListDialog = false"
-      @refresh="() => prescriptionRef.getListInfo()"
-    />
-    <HospitalizationDialog
-      :open="openDialog"
-      :patientInfo="patientInfo"
-      :encounterId="currentEncounterId"
-      @close="openDialog = false"
-    />
-    <PrescriptionInfo
-      :open="openPrescriptionDialog"
-      :precriptionInfo="prescriptionInfo"
-      @close="openPrescriptionDialog = false"
-    />
+    <RefundListDialog :open="openRefundListDialog" :encounterId="currentEncounterId"
+      @close="openRefundListDialog = false" />
+    <HospitalizationDialog :open="openDialog" :patientInfo="patientInfo" :encounterId="currentEncounterId"
+      @close="openDialog = false" />
+    <PrescriptionInfo :open="openPrescriptionDialog" :precriptionInfo="prescriptionInfo"
+      @close="openPrescriptionDialog = false" />
   </div>
 </template>
 <script setup>
-import hospitalizationEmr from './components/hospitalizationEmr/index.vue';
 import Emr from './components/emr/emr.vue';
 import {
   getList,
@@ -267,14 +162,13 @@ import RefundListDialog from './components/prescription/refundListDialog.vue';
 import PatientList from './components/patientList.vue';
 import Diagnosis from './components/diagnosis/diagnosis.vue';
 import PrescriptionInfo from './components/prescription/prescriptionInfo.vue';
-// import eprescriptionlist from './components/eprescriptionlist.vue';
+import eprescriptionlist from './components/eprescriptionlist.vue';
 import HospitalizationDialog from './components/hospitalizationDialog.vue';
 import tcmAdvice from './components/tcm/tcmAdvice.vue';
 import { formatDate, formatDateStr } from '@/utils/index';
 import useUserStore from '@/store/modules/user';
 import { nextTick } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
-import { updatePatientInfo } from './components/store/patient.js';
 
 // // 监听路由离开事件
 // onBeforeRouteLeave((to, from, next) => {
@@ -303,18 +197,15 @@ const openRefundListDialog = ref(false);
 const openDialog = ref(false);
 const openPrescriptionDialog = ref(false);
 const saveStatus = ref(false);
-const outpatientEmrSaved = ref(false); // 门诊病历保存状态
 const currentEncounterId = ref('');
 const emits = defineEmits(['click']);
-// const activeTab = ref('emr');
-const activeTab = ref('hospitalizationEmr');
-
+const activeTab = ref('emr');
 const patientList = ref([]);
 const patientInfo = ref({});
 const visitTypeDisabled = ref(false);
 
 const prescriptionInfo = ref([]);
-const registerTime = ref(formatDate(new Date()));
+const registerTime = ref([formatDate(new Date()), formatDate(new Date())]);
 const patientDrawerRef = ref();
 const prescriptionRef = ref();
 const tcmRef = ref();
@@ -328,90 +219,52 @@ const firstVisitDate = ref('');
 const disabled = computed(() => {
   return Object.keys(patientInfo.value).length === 0;
 });
-const shortcuts = [
-  {
-    text: '今天',
-    value: new Date(),
-  },
-  {
-    text: '昨天',
-    value: () => {
-      const date = new Date();
-      date.setDate(date.getDate() - 1);
-      return date;
-    },
-  },
-  {
-    text: '三天内',
-    value: () => {
-      const date = new Date();
-      date.setDate(date.getDate() - 3);
-      return date;
-    },
-  },
-  {
-    text: '一周内',
-    value: () => {
-      const date = new Date();
-      date.setDate(date.getDate() - 7);
-      return date;
-    },
-  },
-];
 
-// const eprescriptionRef = ref();
+const eprescriptionRef = ref();
 onMounted(() => {
   getWaitPatient();
-  getPatientList();
 });
+
+getPatientList();
 // 获取现诊患者列表
 function getPatientList() {
   queryParams.value.statusEnum = 2;
-  console.log('调用getPatientList，参数：', queryParams.value);
   getList(queryParams.value).then((res) => {
-    console.log('getPatientList返回结果：', res);
-    if (res.data && res.data.records) {
-      patientList.value = res.data.records.map((item) => {
-        return {
-          ...item,
-          active: currentEncounterId.value ? item.encounterId == currentEncounterId.value : false,
-        };
-      });
-      console.log('患者列表数据：', patientList.value);
-    } else {
-      console.error('API返回的数据格式不正确：', res);
-    }
-  }).catch(error => {
-    console.error('获取患者列表失败：', error);
+    patientList.value = res.data.records.map((item) => {
+      return {
+        ...item,
+        active: currentEncounterId.value ? item.encounterId == currentEncounterId.value : false,
+      };
+    });
   });
 }
 function setVisitType(type) {
   visitType.value = type;
 }
 function checkPatientHistory(patient) {
-// 重置状态
+  // 重置状态
   visitTypeDisabled.value = false;
   firstVisitDate.value = '';
-  
+
   // 如果患者没有身份证号，无法判断是否为初诊
   if (!patient.idCard) {
     // 默认设置为初诊
     visitType.value = 'FIRST';
     return;
   }
-  
+
   // 查询患者历史就诊记录
   const params = {
     patientId: patient.patientId,
     idCard: patient.idCard
   };
-  
+
   getEmrHistoryList(params).then(res => {
     if (res.code === 200) {
       const records = res.data?.records || [];
       // 过滤掉当前正在进行的就诊记录（排除相同encounterId的记录）
       const historyRecords = records.filter(record => record.encounterId !== patient.encounterId);
-      
+
       // 如果有历史记录（排除当前就诊），则为复诊
       if (historyRecords.length > 0) {
         visitType.value = 'FOLLOW_UP';
@@ -460,9 +313,9 @@ function handleClick(tab) {
     case 'tcm':
       tcmRef.value.getDiagnosisInfo();
       break;
-    // case 'eprescription':
-    //   eprescriptionRef.value.getList();
-    //   break;
+    case 'eprescription':
+      eprescriptionRef.value.getList();
+      break;
   }
   // if (tab != 'emr') {
   //   if (!saveStatus.value) {
@@ -480,17 +333,12 @@ function handleClick(tab) {
 
 // 查看本次就诊处方单（从医嘱Tab页获取已开立的处方单信息）
 function getEnPrescription(encounterId) {
-  getEnPrescriptionInfo({ encounterId: encounterId }).then((res) => {
-    console.log('处方单 res', res);
-    prescriptionInfo.value = res.data.records;
-    openPrescriptionDialog.value = true;
-  });
   // 检查是否有选中的患者
   if (!patientInfo.value || !patientInfo.value.encounterId) {
     proxy.$modal.msgWarning('请先选择患者');
     return;
   }
-  
+
   // 检查是否在医嘱Tab页，如果不在则切换到医嘱Tab页
   if (activeTab.value !== 'prescription') {
     activeTab.value = 'prescription';
@@ -556,16 +404,13 @@ function handleOpen() {
 }
 
 function handleCardClick(item, index) {
- currentEncounterId.value = '';
+  currentEncounterId.value = '';
   loading.value = true;
   patientList.value.forEach((patient) => {
     patient.active = patient.encounterId === item.encounterId;
   });
   patientInfo.value = item;
-  // 将患者信息保存到store中，供hospitalizationEmr组件使用
-  updatePatientInfo(item);
-  activeTab.value = 'hospitalizationEmr';
-  
+
   // 优先使用数据库中保存的初复诊值
   if (item.visitType) {
     visitType.value = item.visitType;
@@ -584,7 +429,7 @@ function handleCardClick(item, index) {
     prescriptionRef.value.getListInfo();
     tcmRef.value.getListInfo();
     diagnosisRef.value.getList();
-    // eprescriptionRef.value.getList();
+    eprescriptionRef.value.getList();
     emrRef.value.getDetail(item.encounterId);
     setTimeout(() => {
       loading.value = false;
@@ -615,8 +460,8 @@ function handleFinish(encounterId) {
 }
 
 function handleTimeChange(value) {
-  queryParams.value.registerTimeSTime = value + ' 00:00:00';
-  queryParams.value.registerTimeETime = value + ' 23:59:59';
+  queryParams.value.registerTimeSTime = value[0] + ' 00:00:00';
+  queryParams.value.registerTimeETime = value[1] + ' 23:59:59';
   getPatientList();
 }
 
@@ -629,17 +474,12 @@ function handleReceive(row) {
   getWaitPatient();
 }
 
-// 处理门诊病历保存成功事件
-function handleEmrSaved(isSaved) {
-  outpatientEmrSaved.value = isSaved;
-}
-
 function openDrawer() {
   drawer.value = true;
 }
 
-function handleCancelEncounter(){
-  proxy.$modal.confirm('您确定要取消病人本次的就诊记录吗？','提示信息',{
+function handleCancelEncounter() {
+  proxy.$modal.confirm('您确定要取消病人本次的就诊记录吗？', '提示信息', {
     confirmButtonText: '是(Y)',
     cancelButtonText: '否(N)',
     type: 'warning'
@@ -652,28 +492,18 @@ function handleCancelEncounter(){
         getPatientList();
       }
     }).catch((error) => {
-      proxy.$modal.confirm('该病人本次就诊已经有业务产生，不能取消接诊!','提示信息',{
+      proxy.$modal.confirm('该病人本次就诊已经有业务产生，不能取消接诊!', '提示信息', {
         confirmButtonText: '是(Y)',
         type: 'warning'
       });
     });
   }).catch(() => {
     // 用户取消操作
-  }); 
+  });
 }
 </script>
 
 <style lang="scss" scoped>
-// 患者信息
-.patient-info-descriptions {
-  :deep(.el-descriptions__label) {
-    font-size: 16px !important;
-  }
-  :deep(.el-descriptions__content) {
-    font-size: 16px !important;
-  }
-}
-
 .patient-card {
   width: 100%;
   overflow: hidden;
@@ -826,6 +656,7 @@ function handleCancelEncounter(){
     }
   }
 }
+
 :deep(.el-tabs__header) {
   padding: 0;
   position: relative;
@@ -835,19 +666,23 @@ function handleCancelEncounter(){
 :deep(.el-drawer__header) {
   margin-bottom: 15px !important;
 }
+
 :deep(.el-drawer__body) {
   padding: 10px !important;
 }
+
 .el-badge {
   --el-badge-padding: 6px;
 }
+
 .disabled-wrapper .overlay {
   position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
-  z-index: 999; /* 确保覆盖在内容上方 */
+  z-index: 999;
+  /* 确保覆盖在内容上方 */
   cursor: not-allowed;
 }
 </style>