修改超声影像功能以及增加配置项

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
 }

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<any[]>([])
@@ -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'
     )

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
 }
 

src/views/system/doctor/Form.vue

@@ -30,11 +30,11 @@
       <el-form-item label="所属科室" prop="departmentName">
         <el-select v-model="formData.departmentName" placeholder="请选择科室">
           <el-option
-              v-for="item in fordepartementData"
-              :key="item.id"
-              :label="item.departmentName"
-              :value="item.departmentName"
-            />
+            v-for="item in fordepartementData"
+            :key="item.id"
+            :label="item.departmentName"
+            :value="item.departmentName"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="医生联系电话" prop="doctorTel">
@@ -75,17 +75,23 @@
         </el-select>
       </el-form-item>
       <el-form-item label="机构名称" prop="orgId">
-        <el-select
-          v-model="formData.orgId"
-          placeholder="请选择机构"
-          clearable
-        >
-        <el-option v-for="item in fororglistData" :key="item.orgID" :label="item.orgName" :value="item.orgID" />
+        <el-select v-model="formData.orgId" placeholder="请选择机构" clearable>
+          <el-option
+            v-for="item in fororglistData"
+            :key="item.orgID"
+            :label="item.orgName"
+            :value="item.orgID"
+          />
         </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="submitForm"  :disabled="formLoading" style="background-color: rgb(56, 119, 246); font-size: 14; color: rgb(255, 255, 255)">确 定</el-button>
+      <el-button
+        @click="submitForm"
+        :disabled="formLoading"
+        style="background-color: rgb(56, 119, 246); font-size: 14; color: rgb(255, 255, 255)"
+        >确 定</el-button
+      >
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
   </Dialog>
@@ -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)
 

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<any[]>([])
@@ -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'
     )

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('请刷新右侧图片')
 }