update & refactor

eight

2025-04-11 22a9a5fe525fb893ecaa8d4a8bfb65169ce02fc4

update & refactor

 src/api/ecg/devmanage/index.ts

@@ -9,17 +9,17 @@

// è®¾å¤‡ VO
export interface DeviceVO {
  id: number // id
  devCodeIntrinsic: string
  devCodeHosp: string
  devCodeDept: string
  devId: string // è®¾å¤‡ç¼–号
  category: string // åˆ†ç±»å
  brand: string // å“ç‰Œ
  model: string // åž‹å·
  purchaseDate: number // é‡‡è´­æ—¥æœŸ
  state: number //状态
  comment: string // å¤‡æ³¨
  id?: number // id
  devCodeIntrinsic?: string
  devCodeHosp?: string
  devCodeDept?: string
  devId?: string // è®¾å¤‡ç¼–号
  category?: string // åˆ†ç±»å
  brand?: string // å“ç‰Œ
  model?: string // åž‹å·
  purchaseDate?: number // é‡‡è´­æ—¥æœŸ
  state?: number //状态
  comment?: string // å¤‡æ³¨
}

// è®¾å¤‡ç»Ÿè®¡ VO

 src/api/ecg/devrent/index.ts

@@ -3,24 +3,24 @@

// è£…机拆机 VO
export interface DevRentVO {
  id: number | undefined // id
  applyNo: string | undefined // é¢„约申请号
  episodeId: string | undefined // å°±è¯Šæµæ°´å·
  devId: string | undefined // è®¾å¤‡ç¼–号
  patId: string | undefined// æ‚£è€…编号
  patName: string | undefined // æ‚£è€…名称
  patDetails: PatDetailsVO | undefined
  checkType: number | undefined
  rentTime: number | undefined // è£…机时间
  returnTime: number | undefined // æ‹†æœºæ—¶é—´
  interference: number | undefined // å¹²æ‰°æ•°
  baseline: string | undefined // åŸºçº¿ç²—
  detachment: string | undefined // è„±è½
  remark: string | undefined // å¤‡æ³¨
  state: number | undefined // çŠ¶æ€
  paid: number | undefined
  roomId: number | undefined | null
  bedNo: string | undefined | null
  id?: number | undefined | null // id
  applyNo?: string | undefined | null // é¢„约申请号
  episodeId?: string | undefined | null // å°±è¯Šæµæ°´å·
  devId?: string | undefined | null // è®¾å¤‡ç¼–号
  patId?: string | undefined | null// æ‚£è€…编号
  patName?: string | undefined | null // æ‚£è€…名称
  patDetails?: PatDetailsVO | undefined | null
  checkType?: number | undefined | null
  rentTime?: number | undefined | null // è£…机时间
  returnTime?: number | undefined | null // æ‹†æœºæ—¶é—´
  interference?: number | undefined | null // å¹²æ‰°æ•°
  baseline?: string | undefined | null // åŸºçº¿ç²—
  detachment?: string | undefined | null // è„±è½
  remark?: string | undefined | null // å¤‡æ³¨
  state?: number | undefined | null // çŠ¶æ€
  paid?: number | undefined | null
  roomId?: number | undefined | null
  bedNo?: string | undefined | null
}

// è£…机拆机 API

 src/components/RoomBedSelect/src/RoomBedSelect.vue

@@ -56,7 +56,7 @@
      <div class="deskwarp">

        <div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
          {{checkTypeStore.getCheckTypeName(checkType)}}
          {{getCheckTypeName(checkType)}}
        </div>
        <div>
          {{bedItem.opType === 1?"领用":""}}

 src/components/RoomStatus/src/RoomStatus.vue

@@ -64,7 +64,7 @@
        />
        {{bedItem.bedNo}} {{bedItem.docName}} {{bedItem.status === 30?"-暂停":""}}
        <div v-for="(checkType, subIndex) in bedItem.checkTypes" :key="subIndex">
          {{checkTypeStore.getCheckTypeName(checkType)}}
          {{getCheckTypeName(checkType)}}
        </div>
        <div>
          {{bedItem.opType === 1?"领用":""}}

 src/utils/checkTypeFormatter.ts

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
import {useCheckTypeStore} from "@/store/modules/checkType";

