~yxh/ecg_web.git

eight

2024-11-29 6ad8f2e44a264e9458b159b26501a2db00c9d536

条码显示控制

已修改6个文件

	src/api/ecg/common/index.ts	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/api/ecg/queue/index.ts	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/ecg/appointment/index.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/ecg/doctor/components/DevInstallPanel.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/ecg/doctor/components/DevReadyPanel.vue	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/ecg/doctor/components/RoutinePanel.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/api/ecg/common/index.ts

@@ -5,4 +5,5 @@
    wardCode: string
    deptCode: string
    wardDesc: string
    source: number
}

 src/api/ecg/queue/index.ts

@@ -4,6 +4,7 @@
// 排队 VO
export interface QueueVO {
  id: number // id
  applyNo: string // 预约申请号
  episodeId: string // 就诊流水号
  patId: string // 患者编号
  patName: string // 患者姓名

 src/views/ecg/appointment/index.vue

@@ -214,6 +214,7 @@
const queryParams = reactive({
  pageNo: 1,
  pageSize: 10,
  applyNo: undefined,
  patId: undefined,
  patName: undefined,
  patGender: undefined,

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

@@ -6,17 +6,21 @@
      label-width="100px"
      v-loading="formLoading"
    >
      <el-form-item label="检查项目" prop="">
        {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
      </el-form-item>
      <el-row :gutter="20">
        <el-col :span="12">
          <el-form-item label="患者编号" prop="patId">
            <el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
<!--        <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
            <Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
            <Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
          </el-form-item>
          <el-form-item label="患者名称" prop="patName">
            <el-input v-model="formData.patName" placeholder="请输入患者名称" />
          </el-form-item>
          <el-form-item label="患者描述" prop="patDeptDesc">
            <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
            {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
          </el-form-item>
          <el-form-item label="装机时间" prop="rentTime">
@@ -122,6 +126,7 @@
import {RoomBedVO} from "@/api/ecg/doctor";
import {Barcode} from "@/components/Barcode";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {DICT_TYPE} from "@/utils/dict";

/** 设备装机 表单 */
defineComponent({ name: 'DevInstallPanel' })
@@ -139,9 +144,12 @@

const setPatient = (queueVO: QueueVO | undefined) => {
  resetForm()
  formData.value.applyNo = queueVO?.applyNo
  formData.value.episodeId = queueVO?.episodeId
  formData.value.patId = queueVO?.patId
  formData.value.patName = queueVO?.patName
  formData.value.checkType = queueVO?.bookCheckType
  formData.value.patSrc = queueVO?.patDetails.source
  getReadyRentInfo(formData.value)
}
defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
@@ -305,6 +313,22 @@
  getList()
}

const getDisplayBarcode = () => {
  if (!formData.value.checkType)
    return ""

  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
  if (!displayBarcode.includes( formData.value.patSrc ))
    return ""

  if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
    return formData.value.applyNo
  else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
    return formData.value.episodeId

  return ""
}

/** 初始化 **/
onMounted(() => {
  resetForm()

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

@@ -10,15 +10,19 @@
      label-width="100px"
      v-loading="formLoading"
    >
      <el-form-item label="检查项目" prop="">
        {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
      </el-form-item>
      <el-form-item label="患者编号" prop="patId">
        <el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
        <Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
        <Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
      </el-form-item>
      <el-form-item label="患者名称" prop="patName">
        <el-input v-model="formData.patName" placeholder="请输入患者名称" />
      </el-form-item>

      <el-form-item label="患者描述" prop="patDeptDesc">
        <dict-tag v-if="formData.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
        {{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
      </el-form-item>
      <el-form-item label="设备编号" prop="devId">
@@ -143,6 +147,8 @@
import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
import {useCheckTypeStore} from '@/store/modules/checkType'
import {calGender, getBookBeginTime} from "@/utils";
import form from "@/components/Form/src/Form.vue";
import {DICT_TYPE} from "@/utils/dict";

/** 设备领用 表单 */
defineComponent({ name: 'DevReadyPanel' })
@@ -301,16 +307,14 @@
  deviceInfo.value.state = 0
}

// const setPatient = (queueVO: QueueVO | undefined) => {
//   resetForm()
//   formData.value.patId = queueVO?.patId
//   formData.value.patName = queueVO?.patName
// }
const setPatient = (queueVO: QueueVO | undefined) => {
  resetForm()
  formData.value.applyNo = queueVO?.applyNo
  formData.value.episodeId = queueVO?.episodeId
  formData.value.patId = queueVO?.patId
  formData.value.patName = queueVO?.patName
  formData.value.checkType = queueVO?.bookCheckType
  formData.value.patSrc = queueVO?.patDetails.source
  getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
@@ -454,6 +458,22 @@
    message.success(t('操作成功'))
}

const getDisplayBarcode = () => {
  if (!formData.value.checkType)
    return ""

  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
  if (!displayBarcode.includes( formData.value.patSrc ))
    return ""

  if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
    return formData.value.applyNo
  else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
    return formData.value.episodeId

  return ""
}

/** 初始化 **/
onMounted(() => {
  getList()

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

@@ -12,12 +12,13 @@
          <el-form-item label="患者编号" prop="patId">
            <el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
<!--        <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
            <Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
            <Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
          </el-form-item>
          <el-form-item label="患者名称" prop="patName">
            <el-input v-model="formData.patName" placeholder="请输入患者名称" />
          </el-form-item>
          <el-form-item label="患者描述" prop="patDeptDesc">
            <dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
            科室: {{formData.patDeptDesc}} 病区: {{formData.patWardDesc}} 床位: {{formData.patBedNo}}
          </el-form-item>
          <el-form-item label="检查时间" prop="rentTime">
@@ -30,6 +31,9 @@
          </el-form-item>
        </el-col>
        <el-col :span="12">
          <el-form-item label="检查项目" prop="">
            {{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
          </el-form-item>
          <el-form-item label="备注" prop="remark">
            <el-input v-model="formData.remark" placeholder="请输入备注" />
          </el-form-item>
@@ -116,6 +120,7 @@
import {RoomBedVO} from "@/api/ecg/doctor";
import {Barcode} from "@/components/Barcode";
import {useCheckTypeStore} from "@/store/modules/checkType";
import {DICT_TYPE} from "@/utils/dict";

/** 设备装机 表单 */
defineComponent({ name: 'RoutinePanel' })
@@ -133,9 +138,12 @@

const setPatient = (queueVO: QueueVO | undefined) => {
  resetForm()
  formData.value.applyNo = queueVO?.applyNo
  formData.value.episodeId = queueVO?.episodeId
  formData.value.patId = queueVO?.patId
  formData.value.patName = queueVO?.patName
  formData.value.checkType = queueVO?.bookCheckType
  formData.value.patSrc = queueVO?.patDetails.source
  getFreeRentInfo(formData.value)
}
defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
@@ -288,6 +296,22 @@
    message.success(t('操作成功'))
}

const getDisplayBarcode = () => {
  if (!formData.value.checkType)
    return ""

  const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
  if (!displayBarcode.includes( formData.value.patSrc ))
    return ""

  if (1 === formData.value.patSrc || 2 === formData.value.patSrc)
    return formData.value.applyNo
  else if (3 === formData.value.patSrc || 4 === formData.value.patSrc)
    return formData.value.episodeId

  return ""
}

/** 初始化 **/
onMounted(() => {
  resetForm()

			@@ -5,4 +5,5 @@
			wardCode: string
			deptCode: string
			wardDesc: string
			source: number
			}

			@@ -4,6 +4,7 @@
			// 排队 VO
			export interface QueueVO {
			id: number // id
			applyNo: string // 预约申请号
			episodeId: string // 就诊流水号
			patId: string // 患者编号
			patName: string // 患者姓名

			@@ -214,6 +214,7 @@
			const queryParams = reactive({
			pageNo: 1,
			pageSize: 10,
			applyNo: undefined,
			patId: undefined,
			patName: undefined,
			patGender: undefined,

			@@ -6,17 +6,21 @@
			label-width="100px"
			v-loading="formLoading"
			>
			<el-form-item label="检查项目" prop="">
			{{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
			</el-form-item>
			<el-row :gutter="20">
			<el-col :span="12">
			<el-form-item label="患者编号" prop="patId">
			<el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
			<!-- <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
			<Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
			<Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
			</el-form-item>
			<el-form-item label="患者名称" prop="patName">
			<el-input v-model="formData.patName" placeholder="请输入患者名称" />
			</el-form-item>
			<el-form-item label="患者描述" prop="patDeptDesc">
			<dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
			{{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
			</el-form-item>
			<el-form-item label="装机时间" prop="rentTime">
			@@ -122,6 +126,7 @@
			import {RoomBedVO} from "@/api/ecg/doctor";
			import {Barcode} from "@/components/Barcode";
			import {useCheckTypeStore} from "@/store/modules/checkType";
			import {DICT_TYPE} from "@/utils/dict";

			/** 设备装机表单 */
			defineComponent({ name: 'DevInstallPanel' })
			@@ -139,9 +144,12 @@

			const setPatient = (queueVO: QueueVO \| undefined) => {
			resetForm()
			formData.value.applyNo = queueVO?.applyNo
			formData.value.episodeId = queueVO?.episodeId
			formData.value.patId = queueVO?.patId
			formData.value.patName = queueVO?.patName
			formData.value.checkType = queueVO?.bookCheckType
			formData.value.patSrc = queueVO?.patDetails.source
			getReadyRentInfo(formData.value)
			}
			defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
			@@ -305,6 +313,22 @@
			getList()
			}

			const getDisplayBarcode = () => {
			if (!formData.value.checkType)
			return ""

			const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
			if (!displayBarcode.includes( formData.value.patSrc ))
			return ""

			if (1 === formData.value.patSrc \|\| 2 === formData.value.patSrc)
			return formData.value.applyNo
			else if (3 === formData.value.patSrc \|\| 4 === formData.value.patSrc)
			return formData.value.episodeId

			return ""
			}

			/ 初始化 /
			onMounted(() => {
			resetForm()

			@@ -10,15 +10,19 @@
			label-width="100px"
			v-loading="formLoading"
			>
			<el-form-item label="检查项目" prop="">
			{{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
			</el-form-item>
			<el-form-item label="患者编号" prop="patId">
			<el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
			<Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
			<Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
			</el-form-item>
			<el-form-item label="患者名称" prop="patName">
			<el-input v-model="formData.patName" placeholder="请输入患者名称" />
			</el-form-item>

			<el-form-item label="患者描述" prop="patDeptDesc">
			<dict-tag v-if="formData.patSrc" :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
			{{formData.patDetails?.deptDesc}} {{formData.patDetails?.wardDesc}} {{formData.patDetails?.bedNo}}
			</el-form-item>
			<el-form-item label="设备编号" prop="devId">
			@@ -143,6 +147,8 @@
			import {AppointmentApi, AppointmentVO} from "@/api/ecg/appointment";
			import {useCheckTypeStore} from '@/store/modules/checkType'
			import {calGender, getBookBeginTime} from "@/utils";
			import form from "@/components/Form/src/Form.vue";
			import {DICT_TYPE} from "@/utils/dict";

			/** 设备领用表单 */
			defineComponent({ name: 'DevReadyPanel' })
			@@ -301,16 +307,14 @@
			deviceInfo.value.state = 0
			}

			// const setPatient = (queueVO: QueueVO \| undefined) => {
			// resetForm()
			// formData.value.patId = queueVO?.patId
			// formData.value.patName = queueVO?.patName
			// }
			const setPatient = (queueVO: QueueVO \| undefined) => {
			resetForm()
			formData.value.applyNo = queueVO?.applyNo
			formData.value.episodeId = queueVO?.episodeId
			formData.value.patId = queueVO?.patId
			formData.value.patName = queueVO?.patName
			formData.value.checkType = queueVO?.bookCheckType
			formData.value.patSrc = queueVO?.patDetails.source
			getFreeRentInfo(formData.value)
			}
			defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
			@@ -454,6 +458,22 @@
			message.success(t('操作成功'))
			}

			const getDisplayBarcode = () => {
			if (!formData.value.checkType)
			return ""

			const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
			if (!displayBarcode.includes( formData.value.patSrc ))
			return ""

			if (1 === formData.value.patSrc \|\| 2 === formData.value.patSrc)
			return formData.value.applyNo
			else if (3 === formData.value.patSrc \|\| 4 === formData.value.patSrc)
			return formData.value.episodeId

			return ""
			}

			/ 初始化 /
			onMounted(() => {
			getList()

			@@ -12,12 +12,13 @@
			<el-form-item label="患者编号" prop="patId">
			<el-input v-model="formData.patId" placeholder="请输入患者编号" @input="getRentInfoByPatId" />
			<!-- <Qrcode v-if="formData.patId !== undefined && formData.patId !== ''" :text="formData.patId" logo="/logo.gif" width=100 />-->
			<Barcode v-if="!isStringEmpty(formData.patId) && 1 === checkTypeStore.getCheckTypeDispBarCode(formData.checkType)" :value="formData.patId" :width=100 />
			<Barcode v-if="getDisplayBarcode()" :value="getDisplayBarcode()" :width=100 />
			</el-form-item>
			<el-form-item label="患者名称" prop="patName">
			<el-input v-model="formData.patName" placeholder="请输入患者名称" />
			</el-form-item>
			<el-form-item label="患者描述" prop="patDeptDesc">
			<dict-tag :type="DICT_TYPE.ECG_PAT_SOURCE" :value="formData.patSrc" />
			科室: {{formData.patDeptDesc}} 病区: {{formData.patWardDesc}} 床位: {{formData.patBedNo}}
			</el-form-item>
			<el-form-item label="检查时间" prop="rentTime">
			@@ -30,6 +31,9 @@
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="检查项目" prop="">
			{{formData.checkType && checkTypeStore.getCheckTypeName(formData.checkType)}}
			</el-form-item>
			<el-form-item label="备注" prop="remark">
			<el-input v-model="formData.remark" placeholder="请输入备注" />
			</el-form-item>
			@@ -116,6 +120,7 @@
			import {RoomBedVO} from "@/api/ecg/doctor";
			import {Barcode} from "@/components/Barcode";
			import {useCheckTypeStore} from "@/store/modules/checkType";
			import {DICT_TYPE} from "@/utils/dict";

			/** 设备装机表单 */
			defineComponent({ name: 'RoutinePanel' })
			@@ -133,9 +138,12 @@

			const setPatient = (queueVO: QueueVO \| undefined) => {
			resetForm()
			formData.value.applyNo = queueVO?.applyNo
			formData.value.episodeId = queueVO?.episodeId
			formData.value.patId = queueVO?.patId
			formData.value.patName = queueVO?.patName
			formData.value.checkType = queueVO?.bookCheckType
			formData.value.patSrc = queueVO?.patDetails.source
			getFreeRentInfo(formData.value)
			}
			defineExpose({ setPatient }) // 提供 setPatient 方法，用于设置患者
			@@ -288,6 +296,22 @@
			message.success(t('操作成功'))
			}

			const getDisplayBarcode = () => {
			if (!formData.value.checkType)
			return ""

			const displayBarcode: number[] = checkTypeStore.getCheckTypeDispBarCode(formData.value.checkType!)
			if (!displayBarcode.includes( formData.value.patSrc ))
			return ""

			if (1 === formData.value.patSrc \|\| 2 === formData.value.patSrc)
			return formData.value.applyNo
			else if (3 === formData.value.patSrc \|\| 4 === formData.value.patSrc)
			return formData.value.episodeId

			return ""
			}

			/ 初始化 /
			onMounted(() => {
			resetForm()