部位信息显示异常修复

src/api/trials.js

@@ -1364,9 +1364,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`,
     method: 'get'
   })
 }

src/views/none-dicom-show/index.vue

@@ -100,7 +100,8 @@ export default {
     // 默认选择第一个文件
   },
   methods: {
-    async getBodyPart(bodyPart) {
+    getBodyPart(bodyPart) {
+      console.log(bodyPart)
       if (!bodyPart) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
@@ -114,12 +115,13 @@ export default {
       var newArr = arr.map(i => {
         return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
       })
+      console.log(newArr,this.bp)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => {
         this.studyList = res.Result
         this.loading = false
         const studyIndex = this.studyList.findIndex(item => {

src/views/none-dicom-show/multiple.vue

@@ -62,7 +62,7 @@ export default {
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId).then(res => {
+      getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => {
         this.noneDicomStudyList = res.Result
         this.loading = false
         const study = this.noneDicomStudyList.find((item, index) => {

src/views/trials/trials-panel/study/index.vue

@@ -406,8 +406,9 @@ export default {
       } else {
         // this.rowData = { ...row }
         // this.previewNonDicomVisible = true
+        let trialId = this.$route.query.trialId
         const routeData = this.$router.resolve({
-          path: `/showNoneDicoms?subjectVisitId=${row.SubjectVisitId}&studyId=${row.Id}&TokenKey=${this.tokenKey}`
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SubjectVisitId}&studyId=${row.Id}&TokenKey=${this.tokenKey}`
         })
         this.openWindow = window.open(routeData.href, '_blank')
       }
@@ -416,8 +417,9 @@ export default {
       if (this.openWindow) {
         this.openWindow.close()
       }
+      let trialId = this.$route.query.trialId
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${row.SubjectVisitId}&studyId=${row.Id}&TokenKey=${this.tokenKey}`
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SubjectVisitId}&studyId=${row.Id}&TokenKey=${this.tokenKey}`
       })
       this.openWindow = window.open(routeData.href, '_blank')
     },

src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue

@@ -884,17 +884,19 @@ export default {
     // 预览访视下所有的非DICOM文件
     handlePreviewAllVisitFiles() {
       // 预览所有检查下非Dicom文件
+      let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.subjectVisitId}&TokenKey=${token}`
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}`
       })
       window.open(routeData.href, '_blank')
     },
     handlePreviewAllFiles(row) {
       this.currentRow = { ...row }
+      let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.subjectVisitId}&studyId=${row.Id}&TokenKey=${token}`
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&studyId=${row.Id}&TokenKey=${token}`
       })
       window.open(routeData.href, '_blank')
     },

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -2193,9 +2193,10 @@ export default {
         this.open.close();
       }
       // this.previewAllNoneDicomVisible = true
+      let trialId = this.$route.query.trialId
       var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
       });
       this.open = window.open(routeData.href, "_blank");
     },
@@ -2204,9 +2205,10 @@ export default {
       if (this.open) {
         this.open.close();
       }
+      let trialId = this.$route.query.trialId
       var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}`,
       });
       this.open = window.open(routeData.href, "_blank");
     },