const checkTypeStore = useCheckTypeStore();

export const getCheckTypeName = (checkType) => checkTypeStore.getCheckTypeName(checkType)

export const getCheckTypeSeqPrefix = (checkType) => checkTypeStore.getCheckTypeSeqPrefix(checkType)



 src/views/ecg/appointment/AppointmentConfirm.vue

@@ -122,7 +122,7 @@
  bookTime: new Date(),
  bookDate: new Date(),
  bookTimeslot: 9301030,
  bookCheckType: checkTypeStore.getCheckTypeName(100),
  bookCheckType: getCheckTypeName(100),
  paid: 0,
})
const formRef = ref() // è¡¨å• Ref
@@ -176,7 +176,7 @@
    bookTime: new Date(),
    bookDate: new Date(),
    bookTimeslot: 9301030,
    bookCheckType: checkTypeStore.getCheckTypeName(100),
    bookCheckType: getCheckTypeName(100),
    paid: 0,
    bookSeqNum: 0
  }

 src/views/ecg/appointment/AppointmentForm.vue

@@ -282,7 +282,7 @@
    bookTime: undefined,
    bookDate: new Date().getTime(),
    bookTimeslot: 9000930,
    bookCheckType: checkTypeStore.getCheckTypeName(100),
    bookCheckType: getCheckTypeName(100),
    paid: 0,
  }
  formRef.value?.resetFields()

 src/views/ecg/appointment/CheckItemPanel.vue

@@ -129,7 +129,7 @@
  //var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); å¯¼è‡´èµ°ä¸‰é¡µ
  var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//文本
  const checkTypeName = checkTypeStore.getCheckTypeName(props.appointment.bookCheckType)
  const checkTypeName = getCheckTypeName(props.appointment.bookCheckType)
  panel.addPrintText({ options: { width: 150, height: 15, top: 2, left: 10, title: checkTypeName, textAlign: 'center', fontSize: 15, fontFamily: '微软雅黑',  fontWeight: '700', } });
  const patientBaisc = props.appointment.patName + "  " + calGender(props.appointment.patGender) + "  " + calculateAge(props.appointment.patBirthday) + "岁"
  panel.addPrintText({ options: { width: 150, height: 15, top: 27, left: 10, title: patientBaisc, textAlign: 'center' , fontSize: 15, fontFamily: '微软雅黑', fontWeight: '700', } });
@@ -168,7 +168,7 @@

<template>
  <el-card style="width: 200px" shadow="hover" >
    <template #header>{{checkTypeStore.getCheckTypeName(appointment.bookCheckType)}}</template>
    <template #header>{{getCheckTypeName(appointment.bookCheckType)}}</template>
    <div>{{formatDate(appointment.bookDate, 'YYYY-MM-DD')}}</div>
    <div>{{formatTimeslot(appointment.bookTimeslot)}}</div>


 src/views/ecg/appointment/index.vue

@@ -147,7 +147,7 @@
      </el-table-column>
      <el-table-column label="预约检查类型" align="center" prop="bookCheckType" min-width="120px">
        <template #default="scope">
          {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
          {{getCheckTypeName(scope.row.bookCheckType)}}
        </template>
      </el-table-column>
      <el-table-column label="生日" align="center" prop="patBirthday" :formatter="dateFormatter2" width="110px"/>

 src/views/ecg/callingscreen/bigscreen.vue

@@ -4,6 +4,7 @@
import {CallApi, CallVO} from "@/api/ecg/call";
import {queueStatusConvert} from "@/utils/statusFormatter";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";

defineOptions({ name: 'bigscreen' })

@@ -114,7 +115,7 @@
    <div style="display:flex; justify-content:space-around; align-items: flex-start; flex-grow: 1; border: solid 2px var(--el-color-primary-light-7); font-size: 20px">
      <div v-for="[disColId2, columnPatientList] of Object.entries(mapColumnVsPatients)" :key="disColId2" style="flex: 1; flex-basis: 300px; height: 100%; border-left: solid 2px var(--el-color-primary-light-7) ">
        <div v-for="(item, index) in columnPatientList" :key="index" :class="getItemCssClass(item)">
          <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
          <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}}</span>
          <span style="display:inline-block; width:80px;">{{ nameDesensitize(item.patName) }} </span>
          <span style="display:inline-block; width:80px;">{{queueStatusConvert(item.status)}} </span>
          {{item.roomName}} {{item.bedNo}}

 src/views/ecg/callingscreen/roomscreen.vue

