Merge branch 'master' of http://114.55.171.231:3000/lxd/FlowVue

src/api/tblist/patientexamlist/index.ts

@@ -110,18 +110,21 @@ export const PatientexamlistApi = {
   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}` })
   },
-
+  generatePdf_ct: async (data: any) => {
+    return await request.post({ url: `/tblist/patientexamlist/generatePdf_ct`, data })
+  },
+  generatePdf_us: async (data: any) => {
+    return await request.post({ url: `/tblist/patientexamlist/generatePdf_us`, data })
+  },
   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}` })
-  },
-  
+  }
 }

src/views/dicomForm/dicomViewForm.vue

@@ -317,7 +317,13 @@
     <div id="hiddenPdfDiv" v-if="showPdfContent">
       <PdfContent
         v-bind="{ ...infoParams, showQRcode: false }"
-        style="border-width: 1; height: 400mm; width: 300mm; page-break-after: always;font-size: 20px;"
+        style="
+          border-width: 1;
+          height: 400mm;
+          width: 300mm;
+          page-break-after: always;
+          font-size: 20px;
+        "
       />
     </div>
   </div>
@@ -472,6 +478,29 @@ const exportPdfCTToBase64 = async () => {
   infoParams.value.extraInfo = orgInfo.value
   //infoParams.value.reviewDate=applyFormVO.value.reviewDate.toString()
 
+  calculateAge(applyFormVO.value.birthday) //刷新年龄
+  let orgInfoTemp = await ReportPrintStatisticsApi.getOrg(infoParams.value.orgId.trim())
+  await PatientexamlistApi.generatePdf_ct({
+    model: '0',
+    folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
+    id: ID.toString(),
+    regid: infoParams.value.regId,
+    examid: infoParams.value.examId,
+    name: infoParams.value.pname,
+    gender: infoParams.value.gender,
+    age: age.value + '岁',
+    deviceName: infoParams.value.deviceName,
+    Department: infoParams.value.billDoctorDepartment,
+    examItemName: infoParams.value.examItemName,
+    examDescription: infoParams.value.examDescription,
+    diagResults: infoParams.value.diagResults,
+    hsname: orgInfoTemp.orgName,
+    diagDoctor: infoParams.value.diagDoctor,
+    diagDate: infoParams.value.diagDate,
+    reviewDoctor: infoParams.value.reviewDoctor,
+    reviewDate: infoParams.value.reviewDate
+  })
+  if (false) {
     showPdfContent.value = true
     nextTick(() => {
       setTimeout(async () => {
@@ -482,7 +511,7 @@ const exportPdfCTToBase64 = async () => {
             id: ID.toString(),
             imagebase: pdfBase64String,
             model: '0',
-          folderPath: await ConfigApi.getConfigKey('url.ftpimage') + '\\' + ID.toString()
+            folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString()
           })
         } finally {
           showPdfContent.value = false
@@ -490,6 +519,7 @@ const exportPdfCTToBase64 = async () => {
       }, 1000)
     })
   }
+}
 
 const infoParams = ref({
   id: '',
@@ -604,7 +634,11 @@ const handleselectchange = async () => {
   if (fordevicemValue.value) {
     //选择模版后 刷新接口
     //通用
-    const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '')
+    const dd = await ultrasoniccomApi.getreporttemplatelist(
+      Profilevo.value.orgId,
+      String(fordevicemValue.value),
+      ''
+    )
     treeData.value = dd
 
     const pridate = await ultrasoniccomApi.getreporttemplatelist(
@@ -652,7 +686,11 @@ const open = async (id: number, orgid: string, regid: string, examId: string, is
   formLoading.value = true
   try {
     //通用
-    const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, 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)

src/views/ultrasoniccom/ultrasonicForm.vue

@@ -494,7 +494,13 @@
     <div id="hiddenUSPdfDiv" v-if="showPdfContent">
       <PdfContent
         v-bind="{ ...infoParams, showQRcode: false }"
-        style="border-width: 1; height: 400mm; width: 300mm; page-break-after: always;font-size: 20px;"
+        style="
+          border-width: 1;
+          height: 400mm;
+          width: 300mm;
+          page-break-after: always;
+          font-size: 20px;
+        "
       />
     </div>
   </div>
@@ -620,6 +626,57 @@ const exportPdfUSToBase64 = async () => {
   //infoParams.value.reviewDate=applyFormVO.value.reviewDate.toString()
   //D:\\FLYPACS\\ftp
 
+  calculateAge(applyFormVO.value.birthday) //刷新年龄
+  let orgInfoTemp = await ReportPrintStatisticsApi.getOrg(infoParams.value.orgId.trim())
+  let image1 = ''
+  let image2 = ''
+  let image3 = ''
+  const imageslist = await ultrasoniccomApi.getimageslist(
+    infoParams.value.orgId,
+    infoParams.value.regId,
+    '1'
+  )
+  if (imageslist && Array.isArray(imageslist)) {
+    if (imageslist[0] && imageslist[0].imgUrl) {
+      image1 = imageslist[0].imgUrl.trim()
+      if (image1.indexOf('http') != 0 && image1.indexOf('/') == 0)
+        image1 = window.location.origin + image1
+    }
+    if (imageslist[1] && imageslist[1].imgUrl) {
+      image2 = imageslist[1].imgUrl.trim()
+      if (image2.indexOf('http') != 0 && image2.indexOf('/') == 0)
+        image2 = window.location.origin + image2
+    }
+    if (imageslist[2] && imageslist[2].imgUrl) {
+      image3 = imageslist[2].imgUrl.trim()
+      if (image3.indexOf('http') != 0 && image3.indexOf('/') == 0)
+        image3 = window.location.origin + image3
+    }
+  }
+  await PatientexamlistApi.generatePdf_us({
+    model: '0',
+    folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString(),
+    id: ID.toString(),
+    regid: infoParams.value.regId,
+    examid: infoParams.value.examId,
+    name: infoParams.value.pname,
+    gender: infoParams.value.gender,
+    age: age.value + '岁',
+    deviceName: infoParams.value.deviceName,
+    Department: infoParams.value.billDoctorDepartment,
+    examItemName: infoParams.value.examItemName,
+    examDescription: infoParams.value.examDescription,
+    diagResults: infoParams.value.diagResults,
+    hsname: orgInfoTemp.orgName,
+    diagDoctor: infoParams.value.diagDoctor,
+    diagDate: infoParams.value.diagDate,
+    reviewDoctor: infoParams.value.reviewDoctor,
+    reviewDate: infoParams.value.reviewDate,
+    image1: image1,
+    image2: image2,
+    image3: image3
+  })
+  if (false) {
     showPdfContent.value = true
     nextTick(() => {
       setTimeout(async () => {
@@ -630,7 +687,7 @@ const exportPdfUSToBase64 = async () => {
             id: ID.toString(),
             imagebase: pdfBase64String,
             model: '0',
-          folderPath: await ConfigApi.getConfigKey('url.ftpimage') + '\\' + ID.toString()
+            folderPath: (await ConfigApi.getConfigKey('url.ftpimage')) + '\\' + ID.toString()
           })
         } finally {
           showPdfContent.value = false
@@ -638,6 +695,7 @@ const exportPdfUSToBase64 = async () => {
       }, 1000)
     })
   }
+}
 
 const infoParams = ref({
   id: '',
@@ -1025,7 +1083,11 @@ const handleselectchange = async () => {
   if (fordevicemValue.value) {
     //选择模版后 刷新接口
     //通用
-    const dd = await ultrasoniccomApi.getreporttemplatelist(Profilevo.value.orgId, String(fordevicemValue.value), '')
+    const dd = await ultrasoniccomApi.getreporttemplatelist(
+      Profilevo.value.orgId,
+      String(fordevicemValue.value),
+      ''
+    )
     treeData.value = dd
 
     const pridate = await ultrasoniccomApi.getreporttemplatelist(