diff --git a/src/views/Inspection-checklist/Inspection-checklist.vue b/src/views/Inspection-checklist/Inspection-checklist.vue index 8c17d93..9b309da 100644 --- a/src/views/Inspection-checklist/Inspection-checklist.vue +++ b/src/views/Inspection-checklist/Inspection-checklist.vue @@ -67,7 +67,7 @@ (null) // 文件输入引用 @@ -322,23 +321,15 @@ const handlePrint = async (row: PatientVO) => { } const userInfo = await getUserProfile() const deptInfo = await InspectOrgApi.getInspectOrg(userInfo.deptId) - if (queryParams.hospitalNo) { - const selectedHospital = hospitals.find((h) => h.code === queryParams.hospitalNo) + if (hospitalNo.value) { + const selectedHospital = hospitals.find((h) => h.code === hospitalNo.value) if (selectedHospital) { const shortid = selectedHospital.shortCode await PatientApi.updatePatientOrg( row.medicalSn, deptInfo.orgid, deptInfo.orgName, - queryParams.hospitalNo, - shortid - ) - console.log( - 'updatePatientOrg', - row.medicalSn, - deptInfo.orgid, - deptInfo.orgName, - queryParams.hospitalNo, + hospitalNo.value, shortid ) } else { diff --git a/src/views/sta/index.vue b/src/views/sta/index.vue index e092aa0..1c8c6e1 100644 --- a/src/views/sta/index.vue +++ b/src/views/sta/index.vue @@ -409,7 +409,7 @@ const handleDetail = async (row) => { stadate: time.value[0], enddate: time.value[1], addname: row.districtname, - examhosname: parentNode ? parentNode.orgname : row.orgname, + orgname: parentNode ? parentNode.orgname : row.orgname, //orgid: userInfo.value.deptId hospitalNo: selectedHospital.value } diff --git a/src/views/summary/reprot-print/report-print.vue b/src/views/summary/reprot-print/report-print.vue index 0bc1479..e0be211 100644 --- a/src/views/summary/reprot-print/report-print.vue +++ b/src/views/summary/reprot-print/report-print.vue @@ -38,6 +38,22 @@ class="!w-320px" /> + + + + + + 查询 @@ -123,12 +139,12 @@ import { PatientApi, type PatientVO } from '@/api/inspect/inspectpatient' // 使用相对路径导入组件 import ReportPreview from './components/ReportPreview.vue' import dayjs from 'dayjs' +import { hospitals } from '@/config/hospitals' defineOptions({ name: 'ReportPrint' }) //打印预览相关变量 const printDialogVisible = ref(false) const currentReportData = ref({}) - const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 const loading = ref(true) // 列表的加载中 @@ -139,6 +155,7 @@ const queryParams = reactive({ pageSize: 10, medicalSn: undefined as string | undefined, pname: undefined as string | undefined, + hospitalNo: undefined as string | undefined, medicalDateTime: [ dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss'), dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss') @@ -157,7 +174,8 @@ const getList = async () => { medicalSn: queryParams.medicalSn, pName: queryParams.pname?.trim() || undefined, medicalDateTime: queryParams.medicalDateTime, - status: queryParams.status + status: queryParams.status, + hospitalNo: queryParams.hospitalNo }) list.value = data.list total.value = data.total