@@ -6,6 +6,7 @@
import {CallApi, CallVO} from "@/api/ecg/call";
import {queueStatusConvert} from "../../../utils/statusFormatter";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {getCheckTypeSeqPrefix} from "../../../utils/checkTypeFormatter";

defineOptions({ name: 'roomscreen' })
let roomId = ref<number>(0)
@@ -123,7 +124,7 @@
                label="预约序号"
                width="60px">
              <template #default="scope">
                <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
                <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
              </template>
            </el-table-column>
            <el-table-column
@@ -139,7 +140,7 @@
                label="检查项目"
                width="80px">
              <template #default="scope">
                <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span>
                <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span>
              </template>
            </el-table-column>
            <el-table-column label="状态" align="center" width="200px">
@@ -162,7 +163,7 @@
                label="预约序号"
                width="60px">
              <template #default="scope">
                <span style="display:inline-block; width:60px;">{{checkTypeStore.getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
                <span style="display:inline-block; width:60px;">{{getCheckTypeSeqPrefix(scope.row.bookCheckType)}}{{scope.row.bookSeqNum}} </span>
              </template>
            </el-table-column>
            <el-table-column
@@ -178,7 +179,7 @@
                label="检查项目"
                width="80px">
              <template #default="scope">
                <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}} </span>
                <span style="display:inline-block; width:80px;">{{scope.row.bookCheckType && getCheckTypeName(scope.row.bookCheckType)}} </span>
              </template>
            </el-table-column>
            <el-table-column label="状态" align="center" width="200px">

 src/views/ecg/checktype/index.vue

@@ -147,7 +147,7 @@
      <el-table-column label="亲和的检查类型" align="center" prop="affinityCheckTypes" >
        <template #default="scope">
          <div v-for="(checkType, subIndex) in scope.row.affinityCheckTypes" :key="subIndex">
            {{checkTypeStore.getCheckTypeName(checkType)}}
            {{getCheckTypeName(checkType)}}
          </div>
        </template>
      </el-table-column>
@@ -283,4 +283,4 @@
onMounted(() => {
  getList()
})
</script>
</script>

 src/views/ecg/devrent/index.vue

@@ -104,7 +104,7 @@
      <el-table-column label="患者名称" align="center" prop="patName" />
      <el-table-column label="检查类型" align="center" prop="checkType" width="100px">
        <template #default="scope">
          <span>{{checkTypeStore.getCheckTypeName(scope.row.checkType)}}</span>
          <span>{{getCheckTypeName(scope.row.checkType)}}</span>
        </template>
      </el-table-column>
      <el-table-column label="检查状态" align="center" prop="state" width="90px">

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

