diff --git a/src/views/ECG/ECGForm.vue b/src/views/ECG/ECGForm.vue index a18e29b8..070001e5 100644 --- a/src/views/ECG/ECGForm.vue +++ b/src/views/ECG/ECGForm.vue @@ -823,7 +823,7 @@ const handleTreeNodeClick = async (data) => { //诊断模版 async function zdmodle() { - const dd = await ultrasoniccomApi.getreporttemplatelist('', '', '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '') treeData.value = dd drawer.value = drawer.value ? false : true } diff --git a/src/views/dicomForm/dicomViewForm.vue b/src/views/dicomForm/dicomViewForm.vue index de6bdaa9..b3b28d8c 100644 --- a/src/views/dicomForm/dicomViewForm.vue +++ b/src/views/dicomForm/dicomViewForm.vue @@ -337,6 +337,7 @@ import htmlToPdf from '@/utils/htmlPdf' import { formatDate } from '@/utils/formatTime' import { object } from 'vue-types' import { ReportPrintStatisticsApi } from '@/api/applyregistration/reportPrintStatistics' +import * as ConfigApi from '@/api/infra/config'//李晓东 /** dicom */ defineOptions({ name: 'DicomViewForm' }) const showPdfContent = ref(false) //控制CT 组件 是否显示 @@ -481,7 +482,7 @@ const exportPdfCTToBase64 = async () => { id: ID.toString(), imagebase: pdfBase64String, model: '0', - folderPath: 'D:\\FLYPACS\\ftp' + '\\' + ID.toString() + folderPath: await ConfigApi.getConfigKey('url.ftpimage') + '\\' + ID.toString() }) } finally { showPdfContent.value = false @@ -547,10 +548,10 @@ const fordevicemValue = ref('') const selectclear = async () => { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', '', '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '') treeData.value = dd - const pridate = await ultrasoniccomApi.getreporttemplatelist('', '', '1') + const pridate = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '1') privateData.value = pridate } const fordevicemData = ref([]) @@ -603,7 +604,7 @@ const handleselectchange = async () => { if (fordevicemValue.value) { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '') treeData.value = dd const pridate = await ultrasoniccomApi.getreporttemplatelist( @@ -651,13 +652,13 @@ const open = async (id: number, orgid: string, regid: string, examId: string, is formLoading.value = true try { //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '') treeData.value = dd console.log('返回值1' + dd) console.log('返回值2' + treeData.value) //私有 const pridate = await ultrasoniccomApi.getreporttemplatelist( - '', + Profilevo.value.orgId, String(fordevicemValue.value), '1' ) diff --git a/src/views/dicomPathologyForm/dicomPathologyViewForm.vue b/src/views/dicomPathologyForm/dicomPathologyViewForm.vue index 73be9bc3..1880de8f 100644 --- a/src/views/dicomPathologyForm/dicomPathologyViewForm.vue +++ b/src/views/dicomPathologyForm/dicomPathologyViewForm.vue @@ -790,13 +790,13 @@ const open = async (id: number, orgid: string, regid: string, examId: string, is formLoading.value = true try { //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '') treeData.value = dd console.log('返回值1' + dd) console.log('返回值2' + treeData.value) //私有 const pridate = await ultrasoniccomApi.getreporttemplatelist( - '', + Profilevo.value.orgId, String(fordevicemValue.value), '1' ) @@ -895,11 +895,11 @@ const handleselectchange = async () => { if (fordevicemValue.value) { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '') treeData.value = dd const pridate = await ultrasoniccomApi.getreporttemplatelist( - '', + Profilevo.value.orgId, String(fordevicemValue.value), '1' ) @@ -910,10 +910,10 @@ const handleselectchange = async () => { const selectclear = async () => { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', '', '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '') treeData.value = dd - const pridate = await ultrasoniccomApi.getreporttemplatelist('', '', '1') + const pridate = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '1') privateData.value = pridate } diff --git a/src/views/system/doctor/Form.vue b/src/views/system/doctor/Form.vue index 642f14bc..9c8bd2a0 100644 --- a/src/views/system/doctor/Form.vue +++ b/src/views/system/doctor/Form.vue @@ -30,11 +30,11 @@ + v-for="item in fordepartementData" + :key="item.id" + :label="item.departmentName" + :value="item.departmentName" + /> @@ -75,17 +75,23 @@ - - + + @@ -143,9 +149,9 @@ const open = async (type: string, id?: number) => { formType.value = type resetForm() // 获取机构字典数据 - fororglistData.value=await OrgApi.getOrglist() - //科室字典 - fordepartementData.value = await DepartmentApi.getDepartmentList() + fororglistData.value = await OrgApi.getOrglist() + //科室字典 + fordepartementData.value = await DepartmentApi.getDepartmentList() // 修改时,设置数据 if (id) { formLoading.value = true @@ -168,9 +174,12 @@ const submitForm = async () => { try { const data = formData.value as unknown as VO if (formType.value === 'create') { - await Api.create(data) - - message.success(t('common.createSuccess')) + const redata = await Api.create(data) + if (redata === '医生编号已存在') { + message.alertError('医生编号已存在') + } else { + message.success(t('common.createSuccess')) + } } else { await Api.update(data) diff --git a/src/views/ultrasoniccom/ultrasonicForm.vue b/src/views/ultrasoniccom/ultrasonicForm.vue index 78e8bb9b..8c56fe78 100644 --- a/src/views/ultrasoniccom/ultrasonicForm.vue +++ b/src/views/ultrasoniccom/ultrasonicForm.vue @@ -516,7 +516,7 @@ import videoForm from './videoForm.vue' import { ReportPrintStatisticsApi } from '@/api/applyregistration/reportPrintStatistics' import { formatDate } from '@/utils/formatTime' import PdfContent from '@/views/applyregistration/reportPrintStatistics/ReportInfoUS.vue' // 引入你的PDF内容组件 - +import * as ConfigApi from '@/api/infra/config'//李晓东 /** 超声组件 */ defineOptions({ name: 'Ultrasonic' }) @@ -618,7 +618,8 @@ const exportPdfUSToBase64 = async () => { } infoParams.value.extraInfo= orgInfo.value //infoParams.value.reviewDate=applyFormVO.value.reviewDate.toString() - + //D:\\FLYPACS\\ftp + showPdfContent.value = true nextTick(() => { setTimeout(async () => { @@ -629,7 +630,7 @@ const exportPdfUSToBase64 = async () => { id: ID.toString(), imagebase: pdfBase64String, model: '0', - folderPath: 'D:\\FLYPACS\\ftp' + '\\' + ID.toString() + folderPath: await ConfigApi.getConfigKey('url.ftpimage') + '\\' + ID.toString() }) } finally { showPdfContent.value = false @@ -971,10 +972,10 @@ const fordevicemValue = ref('') const selectclear = async () => { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', '', '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '') treeData.value = dd - const pridate = await ultrasoniccomApi.getreporttemplatelist('', '', '1') + const pridate = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, '', '1') privateData.value = pridate } const fordevicemData = ref([]) @@ -1024,11 +1025,11 @@ const handleselectchange = async () => { if (fordevicemValue.value) { //选择模版后 刷新接口 //通用 - const dd = await ultrasoniccomApi.getreporttemplatelist('', String(fordevicemValue.value), '') + const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '') treeData.value = dd const pridate = await ultrasoniccomApi.getreporttemplatelist( - '', + Profilevo.value.orgId, String(fordevicemValue.value), '1' ) @@ -1060,7 +1061,7 @@ const open = async (id: number, orgid: string, regid: string) => { try { //通用 const dd = await ultrasoniccomApi.getreporttemplatelist( - orgid, + Profilevo.value.orgId, String(fordevicemValue.value), '' ) @@ -1069,7 +1070,7 @@ const open = async (id: number, orgid: string, regid: string) => { console.log('返回值2' + treeData.value) //私有 const pridate = await ultrasoniccomApi.getreporttemplatelist( - '', + Profilevo.value.orgId, String(fordevicemValue.value), '1' ) diff --git a/src/views/ultrasoniccom/videoForm.vue b/src/views/ultrasoniccom/videoForm.vue index 2128098b..9620b2fd 100644 --- a/src/views/ultrasoniccom/videoForm.vue +++ b/src/views/ultrasoniccom/videoForm.vue @@ -32,6 +32,7 @@ import { ref } from 'vue' import { ultrasoniccomApi, insimagescreenshotVO } from '@/api/ultrasoniccom' import html2canvas from 'html2canvas'; +import * as ConfigApi from '@/api/infra/config'//李晓东 const message = useMessage() // 消息弹窗 const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 @@ -108,9 +109,10 @@ const capture = () => { // 下载图片 // downloadImage(imageDataUrl); } -// 保存截图 +// 保存截图 C:\\work\\pacs D:\\FLYPACS\\ftp const saveimage = async (imageDataUrl) => { - await ultrasoniccomApi.ftpimage({ id: id.value, imagebase: imageDataUrl,model:"0",folderPath:"D:\\FLYPACS\\ftp"+"\\"+id.value }) + const config= await ConfigApi.getConfigKey('url.ftpimage') + await ultrasoniccomApi.ftpimage({ id: id.value, imagebase: imageDataUrl,model:"0",folderPath:config+"\\"+id.value }) message.notifySuccess('请刷新右侧图片') }