diff --git a/src/api/tblist/patientexamlist/index.ts b/src/api/tblist/patientexamlist/index.ts index e39aba59..d88f2b1e 100644 --- a/src/api/tblist/patientexamlist/index.ts +++ b/src/api/tblist/patientexamlist/index.ts @@ -88,10 +88,9 @@ export const PatientexamlistApi = { }, // 超声审核 - examine: async (id: String) => { - return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id }) + examine: async (id: String, doctorname: string, doctorid: string) => { + return await request.get({ url: `/tblist/patientexamlist/examine?id=${id}&doctorname=${doctorname}&doctorid=${doctorid}` }) }, - // dicom数据同步 dicomDataSync: async () => { return await request.get({ url: `/tblist/patientexamlist/dicomDataSync` }) @@ -132,8 +131,8 @@ export const PatientexamlistApi = { Updatetblistwarning: async (id: String, type: string) => { return await request.get({ url: `/tblist/patientexamlist/Updatetblistwarning?id=${id}&&type=${type}` }) }, -// 获取心电首页统计 -getECGStatistics: async () => { - return await request.get({ url: `/tblist/patientexamlist/getECGStatistics`}) -}, + // 获取心电首页统计 + getECGStatistics: async () => { + return await request.get({ url: `/tblist/patientexamlist/getECGStatistics` }) + }, } diff --git a/src/views/ECG/ECGForm.vue b/src/views/ECG/ECGForm.vue index 7ffaa105..0761db2b 100644 --- a/src/views/ECG/ECGForm.vue +++ b/src/views/ECG/ECGForm.vue @@ -25,10 +25,10 @@
{{ rowinfo.pname }} {{ rowinfo.gender }} - {{ age + '岁' }} + 检查编号:{{ rowinfo.examId }} - 检查日期:{{ formatDate(rowinfo.examDate, 'YYYY-MM-DD HH:mm:ss') }} 检查机构: {{ rowinfo.orgName }}
@@ -668,6 +668,7 @@ import ECGApplyforRepair from '@/views/ECG/ECGModify/ECGApplyforRepair.vue' import useClipboard from 'vue-clipboard3' //复制组件 import ECGSB from '@/views/ECG/ECGSB.vue' import { ElLoading } from 'element-plus' +import { log } from 'console' const { toClipboard } = useClipboard() const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 @@ -740,6 +741,8 @@ const open = async (row: any) => { rowinfo.value = row const data = await EcganalysisparasApi.getexamIDdata(rowinfo.value.examId, orgid.value) queryParams.value = data + console.log(data) + console.log(queryParams.value) if ( queryParams.value.ecgJsonDataFilePath && (queryParams.value.ecgJsonDataFilePath.toUpperCase().endsWith('.BMP') || @@ -763,7 +766,8 @@ const open = async (row: any) => { ElMessage.warning('数据格式有误') return } - snapshotTime.value = formattedDate(queryParams.value.snapshotTime) + // snapshotTime.value = formattedDate(queryParams.value.snapshotTime) + snapshotTime.value = queryParams.value.snapshotTime ? formatDate(new Date(queryParams.value.snapshotTime), 'YYYY-MM-DD') : '' await getlogininfo() await getPatientexamlist(keyid.value) calculateAge(row.birthday) @@ -799,7 +803,7 @@ async function process() { if (applyFormVO.value.reportstatus === '已分析') { // 审核确认 await message.delConfirm('是否进行审核操作', '审核') - const response = await PatientexamlistApi.examine(keyid.value) + const response = await PatientexamlistApi.examine(keyid.value,Profilevo.value.doctorname,Profilevo.value.doctorID) if (response) { message.alertSuccess('审核成功') await getPatientexamlist(keyid.value) @@ -894,7 +898,7 @@ const save = async () => { queryParams.value = data //生成pdf - saveFormVO.value.regId = id.value + /* saveFormVO.value.regId = id.value saveFormVO.value.examId = rowinfo.value.examId saveFormVO.value.orgId = orgid.value saveFormVO.value.name = rowinfo.value.pname @@ -922,7 +926,7 @@ const save = async () => { doctorId: Profilevo.value.doctorID, doctorName: Profilevo.value.doctorname }) - } + } */ //查询主表数据 await getPatientexamlist(keyid.value) loading.close()