diff --git a/.vscode/settings.json b/.vscode/settings.json index 0aa8caa4..311eefa5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -62,7 +62,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[typescript]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + "editor.defaultFormatter": "vscode.typescript-language-features" }, "[typescriptreact]": { "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" diff --git a/src/api/tblist/patientexamlist/index.ts b/src/api/tblist/patientexamlist/index.ts index 3dca2ac7..fd8e41eb 100644 --- a/src/api/tblist/patientexamlist/index.ts +++ b/src/api/tblist/patientexamlist/index.ts @@ -22,7 +22,7 @@ export interface PatientexamlistVO { diagResults: string // 诊断结论 diagDate: Date // 下诊断结论的时间:年月日时分秒 diagDoctor: string // 诊断医生 - diagDoctorId:string + diagDoctorId: string reviewDoctor: string // 审核医生 reviewDate: Date // 审核日期:年月日时分秒 thumbnailImgUrl: string // 缩略图oss url, httP:oss url @@ -30,20 +30,20 @@ export interface PatientexamlistVO { regId: string // 登记单号 diagFlag: string // 阴性阳性标记 deviceName: string // 影像设备名称 - notes:string//备注 - billDoctorDepartment:string// 开单科室 送检科室 - StudyInsta:string - isFavourite:string //是否收藏 - pdfurl:String//pdf地址 - warning:String//是否有危急值 - applyhighLevelname:String//申请上级机构医生 + notes: string//备注 + billDoctorDepartment: string// 开单科室 送检科室 + StudyInsta: string + isFavourite: string //是否收藏 + pdfurl: String//pdf地址 + warning: String//是否有危急值 + applyhighLevelname: String//申请上级机构医生 } export interface inspdfscreenshotVO { id: string // 主键 imagebase: string // 图片 - model:string//类型 0 接口 1ftp - folderPath:string // + model: string//类型 0 接口 1ftp + folderPath: string // } // PACS检查列表 API export const PatientexamlistApi = { @@ -77,46 +77,51 @@ export const PatientexamlistApi = { return await request.download({ url: `/tblist/patientexamlist/export-excel`, params }) }, - - getuporghiid: async (id: number,orgId:String) => { - return await request.get({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` }) - }, - // 超声保存修改 - examineupdatelist: async (data: PatientexamlistVO) => { + getuporghiid: async (id: number, orgId: String) => { + return await request.get({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` }) + }, + + // 超声保存修改 + examineupdatelist: async (data: PatientexamlistVO) => { return await request.put({ url: `/tblist/patientexamlist/examineupdate`, data }) }, // 超声审核 examine: async (id: String) => { - return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id }) - }, + return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id }) + }, - // dicom数据同步 - dicomDataSync: async () => { + // dicom数据同步 + dicomDataSync: async () => { return await request.get({ url: `/tblist/patientexamlist/dicomDataSync` }) }, + + // 分检数据刷新 + dicomDataRefresh: async () => { + return await request.get({ url: `/tblist/patientexamlist/dicomDataRefresh` }) + }, + + // 获取已检查全部的阴性阳性重大阳性统计 + WholeDiagFlagCount: async () => { + return await request.get({ url: `/tblist/patientexamlist/WholeDiagFlagCount` }) + }, + // 获取一周已检查全部的阴性阳性重大阳性统计 + GetDateYYZDYXCount: async () => { + return await request.get({ url: `/tblist/patientexamlist/GetDateYYZDYXCount` }) + }, + + // 收藏功能 + CollectAndCancellation: async (id: String, type: string) => { + return await request.get({ url: `/tblist/patientexamlist/CollectAndCancellation?id=${id}&&type=${type}` }) + }, + + ftppdf: async (data: inspdfscreenshotVO) => { + return await request.post({ url: `/tblist/patientexamlist/ftppdf`, data }) + }, + // 更新危急值标识 + Updatetblistwarning: async (id: String, type: string) => { + return await request.get({ url: `/tblist/patientexamlist/Updatetblistwarning?id=${id}&&type=${type}` }) + }, - // 分检数据刷新 - dicomDataRefresh: async () => { - return await request.get({ url: `/tblist/patientexamlist/dicomDataRefresh` }) - }, - - // 获取已检查全部的阴性阳性重大阳性统计 - WholeDiagFlagCount: async () => { - return await request.get({ url: `/tblist/patientexamlist/WholeDiagFlagCount`}) - }, - // 获取一周已检查全部的阴性阳性重大阳性统计 - GetDateYYZDYXCount: async () => { - return await request.get({ url: `/tblist/patientexamlist/GetDateYYZDYXCount`}) - }, - -// 收藏功能 -CollectAndCancellation: async (id: String,type:string) => { - return await request.get({ url: `/tblist/patientexamlist/CollectAndCancellation?id=${id}&&type=${type}`}) - }, - - ftppdf: async (data:inspdfscreenshotVO) => { - return await request.post({ url: `/tblist/patientexamlist/ftppdf`,data}) - }, } diff --git a/src/views/ECG/ECGForm.vue b/src/views/ECG/ECGForm.vue index 805ddc53..5b5e9eb6 100644 --- a/src/views/ECG/ECGForm.vue +++ b/src/views/ECG/ECGForm.vue @@ -64,7 +64,7 @@ 危急值 - 已上报 @@ -559,6 +559,7 @@ import ReportInfoECG from '@/views/applyregistration/reportPrintStatistics/Repor import htmlToPdf from '@/utils/htmlPdf' import ECGWarningDialog from '@/views/ECG/ECGWaring/ECGWarningDialog.vue' import ECGReport from '@/views/ECG/ECGWaring/ECGReport.vue' +import { WarningApi, WarningVO } from '@/api/system/warning' /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调 @@ -593,7 +594,7 @@ const imagebase64 = ref('') const isprintimage = ref(false) //是否生成打印文件base64 const ECGDialog = ref() //危急值消息弹窗 const isshowwjz = ref(false) -const isshowysb=ref(false) +const isshowysb = ref(false) const ECGReportDialog = ref() //危急值消息弹窗 // 树配置项 const treeDefaultProps = { @@ -636,9 +637,13 @@ const open = async (row: any) => { eltextrow.value = integer } }) - //判断是否显示危急值上报功能 条件是当前机构等于上级机构 - isshowwjz.value=Profilevo.value.orgId===row.highLevelOrgId?true:false - isshowysb.value=Profilevo.value.orgId===row.orgId?true:false + //查询当前患者的危急值相关信息 + const warningdata = await WarningApi.getexmidororgiddata(row.examId, row.orgId) + //判断是否显示危急值上报功能 条件是当前机构等于上级机构 + isshowwjz.value = Profilevo.value.orgId === row.highLevelOrgId ? true : false + if (warningdata.reportDate) { + isshowysb.value = Profilevo.value.orgId === row.orgId ? true : false + } } // 返回的列表的数据 diff --git a/src/views/ECG/ECGWaring/ECGReport.vue b/src/views/ECG/ECGWaring/ECGReport.vue index 597fb049..7ddc196b 100644 --- a/src/views/ECG/ECGWaring/ECGReport.vue +++ b/src/views/ECG/ECGWaring/ECGReport.vue @@ -1,10 +1,5 @@