@@ -7,7 +7,7 @@
      v-loading="formLoading"
    >
      <el-form-item label="检查项目" prop="">
        {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
        {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
      </el-form-item>
      <el-row :gutter="20">
        <el-col :span="12">

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

@@ -11,7 +11,7 @@
      v-loading="formLoading"
    >
      <el-form-item label="检查项目" prop="">
        {{formData?.checkType && checkTypeStore.getCheckTypeName(formData?.checkType)}}
        {{formData?.checkType && getCheckTypeName(formData?.checkType)}}
      </el-form-item>
      <el-form-item label="患者编号" prop="patId">
        <el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
@@ -57,8 +57,8 @@
    <el-button @click="printBill(formData.patId!, formData.checkType!)">打印小票</el-button>
    <el-button @click="cancelReady"  :disabled="formLoading">放弃领用</el-button>
    <el-button @click="resetForm()">重 ç½®</el-button>
    <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeConfirm"  :disabled="formLoading">确费</el-button>
    <el-button v-if="formData.checkType && checkTypeStore.getExpenseRecognition(formData.checkType)" @click="feeCancel"  :disabled="formLoading">取消确费</el-button>
    <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeConfirm"  :disabled="formLoading">确费</el-button>
    <el-button v-if="needAutoFeeConfirm(formData.checkType)" @click="feeCancel"  :disabled="formLoading">取消确费</el-button>

  <!-- åŒ»ç”Ÿè£…机列表 -->
  <ContentWrap>
@@ -149,6 +149,7 @@
import {calGender, getBookBeginTime} from "@/utils";
import {DICT_TYPE} from "@/utils/dict";
import {tranlateDevState} from "@/utils/statusFormatter";
import {getCheckTypeName} from "../../../../utils/checkTypeFormatter";

/** è®¾å¤‡é¢†ç”¨ è¡¨å• */
defineComponent({ name: 'DevReadyPanel' })
@@ -174,6 +175,7 @@
const checkTypeStore = useCheckTypeStore()

const formData = ref<Partial<DevRentVO>>({
  id: undefined,
  devId: undefined,
  patId: undefined,
  patName: undefined,
@@ -183,8 +185,6 @@
  returnTime: undefined,
  remark: undefined,
  paid: undefined,
  roomId: props.room.roomId,
  bedNo: props.room.bedNo
})

const formRules = reactive({
@@ -203,6 +203,13 @@
})

const displayBarCode = ref<string> ()

const needAutoFeeConfirm = (checkType: number | null | undefined) => {
  if (checkType == null)
    return false

  return checkTypeStore.getExpenseRecognition(checkType)
}

const getRentInfoByPatId = () => {
  const tempPatId = formData.value.patId;
@@ -237,17 +244,16 @@
  try {
    formData.value.roomId = props.room.roomId
    formData.value.bedNo = props.room.bedNo
    const data = formData.value
    console.info( data )
    await DevRentApi.devReady(formData.value)

    await DevRentApi.devReady(data)

    if (autoPrint.value && data.patId && data.checkType) {
      printBill(data.patId, data.checkType)
    if (autoPrint.value && formData.value.patId && formData.value.checkType) {
      printBill(formData.value.patId, formData.value.checkType)
    }

    // è‡ªåŠ¨ç¡®è´¹
    feeConfirm()
    if (needAutoFeeConfirm(formData.value.checkType)) {
      feeConfirm()
    }

    dialogVisible.value = false
    // å‘送操作成功的事件
@@ -288,8 +294,6 @@
    remark: undefined,
    patDetails: undefined,
    paid: undefined,
    roomId: props.room.roomId,
    bedNo: props.room.bedNo
  }
  formRef.value?.resetFields()

@@ -376,7 +380,7 @@
  //var panel = hiprintTemplate.addPrintPanel({ width: 100, height: 130, paperFooter: 340, paperHeader: 10 }); å¯¼è‡´èµ°ä¸‰é¡µ
  var panel = hiprintTemplate.addPrintPanel({ width: 140, height: 130, paperNumberDisabled:true});
//文本
  const checkTypeName = checkTypeStore.getCheckTypeName(curAppointment.bookCheckType)
  const checkTypeName = getCheckTypeName(curAppointment.bookCheckType)
  panel.addPrintText({ options: { width: 140, height: 12, top: 2, left: 20, title: checkTypeName, textAlign: 'center', fontSize: 10, fontFamily: '微软雅黑',  fontWeight: '700', } });
  const patientBaisc = curAppointment.patName + "  " + calGender(curAppointment.patGender) + "  " + calculateAge(curAppointment.patBirthday) + "岁"
  panel.addPrintText({ options: { width: 140, height: 12, top: 16, left: 20, title: patientBaisc, textAlign: 'center' , fontSize: 10, fontFamily: '微软雅黑',  fontWeight: '700', } });
@@ -447,24 +451,24 @@
}

const feeConfirm = async () => {
  if (formData.value?.id === undefined) {
  if (formData.value.id == null) {
    message.error(t('请先领用'))
    return
  }

  const result = await DevRentApi.feeConfirm(formData.value.id)
  if (0 == result)
  if (0 === result)
    message.success(t('确费操作成功'))
}

const feeCancel = async () => {
  if (formData.value?.id === undefined) {
  if (formData.value.id == null) {
    message.error(t('请先领用'))
    return
  }

  const result = await DevRentApi.feeCancel(formData.value.id)
  if (0 == result)
  if (0 === result)
    message.success(t('操作成功'))
}


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

@@ -4,6 +4,7 @@
import {DICT_TYPE} from "@/utils/dict";
import {PatientVO, DoctorApi, RoomBedVO} from "@/api/ecg/doctor";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {getCheckTypeName, getCheckTypeSeqPrefix} from "../../../../utils/checkTypeFormatter";

defineComponent({
  name: 'QueuePanel'
@@ -52,11 +53,11 @@
<template>
<div v-for="(item, index) in queue" :key="index">
  <span style="display:inline-block; width:30px;"> {{item.seqNum}} </span>
  <span style="display:inline-block; width:40px;"> {{checkTypeStore.getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
  <span style="display:inline-block; width:40px;"> {{getCheckTypeSeqPrefix(item.bookCheckType)}}{{item.bookSeqNum}} </span>
  <span style="display:inline-block; width:70px;"> &nbsp; {{item.patName}}{{item.passed === 0 ? "":"*"}} </span>
  <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="item.patGender" />
<!--  {{item.roomName}} {{item.bedNo}}-->
  {{checkTypeStore.getCheckTypeName(item.bookCheckType)}}
  {{getCheckTypeName(item.bookCheckType)}}
  <dict-tag :type="DICT_TYPE.ECG_QUEUE_STATUS" :value="item.status" />
  <el-button v-if="item.status === 5 || item.status === 7" @click="recall(item)"> å¬å›ž </el-button>
</div>

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

@@ -33,7 +33,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item label="检查项目" prop="">
            {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
            {{formData.checkType && getCheckTypeName(formData.checkType)}}
          </el-form-item>
          <el-form-item label="备注" prop="remark">
            <el-input v-model="formData.remark" placeholder="请输入备注" />

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

@@ -34,7 +34,7 @@
      {{room.roomName || ''}} {{room.bedNo || ''}} {{room.opType === 1?"领用":""}} {{room.opType === 2?"安装":""}}
      <div>
        <span v-for="(checkType, subIndex) in room.checkTypes" :key="subIndex">
          {{checkTypeStore.getCheckTypeName(checkType)}} &nbsp;
          {{getCheckTypeName(checkType)}} &nbsp;
        </span>
      </div>
    </div>

 src/views/ecg/queue/index.vue

@@ -191,7 +191,7 @@
      </el-table-column>
      <el-table-column label="检查类型" align="center" prop="bookCheckType" min-width="100px">
        <template #default="scope">
          {{checkTypeStore.getCheckTypeName(scope.row.bookCheckType)}}
          {{getCheckTypeName(scope.row.bookCheckType)}}
        </template>
      </el-table-column>
      <el-table-column label="患者详情" align="center" prop="patDetails" min-width="300px">

 src/views/ecg/room/RoomSetting.vue

@@ -18,7 +18,7 @@
      <div>开诊时间：{{ openingPeriod }}  {{ monitorInfo.openingFlag }}  </div>
      <div>工位概况： {{monitorInfo.openingBedNum}} {{monitorInfo.docBedNum}} {{monitorInfo.routingBedNum}} </div>
      <div v-for="(value, key) in monitorInfo.checkTypeBedInfo" :key="key">
        {{ checkTypeStore.getCheckTypeName(Number(key)) }}  {{ value }}
        {{ getCheckTypeName(Number(key)) }}  {{ value }}
      </div>
      <div>工位概况：开放的工位  æœ‰åŒ»ç”Ÿå·¥ä½  å‚与分流工位</div>
      <div>检查类型 å¼€æ”¾çš„工位 (检查/领用 | å®‰è£…)  æœ‰åŒ»ç”Ÿå·¥ä½ (检查/领用 | å®‰è£…)</div>

 src/views/ecg/room/index.vue

@@ -71,7 +71,7 @@
      <el-table-column label="检查类型" align="center" prop="checkTypes" width="180px">
        <template #default="scope">
          <div v-for="(checkType, subIndex) in scope.row.checkTypes" :key="subIndex">
            {{checkTypeStore.getCheckTypeName(checkType)}}
            {{getCheckTypeName(checkType)}}
          </div>
        </template>
      </el-table-column>