diff --git a/src/components/PopoverInput.vue b/src/components/PopoverInput.vue
index 394e708..dd91831 100644
--- a/src/components/PopoverInput.vue
+++ b/src/components/PopoverInput.vue
@@ -1,6 +1,8 @@
 <template>
-  <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus"></el-input>
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" :virtual-ref="inputRef" ref="popoverRef">
+  <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef">
+    <template #reference>
+      <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus" @blur="handlerBlur"></el-input>
+    </template>
     <div class="code-popo" v-if="props.list.length > 0">
       <div class="code-item" v-for="item in props.list">
         <div class="code-item-header" v-if="item.header">
@@ -15,6 +17,8 @@
 </template>
 <script setup lang="ts">
 import {ref, unref} from "vue";
+
+const isVisible = ref(false)
 interface ListItem {
   header?: string;
   value: string[];
@@ -52,8 +56,12 @@ const inputStr = (str: string,item:ListItem) => {
 const inputRef = ref();
 const emit=defineEmits(["focus"])
 const focus = () => {
+  isVisible.value = true
  emit("focus", false)
 }
+const handlerBlur = () => {
+  isVisible.value = false
+}
 </script>
 <style scoped lang="scss">
 .code-popo {
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index ecfcb85..4b3a868 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -1,24 +1,23 @@
 <template>
-  <el-input
-      ref="inputRef"
-      style="width: 100%;height: 100%"
-      v-model="keyword"
-      :prefix-icon="Plus"
-      :placeholder="props.placeholder"
-      :style="{'width': props.width+'px'}"
-      clearable
-      @input="changeInput"
-      class="no-border-input"
-      :disabled="disabled"
-      @focus="focus"
-      @click="changeInput"
-  >
 
-  >
-  </el-input>
-
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" :virtual-ref="inputRef"
+  <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
               :trigger-keys="[]">
+    <template #reference>
+      <el-input
+          ref="inputRef"
+          v-model="keyword"
+          :prefix-icon="Plus"
+          :placeholder="props.placeholder"
+          :style="{ width: props.width + 'px' }"
+          clearable
+          @input="changeInput"
+          class="no-border-input"
+          :disabled="disabled"
+          @focus="focus"
+          @blur="handlerBlur"
+          @click="changeInput"
+      />
+    </template>
     <div class="container">
       <el-table
           :data="searchList" style="width: 100%"
@@ -35,16 +34,18 @@
       </el-table>
     </div>
   </el-popover>
+
 </template>
 
-<script setup lang="ts">import {ref, unref} from "vue";
+<script setup lang="ts">
+import {ref, unref} from "vue";
 import {post} from "@/utils/request.ts";
 import {Plus} from "@element-plus/icons-vue";
 
 const keyword = ref("");
 const popoverRef = ref();
 const inputRef = ref();
-
+const isVisible = ref(false);
 interface showConfig {
   prop: string;
   label: string;
@@ -101,8 +102,13 @@ const beforeShow = () => {
 };
 
 const focus=()=>{
+  isVisible.value=true
+  console.log( "focus输入框")
   emit('focus',true)
 }
+const handlerBlur = () => {
+  isVisible.value = false
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/charge/GoodsDetail.vue b/src/components/charge/GoodsDetail.vue
index bf43f1a..38aff84 100644
--- a/src/components/charge/GoodsDetail.vue
+++ b/src/components/charge/GoodsDetail.vue
@@ -1,22 +1,24 @@
 <template>
   <el-table :data="data.goodsDetail" max-height="150" style="width: 100%">
-    <el-table-column prop="name" label="名称" show-overflow-tooltip ></el-table-column>
-    <el-table-column prop="selectedPrice" label="单价" >
+    <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
+    <el-table-column prop="selectedPrice" label="单价">
       <template #default="scope">
-        ￥{{scope.row.selectedPrice}}
+        ￥{{ scope.row.selectedPrice }}
       </template>
     </el-table-column>
-    <el-table-column prop="number" label="数量" >
+    <el-table-column prop="number" label="数量">
       <template #default="scope">
         <div v-if="data.status == 0">
-          <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange" size="small"></el-input-number>
+          <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange"
+                           size="small"></el-input-number>
           <el-dropdown>
             <span style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
             <template #dropdown>
               <el-dropdown-menu v-if="scope.row.trdnFlag == 1">
-                <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{  scope.row.packagingUnit }}
+                <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{ scope.row.packagingUnit }}
                 </el-dropdown-item>
-                <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">{{  scope.row.minPackagingUnit }}
+                <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">
+                  {{ scope.row.minPackagingUnit }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -28,19 +30,22 @@
 
       </template>
     </el-table-column>
-    <el-table-column label="小计" >
+    <el-table-column label="小计">
       <template #default="scope">
-        ￥{{ scope.row.selectedNum*scope.row.selectedPrice }}
+        ￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
       </template>
     </el-table-column>
-    <el-table-column label="操作" v-if="data.status == 0" >
+    <el-table-column label="操作" v-if="data.status == 0">
       <template #default="scope">
         <el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
       </template>
     </el-table-column>
   </el-table>
-  <SearchInput v-if="data.status == 0" :request-api="goodsSearchApi" :show-config="goodsShowConfig" @selectedCallBack="goodsSelect"></SearchInput>
-  <span>合计：￥{{getTotalPrice()}}</span>
+  <div class="bottom">
+    <SearchInput v-if="data.status == 0" :request-api="goodsSearchApi" :show-config="goodsShowConfig"
+                 @selectedCallBack="goodsSelect"></SearchInput>
+    <span>合计：￥{{ getTotalPrice() }}</span>
+  </div>
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
@@ -82,26 +87,30 @@ const selectUnit = (item: any, unit: any) => {
   item.selectedUnit = unit;
   if (unit == item.packagingUnit) {
     item.selectedPrice = item.unitPrice
-  }else if (unit == item.minPackagingUnit) {
+  } else if (unit == item.minPackagingUnit) {
     item.selectedPrice = item.disassemblyPrice
   }
   emit('totalPriceChange')
 
 }
 const emit = defineEmits(["totalPriceChange"])
-const handleNumChange = ()=>{
- emit('totalPriceChange')
+const handleNumChange = () => {
+  emit('totalPriceChange')
 }
-const getTotalPrice =()=>{
+const getTotalPrice = () => {
   let totalPrice = 0;
-  data.value.goodsDetail?.forEach((item:any)=>{
-    totalPrice += item.selectedNum*item.selectedPrice
+  data.value.goodsDetail?.forEach((item: any) => {
+    totalPrice += item.selectedNum * item.selectedPrice
   })
   return totalPrice;
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table__cell){
+:deep(.el-table__cell) {
   padding: 0 4px;
 }
+
+.bottom {
+  text-align: right;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/charge/PatientCard.vue b/src/components/charge/PatientCard.vue
index dd9d277..f0d6095 100644
--- a/src/components/charge/PatientCard.vue
+++ b/src/components/charge/PatientCard.vue
@@ -136,11 +136,9 @@ import {onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 const seeDockerInfo = ref<any>();
 const getSeeDockerInfo  = (newValue:any) => {
-  debugger
   if (!newValue)return;
   post('medical/record/getSeeDockerInfo', {regisId: newValue}).then((res: any) => {
     seeDockerInfo.value = res
-    debugger
   })
 }
 const init =(regisId:any)=>{
diff --git a/src/components/charge/PersonalPayment.vue b/src/components/charge/PersonalPayment.vue
index a38e661..eebdd64 100644
--- a/src/components/charge/PersonalPayment.vue
+++ b/src/components/charge/PersonalPayment.vue
@@ -75,7 +75,6 @@ const completeSettlement = ()=>{
     insutype: orderInfo.value.insutype,
     changeOrderCode:orderInfo.value.changeOrderCode,
   }
-  debugger
 
   post("charge/socialRealPay",{...params}).then((res:any)=>{
     show.value = false;
diff --git a/src/components/charge/ServiceDetail.vue b/src/components/charge/ServiceDetail.vue
index 06fc7b1..c7643bb 100644
--- a/src/components/charge/ServiceDetail.vue
+++ b/src/components/charge/ServiceDetail.vue
@@ -25,9 +25,12 @@
       </template>
     </el-table-column>
   </el-table>
-  <SearchInput v-if="data.status == 0" :request-api="serviceSearchApi" :show-config="serviceShowConfig"
-               @selectedCallBack="serviceSelect"></SearchInput>
-  <span>合计：￥{{getTotalPrice()}}</span>
+  <div class="bottom">
+    <SearchInput v-if="data.status == 0" :request-api="serviceSearchApi" :show-config="serviceShowConfig"
+                 @selectedCallBack="serviceSelect"></SearchInput>
+    <span>合计：￥{{getTotalPrice()}}</span>
+  </div>
+
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
@@ -75,4 +78,7 @@ const getTotalPrice =()=>{
 :deep(.el-table__cell){
   padding: 0 4px;
 }
+.bottom{
+  text-align: right;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue
index af2c4a7..f6123c0 100644
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@@ -26,8 +26,7 @@
               @selectedCallBack="diagnosisSelect"
               :show-header="false"
               @focus="focus"
-          >
-          </DiagnosisSearchInput>
+          />
         </el-form-item>
         <el-form-item label="现病史" v-if="!props.isShowFrom">
           <PopoverInput :disabled="disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue
index c9c97fd..6785ead 100644
--- a/src/components/outpatient/DiagnosisSearchInput.vue
+++ b/src/components/outpatient/DiagnosisSearchInput.vue
@@ -1,9 +1,11 @@
 <template>
-  <el-input v-model="keyword" style="width:100%;height: 100%" @input="changeInput" :disabled="disabled" @click="changeInput"
-            placeholder="诊断选择" ref="inputRef" @focus="focus"></el-input>
 
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow" :virtual-ref="inputRef" @hide ="afterShow">
 
+  <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef" @before-enter="beforeShow" @hide ="afterShow">
+    <template #reference>
+      <el-input v-model="keyword" :style="{width:props.width+'px',height: 100+'%'}" @input="changeInput" :disabled="disabled" @click="changeInput"
+                placeholder="诊断选择" ref="inputRef" @focus="focus" @blur="handleBlur"></el-input>
+    </template>
     <div class="container">
       <el-table :data="searchList" style="width: 100%"  @row-click="clickRow" :show-header="props.showHeader" size="small"
                 max-height="250px">
@@ -112,10 +114,14 @@ const init = (list: any, nList: any) => {
   nameList.value = nList;
   keyword.value = nameList.value.join(",") + ","
 }
-
+const isVisible = ref(false);
 const focus = ()=>{
+  isVisible.value=true
  emit("focus",false)
 }
+const handleBlur =()=> {
+  isVisible.value=false
+}
 defineExpose({init})
 </script>
 <style scoped lang="scss">
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 12d177c..7170038 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -18,9 +18,9 @@
                        alt="头像"/>
                   <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
                        alt="头像"/>
+                   {{ item.name }}
                 </span>
-            <span class="item_name">{{ item.name }}</span>
-            <span>{{ item.gender }}</span>
+
             <span class="item_time">
                 {{ formatListTime(item.createDatetime) || '-' }}
             </span>
@@ -31,7 +31,7 @@
   </Panel>
 </template>
 <script setup lang="ts">
-import {onMounted, ref, watch} from "vue";
+import {nextTick, onMounted, ref, watch} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
 import {formatListTime} from "@/utils/dateUtils.ts";
@@ -48,13 +48,15 @@ const search = ref('')
 const curItem = ref<any>('')
 const emit = defineEmits(['getId', 'changeDetail', 'getStatus'])
 const tab = (item: any) => {
-  emit('getStatus', item.value)
-  init()
-  if (item.value == 3) {
-    emit('changeDetail', true)
-  } else {
-    emit('changeDetail', false)
-  }
+  nextTick(()=>{
+    emit('getStatus', item.value)
+    init()
+    if (item.value == 3) {
+      emit('changeDetail', true)
+    } else {
+      emit('changeDetail', false)
+    }
+  })
 
 }
 const list = ref<any>([])
diff --git a/src/components/outpatient/PharmaceuticalConsumables.vue b/src/components/outpatient/PharmaceuticalConsumables.vue
index 5c19cc4..14319c1 100644
--- a/src/components/outpatient/PharmaceuticalConsumables.vue
+++ b/src/components/outpatient/PharmaceuticalConsumables.vue
@@ -1,72 +1,72 @@
 <template>
   <Panel :title="'药品耗材'">
     <div class="content">
-      <div class="list">
-        <ul>
-          <li class="item" v-for="(item, index) in list" :key="index">
-            <div class="index">{{ index + 1 }}</div>
-            <div class="name">
-              <el-popover
-                  placement="top-start"
-                  trigger="hover"
-                  width="500"
-                  @show="getHilistInfo(item)"
-                  @hide="colosInfo"
+<!--      <div class="list">-->
+<!--        <ul>-->
+<!--          <li class="item" v-for="(item, index) in list" :key="index">-->
+<!--            <div class="index">{{ index + 1 }}</div>-->
+<!--            <div class="name">-->
+<!--              <el-popover-->
+<!--                  placement="top-start"-->
+<!--                  trigger="hover"-->
+<!--                  width="500"-->
+<!--                  @show="getHilistInfo(item)"-->
+<!--                  @hide="colosInfo"-->
 
-              >
-                <template #reference>
-                  {{ item.name }}
-                </template>
+<!--              >-->
+<!--                <template #reference>-->
+<!--                  {{ item.name }}-->
+<!--                </template>-->
 
-                <div class="detail">
-                  <div style="display: flex;justify-content: space-between">
-                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ hilistInfo.name }}[{{ hilistInfo.json?.category||'-' }}]</div>
-                    <div>￥{{ item.selectedPrice }}/{{ item.selectedUnit }}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>规格:{{hilistInfo.json?.dosage_specifications||'-'}}</div>
-                    <div>生产厂商:{{hilistInfo.json?.producer||'-'}}</div>
-                    <div>限价:{{hilistInfo.json?.stock||'0'}}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>批准文号:{{hilistInfo.json?.approval_number||'-'}}</div>
-                    <div>本位码:{{hilistInfo.json?.standard_code ||'-'}}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>
-                    <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>
-                  </div>
-                </div>
-              </el-popover>
-            </div>
-            <div class="price">￥{{ item.selectedPrice || '0' }}</div>
-            <div class="unit">
-              <div class="unit-content">
-                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>
-                <el-dropdown>
-                  <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>
-                  <template #dropdown>
-                    <el-dropdown-menu v-if="item.trdnFlag == 1">
-                      <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}
-                      </el-dropdown-item>
-                      <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </div>
-            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>
-            <div class="delete">
-              <div @click="deleteItem(item.id)" class="delete-btn">
-                <el-icon>
-                  <Close/>
-                </el-icon>
-              </div>
-            </div>
-          </li>
-        </ul>
-      </div>
+<!--                <div class="detail">-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ hilistInfo.name }}[{{ hilistInfo.json?.category||'-' }}]</div>-->
+<!--                    <div>￥{{ item.selectedPrice }}/{{ item.selectedUnit }}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>规格:{{hilistInfo.json?.dosage_specifications||'-'}}</div>-->
+<!--                    <div>生产厂商:{{hilistInfo.json?.producer||'-'}}</div>-->
+<!--                    <div>限价:{{hilistInfo.json?.stock||'0'}}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>批准文号:{{hilistInfo.json?.approval_number||'-'}}</div>-->
+<!--                    <div>本位码:{{hilistInfo.json?.standard_code ||'-'}}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>-->
+<!--                    <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </el-popover>-->
+<!--            </div>-->
+<!--            <div class="price">￥{{ item.selectedPrice || '0' }}</div>-->
+<!--            <div class="unit">-->
+<!--              <div class="unit-content">-->
+<!--                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>-->
+<!--                <el-dropdown>-->
+<!--                  <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>-->
+<!--                  <template #dropdown>-->
+<!--                    <el-dropdown-menu v-if="item.trdnFlag == 1">-->
+<!--                      <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}-->
+<!--                      </el-dropdown-item>-->
+<!--                      <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}-->
+<!--                      </el-dropdown-item>-->
+<!--                    </el-dropdown-menu>-->
+<!--                  </template>-->
+<!--                </el-dropdown>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>-->
+<!--            <div class="delete">-->
+<!--              <div @click="deleteItem(item.id)" class="delete-btn">-->
+<!--                <el-icon>-->
+<!--                  <Close/>-->
+<!--                </el-icon>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </li>-->
+<!--        </ul>-->
+<!--      </div>-->
       <div class="search">
         <div class="search-input">
           <SearchInput
diff --git a/src/components/outpatient/ServiceItems.vue b/src/components/outpatient/ServiceItems.vue
index 4bdc503..e02c406 100644
--- a/src/components/outpatient/ServiceItems.vue
+++ b/src/components/outpatient/ServiceItems.vue
@@ -51,7 +51,6 @@
               @selectedCallBack="serviceSelect"
               :placeholder="'请输入项目名称'"
               :disabled="disabled"
-              style="height: 100%"
               @focus="focus"
           >
           </SearchInput>
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 952f5ac..ea65c50 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -7,28 +7,36 @@
       <el-scrollbar>
         <div>
           <Panel title="医疗诊断">
-            <template #tools>
-              <el-cascader
-                  v-model="formData.doctorId"
-                  :options="sectionDoctorOption"
-                  :props="props"
-                  @change="handleChange"
-                  clearable
-              />
-            </template>
             <template #default>
-              <div style="height:64px;padding:0 24px 24px">
-                <DiagnosisSearchInput
-                    v-model="diagnosisKeyword"
-                    :request-api="diagnosisSearchApi"
-                    :show-config="diagnosisShowConfig"
-                    @selectedCallBack="diagnosisSelect"
-                    ref="diagnosisSearchRef"
-                    :show-header="false"
-                    :disabled="statusDisabled==1"
+              <div class="diagnosis-content">
+                <div class="diagnosis">
+                  诊断：
+                  <DiagnosisSearchInput
+                      v-model="diagnosisKeyword"
+                      :request-api="diagnosisSearchApi"
+                      :show-config="diagnosisShowConfig"
+                      :width="600"
+                      @selectedCallBack="diagnosisSelect"
+                      ref="diagnosisSearchRef"
+                      :show-header="false"
+                      :disabled="statusDisabled==1"
+
+                  >
+                  </DiagnosisSearchInput>
+                </div>
+                <div class="doctor">
+                  医生：
+                  <el-cascader
+                      v-model="formData.doctorId"
+                      :options="sectionDoctorOption"
+                      :props="props"
+                      @change="handleChange"
+                      clearable
+                      size="large"
+                  />
+                </div>
+
 
-                >
-                </DiagnosisSearchInput>
               </div>
             </template>
           </Panel>
@@ -235,6 +243,12 @@ const generateOptions = () => {
     display: flex;
     flex-direction: column;
     overflow: hidden;
+    .diagnosis-content{
+      height:64px;
+      padding:0 24px 24px;
+      display: flex;
+      justify-content: left;
+    }
 
     .case {
       background: #FFFFFF;