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

src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue

@@ -5,6 +5,9 @@
         {{ taskInfo.SubjectCode }}
       </div>
       <div :title="visitTaskInfo.TaskBlindName">
+        <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+          {{ $t('trials:reading:title:taskName') }}
+        </span>
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue

@@ -3,10 +3,15 @@
     <div class="container">
       <div class="basic-info">
         <h3>
-          <span v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && visitInfo.SubjectCode">
+          <span v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && visitInfo.SubjectCode" style="margin-right:5px;">
             {{ visitInfo.SubjectCode }} 
           </span>
-          <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
+          <span>
+            <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+              {{ $t('trials:reading:title:taskName') }}
+            </span>
+            {{ visitInfo.TaskBlindName }}
+          </span>
         </h3>
         <div v-if="readingTaskState < 2">
           <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"

src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue

@@ -171,6 +171,21 @@ export default {
     document.addEventListener("click", this.foo);
   },
   methods: {
+    setDefaultRelatedStudyInfo(visitTaskInfo) {
+      if (!visitTaskInfo) return
+      const studyList = visitTaskInfo.StudyList || []
+      if (studyList.length === 0) return
+      const firstStudy = studyList[0]
+      const fileList = firstStudy.NoneDicomStudyFileList || []
+      if (fileList.length === 0) return
+      this.relatedStudyInfo = {
+        fileInfo: fileList[0],
+        visitTaskInfo,
+        fileList,
+        fileIndex: 0,
+        studyId: firstStudy.Id
+      }
+    },
     handleReadingChart(row) {
       let { e, data } = row
       let obj = Object.assign({}, data)
@@ -272,6 +287,9 @@ export default {
         const idx = res.Result.findIndex(i => i.IsCurrentTask)
         if (idx > -1) {
           await this.setActiveTaskVisitId(res.Result[idx].VisitTaskId)
+          if (this.taskInfo.IsReadingTaskViewInOrder === 0) {
+            this.setDefaultRelatedStudyInfo(this.visitTaskList[idx])
+          }
           this.$nextTick(() => {
             this.$refs[res.Result[idx].VisitTaskId][0].setInitActiveFile()
           })
@@ -282,23 +300,15 @@ export default {
           if (i > -1) {
             await this.getReadingImageFile(res.Result[i].VisitTaskId, i)
             await this.getAnnotations(res.Result[i].VisitTaskId, i)
-            const studyList = this.visitTaskList[i].StudyList
+            this.setDefaultRelatedStudyInfo(this.visitTaskList[i])
-            if (studyList.length > 0) {
+            if (!this.selectArr.includes(res.Result[i].VisitTaskId)) {
-              const fileInfo = studyList[0].NoneDicomStudyFileList[0]
+              this.selectArr.push(res.Result[i].VisitTaskId)
-              this.relatedStudyInfo = { fileInfo, visitTaskInfo: this.visitTaskList[i], fileList: studyList[0].NoneDicomStudyFileList, fileIndex: 0, studyId: studyList[0].Id }
-              if (!this.selectArr.includes(res.Result[i].VisitTaskId)) {
-                this.selectArr.push(res.Result[i].VisitTaskId)
-              }
             }
           }
         }
         if (this.taskInfo.IsReadingTaskViewInOrder === 2) {
           // 受试者内随机
-          const studyList = this.visitTaskList[idx].StudyList
+          this.setDefaultRelatedStudyInfo(this.visitTaskList[idx])
-          if (studyList.length > 0) {
-            const fileInfo = studyList[0].NoneDicomStudyFileList[0]
-            this.relatedStudyInfo = { fileInfo, visitTaskInfo: this.visitTaskList[idx], fileList: studyList[0].NoneDicomStudyFileList, fileIndex: 0, studyId: studyList[0].Id }
-          }
         }
         if (this.readingTaskState < 2) {
           this.$refs[res.Result[idx].VisitTaskId][0].initCurrentMaredFiles()

src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue

@@ -5,6 +5,9 @@
         {{ taskInfo.SubjectCode }}
       </div>
       <div :title="visitTaskInfo.TaskBlindName">
+        <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+          {{ $t('trials:reading:title:taskName') }}
+        </span>
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>
@@ -152,6 +155,9 @@ export default {
     },
     // 设置初始化激活文件
     setInitActiveFile() {
+      if (this.studyList.length === 0) {
+        this.studyList = this.decorateStudyList(this.visitTaskInfo.StudyList || [])
+      }
       if (this.studyList.length === 0) return
       this.$nextTick(() => {
         this.activeStudy(this.studyList[0].Id)