From d0aef05643dcf4f746db5bc41a7d79a4b1ca20e6 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Fri, 23 May 2025 17:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F&=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/头像.png | Bin 0 -> 4052 bytes src/api/inspect/inspectpatient/index.ts | 4 +-- .../Medical-examination-vehicle.vue | 5 +-- .../Inspection-checklist.vue | 31 ++++++++++++++++-- .../inspect/inspectorg/InspectOrgForm.vue | 11 ++++--- src/views/inspect/inspectorg/index.vue | 2 +- .../reprot-print/components/ReportPreview.vue | 9 +++-- 7 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 public/头像.png diff --git a/public/头像.png b/public/头像.png new file mode 100644 index 0000000000000000000000000000000000000000..50292d0730c6af4ea2b5cbd304a50abc7faa339e GIT binary patch literal 4052 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 { - return await request.get({ url: `/inspect/patient/PatientBySearchKey?searchKey=` + searchKey }) + getPatientInfoByMedicalSn: async (searchKey: string,examhoscode: string,status: string) => { + return await request.get({ url: `/inspect/patient/PatientBySearchKey?searchKey=` + searchKey + `&examhoscode=` + examhoscode + `&status=` + status}) }, //获取公卫患者信息 getGwPatientInfo: async (idCard: string) => { diff --git a/src/views/Department-entry/Medical-examination-vehicle.vue b/src/views/Department-entry/Medical-examination-vehicle.vue index 3395559..4ba02e4 100644 --- a/src/views/Department-entry/Medical-examination-vehicle.vue +++ b/src/views/Department-entry/Medical-examination-vehicle.vue @@ -609,7 +609,7 @@ const handleLocalSearch = async () => { }) // 获取搜索结果 - const res = await PatientApi.getPatientInfoByMedicalSn(searchQuery.value) + const res = await PatientApi.getPatientInfoByMedicalSn(searchQuery.value,user.value.deptId,statusFilter.value) // 检查返回的数据 if (res) { @@ -2771,7 +2771,8 @@ const getDoctorList = async () => { try { const res = await DoctorApi.getDoctorPage({ pageNo: 1, - pageSize: 100 // 设置较大的数值以获取所有医生 + pageSize: 100, // 设置较大的数值以获取所有医生 + orgid: user.value?.deptId }) if (res && res.list && res.list.length > 0) { // 保存原始医生列表数据 diff --git a/src/views/Inspection-checklist/Inspection-checklist.vue b/src/views/Inspection-checklist/Inspection-checklist.vue index d222c91..d19a5ce 100644 --- a/src/views/Inspection-checklist/Inspection-checklist.vue +++ b/src/views/Inspection-checklist/Inspection-checklist.vue @@ -302,6 +302,21 @@ onMounted(() => { /** 打印报告按钮操作 */ const handlePrint = async (row: PatientVO) => { try { + const patientInfo = await PatientApi.getPatientInfo(row.medicalSn) + if (patientInfo.status == 1 && patientInfo.medicalDateTime) { + const lastMedicalDate = new Date(patientInfo.medicalDateTime) + const currentDate = new Date() + // 计算日期之间的差距（毫秒） + const timeDiff = currentDate.getTime() - lastMedicalDate.getTime() + // 转换为天数 + const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24)) + // 如果不到365天（一年） + if (daysDiff < 365) { + // 显示警告消息 + message.error(`该患者上次体检距今不满一年`) + return + } + } const userInfo = await getUserProfile() const deptInfo = await InspectOrgApi.getInspectOrg(userInfo.deptId) await PatientApi.updatePatientOrg(row.medicalSn,deptInfo.orgid,deptInfo.orgName) @@ -355,8 +370,20 @@ const handlePrintBarcode = async (row: PatientVO) => { try { // 获取最新的患者信息 const patientInfo = await PatientApi.getPatientInfo(row.medicalSn) - console.log('患者信息:', patientInfo) - + if (patientInfo.status == 1 && patientInfo.medicalDateTime) { + const lastMedicalDate = new Date(patientInfo.medicalDateTime) + const currentDate = new Date() + // 计算日期之间的差距（毫秒） + const timeDiff = currentDate.getTime() - lastMedicalDate.getTime() + // 转换为天数 + const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24)) + // 如果不到365天（一年） + if (daysDiff < 365) { + // 显示警告消息 + message.error(`该患者上次体检距今不满一年`) + return + } + } // 检查是否存在条形码打印时间 if(patientInfo.barcodetime){ // 格式化上次打印时间，显示中文年月日格式 diff --git a/src/views/inspect/inspectorg/InspectOrgForm.vue b/src/views/inspect/inspectorg/InspectOrgForm.vue index 4063393..e5de289 100644 --- a/src/views/inspect/inspectorg/InspectOrgForm.vue +++ b/src/views/inspect/inspectorg/InspectOrgForm.vue @@ -9,17 +9,20 @@ > + + + - - + + - + @@ -82,11 +85,9 @@ const formData = ref({ }) const formRules = reactive({ highLevelOrgID: [{ required: true, message: '请选择上级机构', trigger: 'change' }], - orgSN: [{ required: true, message: '请输入机构编号', trigger: 'change' }], orgType: [{ required: true, message: '请选择医院机构类型', trigger: 'change' }], orgName: [{ required: true, message: '请输入机构名称', trigger: 'change' }], contactPerson: [{ required: true, message: '请输入联系人姓名', trigger: 'change' }], - inHisCode: [{ required: true, message: '请输入机构码', trigger: 'change' }], contactTel: [ { required: true, message: '请填入正确的手机号', trigger: 'blur' }, { diff --git a/src/views/inspect/inspectorg/index.vue b/src/views/inspect/inspectorg/index.vue index 6681fb9..53e6a0e 100644 --- a/src/views/inspect/inspectorg/index.vue +++ b/src/views/inspect/inspectorg/index.vue @@ -53,7 +53,7 @@ - + diff --git a/src/views/summary/reprot-print/components/ReportPreview.vue b/src/views/summary/reprot-print/components/ReportPreview.vue index 90e2814..3c24b37 100644 --- a/src/views/summary/reprot-print/components/ReportPreview.vue +++ b/src/views/summary/reprot-print/components/ReportPreview.vue @@ -12,7 +12,7 @@