Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

# Conflicts: # src/components/charge/TotalPrice.vue # src/views/charge/index.vue
2025-05-12 13:33:39 +08:00 · 2025-05-12 13:33:39 +08:00 · 9f5f4d6d25
parent 51c11beda3 6f8e68fa7a
commit 9f5f4d6d25
15 changed files with 264 additions and 178 deletions
--- a/src/assets/scss/base.scss
+++ b/src/assets/scss/base.scss
@ -18,7 +18,7 @@ $border-color-extra-light: #F2F6FC;

 // 背景颜色
 $background-color-base: #eee;
-$background-color-main: #5078c8;
+$background-color-main: #4D6DE4;

 // 边框圆角
 $border-radius-base: 4px;
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@ -70,7 +70,7 @@ import {CaretBottom} from "@element-plus/icons-vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";

 const curItem = ref<any>({});
-const emit = defineEmits(['clickItem'])
+const emit = defineEmits(['clickItem','getStatus'])
 const clickItem = (item: any) => {
  curItem.value = item
  emit('clickItem', item, query.value.status);
@ -141,6 +141,8 @@ const statusList = ref([
 ])
 const tab = (item: any) => {
  query.value.status = item.value
+  curItem.value={}
+  emit('getStatus', item.value)
  init()
 }
 const getTipCount = () => {
--- a/src/components/charge/PatientCard.vue
+++ b/src/components/charge/PatientCard.vue
@ -11,7 +11,7 @@
        <div class="avatar-info-wrapper">
          <div class="avatar-info">
            <span class="avatar-info-name">{{ seeDockerInfo?.patientInfo?.name  }}</span>
-            <span class="avatar-info-age">{{ seeDockerInfo?.patientInfo?.age}}</span>
+            <span class="avatar-info-age">{{ seeDockerInfo?.patientInfo?.age||0}}岁</span>
          </div>
          <div class="avatar-info-phone-num">
            <span class="avatar-info-phone">{{ seeDockerInfo?.patientInfo?.phone }}</span>
@ -26,11 +26,11 @@
            class="detail-doctor">{{ seeDockerInfo?.dockerName }}-{{ seeDockerInfo?.sectionName }}</span>
        </div>
        <div class="detail-middle">
-          <div>费用类别:&nbsp;<span class="detail-doctor">医保</span></div>
+          <div>费用类别:&nbsp;<span class="detail-doctor">{{seeDockerInfo?.feeTypeName||'-'}}</span></div>
          <div>医保卡剩余金额:&nbsp;<span class="detail-balance">{{ seeDockerInfo?.socialBalance }}元</span></div>
        </div>
        <div>上次就诊时间:&nbsp;<span class="detail-doctor">{{
-            formatDate(seeDockerInfo?.lastSeeDoctorTime)
+            formatDate(seeDockerInfo?.lastSeeDoctorTime)||'-'
          }}</span></div>
      </div>
    </div>
--- a/src/components/charge/RecordsLog.vue
+++ b/src/components/charge/RecordsLog.vue
@ -6,16 +6,9 @@
          <el-collapse-item :name="index" v-for="(item, index) in list" :key="index">
            <template #title>
              <div class="list-item-content">
-                <el-tooltip
-                    class="box-item"
-                    effect="dark"
-                    :content="item.diagnosisMedicalRecord?.diagnosisSummary"
-                    placement="bottom-start"
-                >
                  <span class="disease-name">{{ item.diagnosisMedicalRecord?.diagnosisSummary }}</span>
-                </el-tooltip>
-                <!--                <span class="doctor">{{ item.patientId }}</span>-->
-                <!--                <span class="time">{{ item.createDatetime }}</span>-->
+                <span class="doctor">{{ item.doctorName }}</span>
+                <span class="time">{{ formatListTime(item.createTime) }}</span>
              </div>
            </template>
            <div>
@ -32,9 +25,9 @@ import Panel from '@/components/common/Panel.vue';
 import Detail from './RecordsLog/Detail.vue';
 import {post} from "@/utils/request.ts";
 import {ref} from "vue";
+import {formatListTime} from "@/utils/dateUtils.ts";
+
 const list = ref<any>([])
-
-
 const init = (patientId: any) => {
  const query = {
    patientId: patientId,
@ -42,6 +35,7 @@ const init = (patientId: any) => {
  }
  post('charge/listDetail', {query}).then((res: any) => {
    list.value = res.list
+    console.log(list,'list')
  })
 }
 const clearList = () => {
@ -61,14 +55,19 @@ defineExpose({init,clearList})
    justify-content: space-between;

    .disease-name {
-      width: 135px;
+      width: 90px;
      overflow: hidden; /* 隐藏溢出的内容 */
      white-space: nowrap; /* 防止文本换行 */
      text-overflow: ellipsis; /* 显示省略号 */
+      text-align: left;
    }

    .doctor {
-      width: 85px;
+      width: 80px;
+    }
+    .time{
+      display: inline-block;
+      overflow: hidden;
    }
  }
 }
--- a/src/components/charge/RecordsLog/Detail.vue
+++ b/src/components/charge/RecordsLog/Detail.vue
@ -44,10 +44,10 @@
    </div>
    <div class="content">
      <div class="content-middle">
-        <div class="item">
+        <div class="item" style="margin-top: 8px">
          <div class="name">合计</div>
          <div class="price">
-            <div class="price-right">￥{{ sumPrice }}</div>
+            <div class="price-right sumPrice">￥{{ sumPrice }}</div>
          </div>
        </div>
      </div>
@ -143,6 +143,12 @@ onMounted(() => {
          .price-left {
            margin-right: 38px;
          }
+          .sumPrice{
+            font-weight: bold;
+            font-size: 16px;
+            color: #FF0000;
+            font-style: normal;
+          }
        }
      }
    }
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@ -1,38 +1,37 @@
 <template>
-  <Mask :width="800" :height="438" :is-show="show">
-<!--  <el-card>-->
-<!--      <template #header>-->
-        <div class="header">
-          <span>收费</span>
-          <CloseBtn @click="show = false" style="margin-top: 12px"></CloseBtn>
-        </div>
-<!--      </template>-->
-      <div class="panel">
-        <div class="price">￥{{ retailOrder.totalPrice }}</div>
-        <div class="social" >
-          <CardPay v-model="socialCard"/>
-        </div>
-        <div class="price-type">
-          <div
-              class="price-type-item"
-              :class="['btn',payType==item.type?'active':'']"
-              v-for="(item,index) in priceBtnList"
-              @click="changePriceType(item.type)"
-          >
-           <div class="image" :style="{'background-color':item.color}">
-             <img style="width: 16px;height: 16px;" :src="item.img" alt=""/>
-           </div>
-            <span>{{item.name}}</span>
+  <Mask :width="800" :height="438" :is-show="show" @close="show = false" :show-footer="true">
+    <!--  <el-card>-->
+    <template #header>
+      <div class="header">
+        <span>收费</span>
+        <CloseBtn @click="show = false" style="margin-top: 12px"></CloseBtn>
+      </div>
+    </template>
+    <div class="panel">
+      <div class="price">￥{{ retailOrder.totalPrice }}</div>
+      <div class="social">
+        <CardPay v-model="socialCard"/>
+      </div>
+      <div class="price-type">
+        <div
+            class="price-type-item"
+            :class="['btn',payType==item.type?'active':'']"
+            v-for="(item,index) in priceBtnList"
+            @click="changePriceType(item.type)"
+        >
+          <div class="image" :style="{'background-color':item.color}">
+            <img style="width: 16px;height: 16px;" :src="item.img" alt=""/>
          </div>
+          <span>{{ item.name }}</span>
        </div>
      </div>
-<!--      <template #footer>-->
-        <div class="footer">
-          <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
-          <el-button @click="completeSettlement()" type="primary">完成收费</el-button>
-        </div>
-<!--        </template>-->
-<!--    </el-card>-->
+    </div>
+    <template #footer>
+      <div class="footer">
+        <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
+        <el-button @click="completeSettlement()" type="primary">完成收费</el-button>
+      </div>
+    </template>
  </Mask>
  <PersonalPayment ref="psnPaymentRef" @orderCompleted="orderCompleted" @orderCancel="orderCanceled"></PersonalPayment>
 </template>
@ -48,15 +47,16 @@ import {medTypeJson, priceBtnList} from "@/assets/config/constants.ts"
 import {useWsStore} from "@/stores/wsStore.ts";
 import PersonalPayment from "@/components/charge/PersonalPayment.vue";
 import {ElMessage} from "element-plus";
+
 const wsStore = useWsStore();
-const socialCard =defineModel<any>();
+const socialCard = defineModel<any>();

 const show = ref(false)
 const printReceipt = ref(false);
 const payType = ref(null);
 const retailOrder = ref<any>(null);
 const init = (code: any) => {
-  post ('charge/getByCode',{code:code}).then((res:any)=>{
+  post('charge/getByCode', {code: code}).then((res: any) => {
    retailOrder.value = res;
    show.value = true;
  })
@ -66,21 +66,21 @@ defineExpose({init})
 const changePriceType = (type: any) => {
  payType.value = type;
 }
-const emit = defineEmits(['orderComplete','orderCanceled'])
-const completeSettlement = ()=>{
-  if (!retailOrder.value){
-  return;
+const emit = defineEmits(['orderComplete', 'orderCanceled'])
+const completeSettlement = () => {
+  if (!retailOrder.value) {
+    return;
  }
-  if (payType.value == null){
+  if (payType.value == null) {
    return
  }
-  if(payType.value == 1){
+  if (payType.value == 1) {
    //医保结算
-    console.log('医保结算',socialCard.value)
+    console.log('医保结算', socialCard.value)
    socialSettlement();
-  }else {
+  } else {
    //其他结算
-    post('charge/completeOrder',{id:retailOrder.value.id,payType:payType.value}).then((res:any)=>{
+    post('charge/completeOrder', {id: retailOrder.value.id, payType: payType.value}).then((res: any) => {
      orderCompleted()
    })
  }
@ -88,18 +88,18 @@ const completeSettlement = ()=>{
 }


-const orderCompleted = ()=>{
+const orderCompleted = () => {
  show.value = false;
  ElMessage.success("保存成功")
-  emit('orderComplete',printReceipt.value)
+  emit('orderComplete', printReceipt.value)
 }
-const orderCanceled = ()=>{
+const orderCanceled = () => {
  show.value = false;
  emit('orderCanceled')
 }

-const getBalcByInsutype = (type:any) =>{
-  let balc =0;
+const getBalcByInsutype = (type: any) => {
+  let balc = 0;
  for (const item of socialCard.value.data.insuinfo) {
    if (item.insutype == type) {
      balc = item.balc;
@ -109,27 +109,26 @@ const getBalcByInsutype = (type:any) =>{
  return balc
 }

-const socialSettlement = ()=>{
+const socialSettlement = () => {
  const params = {
    mdtrtCertType: socialCard.value.mdtrtCertType,
    mdtrtCertNo: socialCard.value.mdtrtCertNo,
    insutype: socialCard.value.payInfo.selfpay_prop_type,
-    changeOrderCode:retailOrder.value.code,
+    changeOrderCode: retailOrder.value.code,
  }
-  post("charge/uploadCostDetails",{changeOrderCode:retailOrder.value.code}).then((res:any)=>{
+  post("charge/uploadCostDetails", {changeOrderCode: retailOrder.value.code}).then((res: any) => {
    //预结算
-    post("charge/socialPrePay",{...params}).then((res:any)=>{
-      openPsnPayment(res,params)
+    post("charge/socialPrePay", {...params}).then((res: any) => {
+      openPsnPayment(res, params)
    })
  })


-
 }
 const psnPaymentRef = ref();
-const openPsnPayment = (payInfo:any,orderInfo:any)=>{
-  nextTick(()=>{
-    psnPaymentRef.value?.open(payInfo,orderInfo);
+const openPsnPayment = (payInfo: any, orderInfo: any) => {
+  nextTick(() => {
+    psnPaymentRef.value?.open(payInfo, orderInfo);
  })

 }
@ -137,22 +136,23 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
 </script>


-
 <style scoped lang="scss">
 .panel {
-  .price{
+  .price {
    height: 50px;
    text-align: center;
    font-size: 25px;
    font-weight: 600;
    color: rgba(237, 120, 23, 0.8);
  }
+
  .price-type {
    display: flex;
    margin-top: 20px;
    justify-content: space-between;
    flex-wrap: wrap;
    align-items: center;
+
    .btn {
      height: 45px;
      width: 95px;
@ -165,7 +165,8 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
      align-items: center;
      padding: 10px;
      cursor: pointer;
-      .image{
+
+      .image {
        width: 16px;
        height: 16px;
        margin-right: 3px;
@ -190,7 +191,8 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{

  }
 }
-.footer{
+
+.footer {
  display: flex;
  justify-content: space-between;
 }
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@ -13,6 +13,7 @@ const deleteItem = () => {
  emit('deleteItem');
 };
 const totalAmount = defineModel<any>()
+
 </script>

 <template>
--- a/src/components/common/Calendar.vue
+++ b/src/components/common/Calendar.vue
@ -75,6 +75,7 @@ console.log(calendarData);

 <template>
  <div class="calendar-wrapper">
+    <span class="current">{{ currentYear }}年{{ currentMonth + 1 }}月</span>
    <div class="row">
      <div class="item">
        <span class="tip">日</span>
@ -97,15 +98,13 @@ console.log(calendarData);
      <div class="item">
        <span class="tip">六</span>
      </div>
-
    </div>
    <div v-for="item in calendarData" class="row">
      <div class="item" v-for="subItem in item">
          <span :class="subItem.isCurrentDay ? 'currentDay' : subItem.isCurrentMonth ? '' : 'otherMonth'">
-        {{ subItem.day }}
+        {{ subItem.isCurrentDay ? "今" : subItem.day }}
      </span>
      </div>
-
    </div>
  </div>

@ -114,31 +113,51 @@ console.log(calendarData);
 <style scoped lang="scss">
 .calendar-wrapper {
  width: 100%;
-  height: 320px;
+  height: 100%;
  box-sizing: border-box;
-  padding: 20px;
+  padding:0 20px 20px;
  background-color: #FFF;
-
+  border-radius: 0 0 8px 8px;
+  display: flex;
+  flex-direction: column;
+  .current{
+    font-weight: 500;
+    font-size: 18px;
+    color: #333333;
+    font-style: normal;
+    margin-bottom: 8px;
+  }
  .row {
+    flex: 1;
    width: 100%;
-    height: 45px;
-
+    background: #F9FAFC ;
+    padding: 0 20px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-weight: 500;
+    font-size: 14px;
+    color: #999999;
+    font-style: normal;
    .item {
-
-      float: left;
-      width: 14.2%;
-      height: 45px;
-
+      width: 100%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
      span {
-        display: block;
        margin: auto;
-        width: 30px;
-        height: 30px;
-        text-align: center;
-        line-height: 30px;
-        border-radius: 15px;
+        height: 34px;
+        width: 34px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        font-weight: bold;
+        font-size: 16px;
+        color: #666666;
+        font-style: normal;
+        border-radius:17px;
      }
-
      .currentDay {
        background: #1677FE;
        color: #fff;
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@ -1,6 +1,10 @@
 <template>
  <header>
    <div class="center-wrapper">
+      <div class="logo">
+        <img style="width: 62px;height: 46px;" src="/favicon.ico" alt=""/>
+        <span>药慧精灵</span>
+      </div>
      <div class="menu">
        <router-link to="/home" class="menu-item" active-class="active active1">首页</router-link>
        <router-link to="/registration" class="menu-item" active-class="active active2">挂号</router-link>
@ -11,25 +15,28 @@
        <router-link to="/social" class="menu-item" active-class="active active7">医保</router-link>
        <router-link to="/statistics" class="menu-item" active-class="active active8">统计</router-link>
        <router-link to="/settings" class="menu-item" active-class="active active9">设置</router-link>
-        <div class="info">
-          <span class="username">{{username}}</span>
-          <el-button class="hover" :icon="Right" style="color: #fff" @click="logout" text>退出登录</el-button>
-        </div>
      </div>
-
+      <div class="info">
+        <span class="username">{{ username }}</span>
+        <el-button class="hover" :icon="Right" style="color: #fff" @click="logout" text>退出登录</el-button>
+      </div>
    </div>
-
  </header>
 </template>

 <style scoped lang="scss">
@use "@/assets/scss/base";
+.center-wrapper{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}

 .menu {
  position: relative;
+  display: flex;
+  align-items: center;
  text-align: center;
-  line-height: 50px;
-
  .menu-item {
    display: inline-block;
    color: #FFF;
@ -142,7 +149,6 @@ header {
  position: relative;
  width: 100%;
  height: 80px;
-
  background-color: base.$background-color-main;
  padding: 15px 0;
 }
@ -153,19 +159,30 @@ header {
  float: right;
  display: flex;
  align-items: center; // 垂直居中
-  .username{
+  .username {
    display: inline-block;
    height: 50px;
    line-height: 50px;
  }
-  .hover{
+
+  .hover {
    margin-left: 10px;
    cursor: pointer;
-    &:hover{
+
+    &:hover {
      color: #4d6de4 !important;
    }
  }
 }
+.logo{
+  margin-left: 30px;
+  display: flex;
+  align-items: center;
+  font-weight: 400;
+  font-size: 28px;
+  color: #FFFFFF;
+  font-style: normal;
+}
 </style>
 <script setup lang="ts">
 import {useRouter} from 'vue-router'
@ -173,7 +190,7 @@ import {type Action, ElMessage, ElMessageBox} from 'element-plus'
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {post} from "@/utils/request";
 import {Right} from "@element-plus/icons-vue";
-import {onMounted,ref} from "vue";
+import {onMounted, ref} from "vue";


 let logout = function () {
@ -200,13 +217,13 @@ let logout = function () {
        useRouter().push("/")
      })
 }
-onMounted(()=>{
+onMounted(() => {
  getInfo()
 })
-const username=ref<any>('')
-const getInfo=()=>{
+const username = ref<any>('')
+const getInfo = () => {
  post(apiConfig.managerUserVerify).then((res: any) => {
-    username.value=res.username
+    username.value = res.username
  })
 }
 </script>
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@ -32,7 +32,8 @@
          <PopoverInput :disabled="props.disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
        </el-form-item>
        <el-form-item label="既往史:" v-if="!props.isShowFrom">
-          <PopoverInput :disabled="props.disabled" v-model="formDate.beforeMedicalHistory" :list="beforeMedicalHistoryList"/>
+          <PopoverInput :disabled="props.disabled" v-model="formDate.beforeMedicalHistory"
+                        :list="beforeMedicalHistoryList"/>
        </el-form-item>
        <el-form-item label="过敏史:" v-if="!props.isShowFrom">
          <PopoverInput :disabled="props.disabled" v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
@ -50,7 +51,8 @@
          <el-input :disabled="props.disabled" v-model="formDate.mouthCheck"></el-input>
        </el-form-item>
        <el-form-item label="辅助检查:" v-if="(modelType==2 || modelType ==0)&&!props.isShowFrom">
-          <el-input style="height: 100%;width: 100%" :disabled="props.disabled" v-model="formDate.adjunctCheck"></el-input>
+          <el-input style="height: 100%;width: 100%" :disabled="props.disabled"
+                    v-model="formDate.adjunctCheck"></el-input>
        </el-form-item>
        <el-form-item label="处置:" v-if="(modelType==0 || modelType ==2)&&!props.isShowFrom">
          <el-input style="height: 100%;width: 100%" :disabled="props.disabled" v-model="formDate.deal"></el-input>
@ -61,7 +63,7 @@
  </Panel>
 </template>
 <script setup lang="ts">
-import {computed, nextTick, ref,defineEmits} from "vue";
+import {computed, nextTick, ref, defineEmits} from "vue";
 import {
  mainAppealList,
  nowMedicalHistoryList,
@ -79,7 +81,7 @@ const props = defineProps({
    type: Boolean,
    default: 0
  },
-  isShowFrom:{
+  isShowFrom: {
    type: Boolean,
    default: false
  }
@ -108,49 +110,53 @@ const diagnosisSelect = (list: any) => {
  formDate.value.diagnosisDetail = JSON.stringify(list)
  formDate.value.diagnosisSummary = diagnosisNames
 }
-const diagnosisSearchRef= ref()
-const initDiagnosisSearch = (list:any,nList:any)=>{
-  nextTick(()=>{
-    diagnosisSearchRef.value?.init(list,nList);
+const diagnosisSearchRef = ref()
+const initDiagnosisSearch = (list: any, nList: any) => {
+  nextTick(() => {
+    diagnosisSearchRef.value?.init(list, nList);
  })
 }
 const emit = defineEmits(['focus'])
-const focus = (e:any)=>{
-  emit('focus',e)
+const focus = (e: any) => {
+  emit('focus', e)
 }
-const clearDiagnosis = ()=>{
+const clearDiagnosis = () => {
  diagnosisSearchRef.value?.clear()
 }

-defineExpose({initDiagnosisSearch,clearDiagnosis})
+defineExpose({initDiagnosisSearch, clearDiagnosis})
 </script>
 <style scoped lang="scss">
 .content {
  display: flex;
+
  .model-selector {
    width: 100px;
  }
 }

 .container {
-  margin:0 24px;
+  margin: 0 24px;
 }
-:deep(.el-form-item){
+
+:deep(.el-form-item) {
  margin-bottom: 0;

 }
-:deep(.el-form-item__label){
-    height: 42px;
-    line-height: 42px;
+
+:deep(.el-form-item__label) {
+  height: 42px;
+  line-height: 42px;
 }
-:deep(.el-input__wrapper){
+
+:deep(.el-input__wrapper) {
  border-radius: 0;
  height: 42px;
  background: #FFFFFF;
-  &:nth-child(2n){
-    border-top: none;
-    border-bottom: none;
-  }
+  border: 1px solid #EAEAEC;
+  box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
+}
+:deep(.is-disabled .el-input__wrapper){
+  box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
 }
-
 </style>
--- a/src/components/outpatient/MedicalHistory.vue
+++ b/src/components/outpatient/MedicalHistory.vue
@ -25,7 +25,7 @@ import Panel from '@/components/common/Panel.vue';
 import DiseaseDetails from './DiseaseDetails.vue';
 import {post} from "@/utils/request.ts";
 import {ref} from "vue";
-import {formatListTime} from "../../utils/dateUtils.ts";
+import {formatListTime} from "@/utils/dateUtils.ts";
 const list = ref<any>([])
 const init = (patientId: any) => {
  post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => {
--- a/src/utils/dateUtils.ts
+++ b/src/utils/dateUtils.ts
@ -30,11 +30,9 @@ export const formatListTime = (date: any) => {
    } else if (typeof date === 'string') {
        dateDetail = new Date(date);
        if (isNaN(dateDetail.getTime())) {
-            console.error(`Invalid date string: ${date}`);
            return '-';
        }
    } else {
-        console.error(`Invalid date type: ${typeof date}`);
        return '-';
    }
    const year = dateDetail.getFullYear();
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@ -1,7 +1,7 @@
 <template xmlns="http://www.w3.org/1999/html">
  <div class="container">
    <div class="left">
-      <chargeQueue @clickItem="clickItem" ref="chargeQueueRef"></ChargeQueue>
+      <chargeQueue @clickItem="clickItem" @getStatus="getStatus" ref="chargeQueueRef"></ChargeQueue>
    </div>
    <div class="middle">
      <el-scrollbar>
@ -30,6 +30,7 @@
                      @change="handleChange"
                      clearable
                      style="width: 100%"
+                      :disabled="formData.status == 1"
                  >
                    <el-option
                        v-for="item in doctorList"
@ -66,7 +67,6 @@
      </div>
    </div>
  </div>
-  <CheckoutDetail ref="checkoutDetailRef"></CheckoutDetail>
  <Settlement
      ref="settlementRef"
      v-model="socialCard"
@ -99,6 +99,7 @@ const formData = ref<any>({
  diagnosisMedicalRecord: {},
  goodsDetail: [],
  itemDetail: [],
+  patientRegistration: {}
 })
 const statusDisabled = ref(0)
 const diagnosisKeyword = ref("")
@ -254,6 +255,17 @@ const checkTraceCode = (goodsList: any[]) => {
      doctorList.value = res
    })
  }
+
+const getStatus=(status:any)=>{
+  console.log(111)
+  formData.value = {
+    patientInfo: {},
+    diagnosisMedicalRecord: {},
+    goodsDetail: [],
+    itemDetail: [],
+    patientRegistration: {}
+  }
+}
 </script>

 <style scoped lang="scss">
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@ -6,8 +6,8 @@
    <div class="middle">
      <el-scrollbar>
        <div class="case">
-          <CaseDetail v-if="patientRegistration.status==3" v-model="formData"></CaseDetail>
-          <Case ref="caseRef" v-else v-model="formData" :disabled="curRegister?.status !=2" :isShowFrom="isShowFrom"
+<!--          <CaseDetail v-if="patientRegistration.status==3" v-model="formData"></CaseDetail>-->
+          <Case ref="caseRef" v-model="formData" :disabled="curRegister?.status !=2" :isShowFrom="isShowFrom"
                @focus="focus"></Case>
        </div>
        <div class="service-items">
@ -133,6 +133,7 @@ const clickItem = (item: any) => {
      formData.value = res.diagnosisMedicalRecord
      formData.value.goodsDetail = res.goodsDetail
      formData.value.itemDetail = res.itemDetail
+      formData.value.diagType = Number(formData.value.diagType)
      patientRegistration.value = res.patientRegistration
    })

--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@ -9,18 +9,24 @@
        </div>
        <div class="left-bottom">
          <Panel title="医生列表">
-            <div class="search" style="padding: 0 24px">
-              <el-input v-model="keyword" placeholder="搜索医生"
-                        @keydown.enter="initDoctor"></el-input>
+            <div class="search" style="padding: 0 24px ;height: 42px">
+              <el-input style="height: 100%" v-model="keyword" placeholder="搜索医生姓名"
+                        @keydown.enter="initDoctor" :prefix-icon="Search"></el-input>
            </div>
            <div class="content_list" style="padding: 0 24px">
              <div class="role_list">
                <ul>
                  <li v-for="(item, index) in roleList" :key="index"
-                      @click="openDialog(item,index)" :class="{active:isShowNum==index}" >
+                      :class="{active:isShowNum==index}">
                    <span class="name">{{ item.name }}</span>
                    <span class="section_name">{{ item.sectionNames }}</span>
-                    <span class="btn">挂号</span>
+                    <span class="btn" @click="openDialog(item,index)"
+                          @mouseover="isShowNum = index"
+                          @mouseleave="isShowNum = -1">
+                      <img v-if="isShowNum==index" src="/static/images/registration/3-active.png" style="width: 15px;height: 14px;margin-right: 8px" alt="">
+                      <img v-else src="/static/images/registration/3.png" alt="" style="width: 15px;height: 14px;margin-right: 8px">
+                      挂号
+                    </span>
                  </li>
                </ul>
              </div>
@ -43,6 +49,10 @@
                    end-placeholder="结束时间"
                />
              </div>
+              <div class="btn">
+                <el-button @click="reset">重置</el-button>
+                <el-button type="primary" @click="getPatientList">搜索</el-button>
+              </div>
            </div>
            <div class="middle">
              <List :patientList="patientList" @rowClick="rowClick"></List>
@ -63,7 +73,7 @@
        </Panel>
      </div>
    </div>
-    <Edit ref="editRef"  @close="getPatientList"></Edit>
+    <Edit ref="editRef" @close="getPatientList"></Edit>
  </div>
 </template>
 <script setup lang="ts">
@ -77,6 +87,7 @@ import {getEndOfDay, getToday, formatDateArray} from "@/utils/dateUtils.ts";
 import Calendar from "@/components/common/Calendar.vue";
 import Panel from "@/components/common/Panel.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
+import {Search} from "@element-plus/icons-vue";

 const isShowNum = ref(-1)
 const roleList = ref<any>([])
@ -100,12 +111,13 @@ const patientList = ref<any>([])
 const selectedDate = ref<any>([getToday().start, getToday().end])
 const handleDateChange = (date: any[]) => {
  selectedDate.value = formatDateArray(date)
-  if(selectedDate.value[0]==selectedDate.value[1]){
-    selectedDate.value[1] =getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
+  if (selectedDate.value[0] == selectedDate.value[1]) {
+    selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
  }
  getPatientList()
 }
 const getPatientList = () => {
+  isShowNum.value = -1
  id.value = null
  post('registration/list', {
    page: page.value,
@ -128,20 +140,24 @@ const id = ref<any>('')
 const rowClick = (row: any) => {
  id.value = row.id
  nextTick(() => {
-    editRef.value?.init(row.organizationDoctorId,row.id)
+    editRef.value?.init(row.organizationDoctorId, row.id)
  })
 }
 const editRef = ref<any>('')
-const openDialog = (item: any,index: any) => {
-  isShowNum.value=index
+const openDialog = (item: any, index: any) => {
+  isShowNum.value = index
  nextTick(() => {
-    editRef.value?.init(item.id,null)
+    editRef.value?.init(item.id, null)
  })
 }
 const close = () => {
  id.value = null
  getPatientList()
 }
+const reset=() =>{
+  keyword.value=''
+  getPatientList()
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {
@ -156,12 +172,14 @@ const close = () => {

  .left {
    height: 100%;
-    width: 319px;
+    width: 382px;
    display: flex;
    flex-direction: column;

    .left-top {
-      height: 380px;
+      height: 399px;
+      background: #FFFFFF;
+      border-radius: 8px;
    }

    .left-bottom {
@ -177,22 +195,9 @@ const close = () => {
      padding: 0 10px;
      border-radius: 5px;
      align-items: center;
-      cursor: pointer;

      &:hover {
-        background: #4D6DE4;
-
-        .name {
-          color: #fff;
-        }
-
-        .section_name {
-          color: #fff;
-        }
-
-        .btn {
-          color: #fff;
-        }
+        background: rgba(#4D6DE4, 0.3);
      }

      .name {
@ -206,10 +211,24 @@ const close = () => {
      }

      .btn {
-        width: 50px;
-        color: #b9b9ba;
+        cursor: pointer;
        padding: 5px;
-        border-radius: 3px;
+        width: 78px;
+        height: 32px;
+        border-radius: 6px;
+        background: #FFFFFF;
+        border: 1px solid #4D6DE4;
+        font-weight: bold;
+        font-size: 14px;
+        color: #4D6DE4;
+        font-style: normal;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &:hover {
+          background: #4D6DE4;
+          color: #FFF;
+        }
      }


@ -245,6 +264,7 @@ const close = () => {
    flex: 1;
    height: 100%;
    min-width: 0;
+
    .right-content {
      padding-left: 20px;
      display: flex;
@ -252,7 +272,10 @@ const close = () => {
      height: 100%;

      .top {
+        padding-right: 24px;
        height: 40px;
+        display: flex;
+        justify-content: space-between;
      }

      .middle {