Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/blindResumeInfo/components/BasicInfo.vue

@@ -21,7 +21,7 @@
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Title')">
             <span v-if="isEnglish">
-              {{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
+              {{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
             </span>
             <span v-else>
               {{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }}

src/views/blindResumeInfo/components/ResearchPublication.vue

@@ -76,7 +76,15 @@ export default {
     researchInfo: {
       type: Object,
       default() {
-        return {}
+        return {
+          Research: null,
+          ResearchCN: null,
+          Grants: null,
+          GrantsCN: null,
+          Publications: null,
+          AwardsHonors: null,
+          AwardsHonorsCN: null
+        }
       }
     },
     isEnglish: {

src/views/blindResumeInfo/info.vue

@@ -90,6 +90,7 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
+      this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
     }
   },
   mounted() {
@@ -177,6 +178,7 @@ export default {
             if (res.Result) {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
+              !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
               this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
               this.htmlTitle = this.title
               this.initStatus()

src/views/dicom-show/dicom-study.vue

@@ -156,7 +156,7 @@ export default {
       showSeriesList: []
     }
   },
-  created: function() {
+  created() {
     this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''
 
     this.visitNum = this.$router.currentRoute.query.visitNum ? parseInt(this.$router.currentRoute.query.visitNum) : 0
@@ -176,6 +176,28 @@ export default {
       this.loadStudy()
     } else if (this.type === 'Share') {
       this.loadStudy()
+    try {
+      this.type = this.$route.query.type ? this.$route.query.type : ''
+      this.visitNum = this.$router.currentRoute.query.visitNum ? parseInt(this.$router.currentRoute.query.visitNum) : 0
+      cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
+      // cornerstone.events.addEventListener('datasetscachechanged', this.datasetsCacheChanged)
+      if (this.$router.currentRoute.query.TokenKey) {
+        store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
+        changeURLStatic('TokenKey', '')
+      }
+      this.studyId = this.$router.currentRoute.query.studyId
+      if (this.type === 'Series') {
+        // this.initStudy()
+        this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+        this.initSeries()
+      } else if (this.type === 'Study') {
+        this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
+        this.loadStudy()
+      } else if (this.type === 'Share') {
+        this.loadStudy()
+      }
+    } catch (e) {
+      console.log(e)
     }
   },
   beforeDestroy() {
@@ -248,55 +270,59 @@ export default {
       })
     },
     initSeries() {
-      var scope = this
+      try {
-      this.studyCode = this.$router.currentRoute.query.studyCode
+        console.log(0)
-      this.modality = this.$router.currentRoute.query.modality
+        var scope = this
-      this.seriesCount = 1
+        this.studyCode = this.$router.currentRoute.query.studyCode
-      this.description = this.$router.currentRoute.query.description
+        this.modality = this.$router.currentRoute.query.modality
-      var seriesId = this.$router.currentRoute.query.seriesId
+        this.seriesCount = 1
-      var seriesNumber = this.$router.currentRoute.query.seriesNumber
+        this.description = this.$router.currentRoute.query.description
-      var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
+        var seriesId = this.$router.currentRoute.query.seriesId
-      var studyId = this.$router.currentRoute.query.studyId
+        var seriesNumber = this.$router.currentRoute.query.seriesNumber
-      var trialId = this.$router.currentRoute.query.trialId
+        var subjectVisitId = this.$router.currentRoute.query.subjectVisitId
-      getInstanceList(seriesId).then(res => {
+        var studyId = this.$router.currentRoute.query.studyId
-        if (!res.Result || (res.Result && res.Result.length === 0)) return
+        var trialId = this.$router.currentRoute.query.trialId
-        var seriesInstanceUid = res.Result[0].SeriesInstanceUid
+        console.log(1)
-        var sliceLocation = res.Result[0].SliceLocation
+        getInstanceList(seriesId).then(res => {
-        var isReading = res.Result[0].IsReading
+          if (!res.Result || (res.Result && res.Result.length === 0)) return
-        var isDeleted = res.Result[0].IsDeleted
+          var seriesInstanceUid = res.Result[0].SeriesInstanceUid
-        var seriesList = []
+          var sliceLocation = res.Result[0].SliceLocation
-        var imageIds = []
+          var isReading = res.Result[0].IsReading
-        res.Result.forEach(instance => {
+          var isDeleted = res.Result[0].IsDeleted
-          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`)
+          var seriesList = []
-        })
+          var imageIds = []
-        seriesList.push({
+          res.Result.forEach(instance => {
-          trialId,
+            imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instance.Path}`)
-          subjectVisitId,
-          studyId,
-          imageIds: imageIds,
-          seriesId: seriesId,
-          seriesUid: seriesInstanceUid,
-          seriesNumber: seriesNumber,
-          sliceThickness: sliceLocation,
-          modality: this.modality,
-          description: this.description,
-          isReading,
-          isDeleted,
-          previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
-          instanceCount: res.Result.length,
-          prefetchInstanceCount: 0,
-          loadStatus: false,
-          imageloadedArr: []
-        })
-        this.seriesList = seriesList
-        if (this.seriesList.length > 0) {
-          this.$nextTick(() => {
-            this.loadAllImages()
-            this.$refs.dicomViewer.loadImageStack(this.seriesList[0])
-            this.firstInstanceId = this.seriesList[0].imageIds[0]
           })
-        }
+          seriesList.push({
-      })
+            trialId,
+            subjectVisitId,
+            studyId,
+            imageIds: imageIds,
+            seriesId: seriesId,
+            seriesUid: seriesInstanceUid,
+            seriesNumber: seriesNumber,
+            sliceThickness: sliceLocation,
+            modality: this.modality,
+            description: this.description,
+            isReading,
+            isDeleted,
+            previewImageUrl: res.OtherInfo.ImageResizePath ? scope.OSSclientConfig.basePath + res.OtherInfo.ImageResizePath : res.OtherInfo.ImageResizePath,
+            instanceCount: res.Result.length,
+            prefetchInstanceCount: 0,
+            loadStatus: false,
+            imageloadedArr: []
+          })
+          this.seriesList = seriesList
+          if (this.seriesList.length > 0) {
+            this.$nextTick(() => {
+              this.loadAllImages()
+              this.$refs.dicomViewer.loadImageStack(this.seriesList[0])
+              this.firstInstanceId = this.seriesList[0].imageIds[0]
+            })
+          }
+        })
+      } catch (e) {console.log(e)}
     },
     showSeriesImage(e, seriesIndex, series) {
       // if (seriesIndex === this.currentSeriesIndex) return

src/views/resumeInfo/components/BasicInfo.vue

@@ -34,7 +34,7 @@
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Title')">
             <span v-if="isEnglish">
-              {{ (Array.isArray(basicInfo.Title)&& basicInfo.Title.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
+              {{ (Array.isArray(basicInfo.TitleList)&& basicInfo.TitleList.length > 0) ? basicInfo.TitleList.join(', ') : '' }}
             </span>
             <span v-else>
               {{ (Array.isArray(basicInfo.TitleCNList)&& basicInfo.TitleCNList.length > 0) ? basicInfo.TitleCNList.join(', ') : '' }}

src/views/resumeInfo/components/ResearchPublication.vue

@@ -70,7 +70,15 @@ export default {
     researchInfo: {
       type: Object,
       default() {
-        return {}
+        return {
+          Research: null,
+          ResearchCN: null,
+          Grants: null,
+          GrantsCN: null,
+          Publications: null,
+          AwardsHonors: null,
+          AwardsHonorsCN: null
+        }
       }
     },
     isEnglish: {

src/views/resumeInfo/index.vue

@@ -30,7 +30,6 @@
         </el-collapse-item>
         <el-collapse-item :title="$t('resumeInfo:title:Research&Publication')" name="5">
           <research-publication :research-info="doctorInfo.ResearchPublicationView" :is-english="isEnglish" />
-
         </el-collapse-item>
         <el-collapse-item :title="$t('resumeInfo:title:TrialExperience')" name="6">
           <trial-experience v-if="doctorInfo.TrialExperienceView" :trial-experience="doctorInfo.TrialExperienceView" :is-english="isEnglish" />
@@ -103,6 +102,7 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
+      this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
     }
   },
   mounted() {
@@ -191,6 +191,7 @@ export default {
             if (res.Result) {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
+              !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
               this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
               this.htmlTitle = this.title
               this.initStatus()

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

@@ -1592,14 +1592,18 @@ export default {
     },
     // 预览某个序列
     handlePreviewInstance(row) {
-      if (this.open) {
+      try {
-        this.open.close()
+        if (this.open) {
+          this.open.close()
+        }
+        var token = getToken()
+        const routeData = this.$router.resolve({
+          path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId}&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${row.Id}&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1}&subjectVisitId=${this.data.Id}&type=Series&TokenKey=${token}&description=${row.Description}`
+        })
+        this.open = window.open(routeData.href, '_blank')
+      } catch (e) {
+        console.log(e)
       }
-      var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId}&studyCode=${row.StudyCode}&modality=${row.Modality}&description=${row.Description}&seriesId=${row.Id}&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1}&subjectVisitId=${this.data.Id}&TokenKey=${token}&type=Series`
-      })
-      this.open = window.open(routeData.href, '_blank')
     },
     // 预览所有检查下非Dicom文件
     handleViewAllNoneDicoms() {