diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
index 70df43ac..134967e5 100644
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -503,26 +503,22 @@
             </el-table-column>
             <el-table-column label="操作" align="center" key="registerTime" prop="registerTime">
               <template #default="scope">
-                <!-- <el-tooltip
-                  :content="
-                    scope.row.statusEnum == 6
-                      ? '已退号'
-                      : scope.row.statusEnum == 2
-                      ? '已接诊，不允许退号'
-                      : ''
-                  "
+                <el-tooltip
+                  :content="getReturnTooltip(scope.row)"
                   placement="top"
-                  :disabled="scope.row.statusEnum != 6"
-                > -->
-                <el-button
-                  link
-                  type="primary"
-                  @click="handleReturn(scope.row)"
-                  :disabled="scope.row.statusEnum == 6"
+                  :disabled="!getReturnTooltip(scope.row)"
                 >
-                  退号
-                </el-button>
-                <!-- </el-tooltip> -->
+                  <span>
+                    <el-button
+                      link
+                      type="primary"
+                      @click="handleReturn(scope.row)"
+                      :disabled="scope.row.statusEnum != 1"
+                    >
+                      退号
+                    </el-button>
+                  </span>
+                </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
@@ -1202,7 +1198,24 @@ function handleSearchPatient(value) {
   patientSearchKey.value = value;
 }
 
+function getReturnTooltip(row) {
+  if (!row) {
+    return '';
+  }
+  if (row.statusEnum == 6) {
+    return '已退号';
+  }
+  if (row.statusEnum != 1) {
+    return '该患者医生已接诊，不能退号！';
+  }
+  return '';
+}
+
 function handleReturn(row) {
+  if (row.statusEnum != 1) {
+    proxy.$modal.msgError('该患者医生已接诊，不能退号！');
+    return;
+  }
   openRefundDialog.value = true;
   patientInfo.value.patientId = row.patientId;
   patientInfo.value.encounterId = row.encounterId;