Fix bug, 当天多个预约 打印小票检查项目不对

eight

2024-11-25 549e0a0cda7fdaafc3d2e456b61187b7eed2c131

Fix bug, 当天多个预约 打印小票检查项目不对

 src/api/ecg/appointment/index.ts

@@ -40,8 +40,8 @@
  },

  //
  getCurAppointmentByPatId: async (patId: string) => {
    return await request.get({ url: `/ecg/appointment/get-current-by-patient?patId=` + patId })
  getCurAppointmentByPatIdAndCheckType: async (patId: string, checkType: number) => {
    return await request.get({ url: `/ecg/appointment/get-current-by-patient?patId=` + patId + '&checkType=' + checkType })
  },

  // 从HIS或者DB查询预约详情

 src/views/ecg/appointment/AppointmentForm.vue

@@ -219,7 +219,7 @@
    }
  }
}
const openByQueue = async (type: string, patId: string) => {
const openByQueue = async (type: string, patId: string, checkType: number) => {
  dialogVisible.value = true
  dialogTitle.value = t('action.' + type)
  formType.value = type
@@ -228,7 +228,7 @@
  if (patId) {
    formLoading.value = true
    try {
      formData.value = await AppointmentApi.getCurAppointmentByPatId( patId )
      formData.value = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
    } finally {
      formLoading.value = false
    }

 src/views/ecg/doctor/components/DevReadyPanel.vue

@@ -49,8 +49,8 @@
    </el-form>
    <el-button @click="submitForm" type="primary" :disabled="formLoading">领用完成</el-button>
    <el-checkbox style="margin-left:10px" label="自动&nbsp;" v-model="autoPrint" />
    <el-button @click="printBill(formData.patId)">打印小票</el-button>
    <el-button @click="printBill(formData.patId, 8)">打印小票2</el-button>
    <el-button @click="printBill(formData.patId, formData.checkType)">打印小票</el-button>
    <el-button @click="printBill(formData.patId, formData.checkType, 8)">打印小票2</el-button>
    <el-button @click="cancelReady"  :disabled="formLoading">放弃领用</el-button>
    <el-button @click="resetForm()">重 置</el-button>
    <el-button @click="feeConfirm"  :disabled="formLoading">确费</el-button>
@@ -240,7 +240,7 @@
    await DevRentApi.devReady(data)

    if (autoPrint.value)
      printBill( data.patId)
      printBill( data.patId, data.checkType)

    dialogVisible.value = false
    // 发送操作成功的事件
@@ -355,9 +355,9 @@
  formData.value = await DevRentApi.getDevRent(rentId)
}

const printBill = async (patId: string, printMode?: number) => {
const printBill = async (patId: string, checkType: number, printMode?: number) => {

  const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatId( patId )
  const curAppointment: AppointmentVO = await AppointmentApi.getCurAppointmentByPatIdAndCheckType( patId, checkType )
  console.info( curAppointment )

// 引入后使用示例

 src/views/ecg/queue/index.vue

@@ -176,7 +176,7 @@
          <el-button
            link
            type="primary"
            @click="openAppointmentForm('preview', scope.row.patId)"
            @click="openAppointmentForm('preview', scope.row.patId, scope.row.bookCheckType)"
            v-hasPermi="['ecg:appointment:preview']"
          >
            查看
@@ -297,8 +297,8 @@
const openForm = (type: string, id?: number) => {
  formRef.value.open(type, id)
}
const openAppointmentForm = (type: string, patId: string, status: number) => {
  formRef.value.openByQueue(type, patId, status)
const openAppointmentForm = (type: string, patId: string, checkType: number) => {
  formRef.value.openByQueue(type, patId, checkType)
}

/** 删除按钮操作 */