1

src/api/reading.js

@@ -75,10 +75,11 @@ export function getRelationVisitList(visitNum, tpCode) {
     method: 'get'
   })
 }
-export function getAllRelationStudyList(studyId) {
+export function getAllRelationStudyList(studyId, params) {
   return request({
     url: `/study/getAllRelationStudyList/${studyId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getTrialListByReviewer(param) {
@@ -134,7 +135,7 @@ export function AddAdjudicationReport(param) {
 }
 
 export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) {
-  let url =  `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
+  let url = `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
   url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url
   return request({
     url: url,

src/components/Dicom/DicomCanvas.vue

@@ -123,7 +123,7 @@ export default {
   components: { DicomTags },
   computed: {
     NSTip() {
-      return `${this.$store.state.trials.uploadSize},NS: ${this.$store.state.trials.uploadTip}`
+      return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
     }
   },
   data() {

src/components/downloadDicomAndNonedicom/index.vue

@@ -24,7 +24,7 @@
     </div>
     <!--上传列表@selection-change="handleSelectionChange"-->
     <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
-      class="dicomFiles-table" @sort-change="handleSortByColumn"
+      class="dicomFiles-table" 
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
@@ -37,10 +37,10 @@
         show-overflow-tooltip />
       <!--任务名称-->
       <el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
-        sortable="custom" />
+        sortable />
       <!--检查类型-->
       <el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
-        sortable="custom">
+        sortable>
         <template slot-scope="scope">
           <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
         </template>

src/store/modules/reading.js

@@ -1076,7 +1076,7 @@ const actions = {
       let file = series.instanceInfoList.find(item => item.ImageId === obj.imageId)
       if (file) {
         getNetWorkSpeed()
-        setNetWorkSpeedSizeAll(obj.percentComplete, file.FileSize, obj.imageId)
+        setNetWorkSpeedSizeAll(obj.percentComplete, obj.FileTotal, obj.imageId)
       }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100

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

@@ -861,7 +861,7 @@ export default {
         let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
         if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) {
           getNetWorkSpeed()
-          setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+          setNetWorkSpeedSize(percentComplete,  e.detail.total, imageId)
         }
         if (prefetchInstanceCount >= instanceCount * 100) {
           this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100

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

@@ -152,92 +152,106 @@
               <el-tab-pane v-show="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study"
                 class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
-                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
-                    <el-collapse-item v-for="(study, studyIndex) in relationStudyList" :key="`${study.StudyId}`"
-                      :name="`${study.StudyId}`">
-                      <template slot="title">
 
-                        <div class="text-desc">
-                          {{ study.StudyCode }}
+                  <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
+                    <template v-for="item in relationStudyListByVisitName">
+                      <div :key="`${item.VisitName}`">
+                        <div v-show="item.VisitName" class="text-desc" style="background-color: #1f1f1f;">
+                          {{ item.VisitName }}
                         </div>
-                        <!-- <div v-show="study.Description" class="text-desc">
+                        <template v-for="(study, studyIndex) in relationStudyList">
+                          <el-collapse-item :key="`${study.StudyId}`" :name="`${study.StudyId}`"
+                            v-if="study.VisitName === item.VisitName">
+                            <template slot="title">
+
+                              <div class="text-desc">
+                                {{ study.StudyCode }}
+                              </div>
+                              <!-- <div v-show="study.Description" class="text-desc">
                           {{ study.Description }}
                         </div> -->
 
-                        <div v-show="study.SeriesCount" class="text-desc">
-                          {{ study.Modalities }} : {{ study.SeriesCount }} Series
-                        </div>
-                      </template>
-                      <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
-                        {{ study.Description }}
-                      </div>
-                      <div class="viewerSidethumbs ps" style="position: relative;">
-                        <div class="viewerSidethumbinner">
-                          <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
-                            <div class="viewernavigatorwrapper" style="position: relative;border:1px solid #434343;"
-                              series-type="relation"
-                              @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
-                              <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
-                                alt="" style="width: 85px;height:85px;" fit="fill">
-
-                              <div class="viewernavitextwrapper">
-                                <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
-                                  <div v-if="seriesItem.keySeries" style="color:red">
-                                    Key Images
-                                  </div>
-                                  <div v-else>#{{ seriesItem.seriesNumber }}</div>
-                                  <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
-                                    <el-popover placement="right-start" trigger="click"
-                                      popper-class="instance_frame_wrapper">
-                                      <div class="frame_list">
-                                        <div v-for="(instance, idx) in seriesItem.instanceInfoList" :key="instance.Id"
-                                          class="frame_content"
-                                          :style="{ 'margin-bottom': idx < seriesItem.instanceInfoList.length - 1 ? '5px' : '0px' }"
-                                          @click="showMultiFrames(studyIndex, seriesItem, index, instance)">
-                                          <div>
-                                            <div>{{ instance.InstanceNumber }}</div>
-                                            <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame`
-                                            }}</div>
-                                          </div>
-
-                                        </div>
-                                      </div>
-                                      <i slot="reference" class="el-icon-connection"
-                                        style="font-size: 15px;cursor: pointer;" />
-                                    </el-popover>
-                                  </div>
-
-                                </div>
-                                <div v-show="seriesItem.instanceCount" style="padding: 1px;">
-                                  {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
-                                </div>
-                                <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
-                                  T: {{ seriesItem.sliceThickness }}
-                                </div>
-                                <el-tooltip v-show="seriesItem.description" class="item" effect="dark"
-                                  :content="seriesItem.description" placement="bottom">
-                                  <div v-show="seriesItem.description"
-                                    style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
-                                    {{ seriesItem.description }}
-                                  </div>
-                                </el-tooltip>
+                              <div v-show="study.SeriesCount" class="text-desc">
+                                {{ study.Modalities }} : {{ study.SeriesCount }} Series
                               </div>
+                            </template>
+                            <div v-show="study.Description" class="text-desc" style="background-color: #1f1f1f;">
+                              {{ study.Description }}
                             </div>
-                            <!-- <el-image
+                            <div class="viewerSidethumbs ps" style="position: relative;">
+                              <div class="viewerSidethumbinner">
+                                <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
+                                  <div class="viewernavigatorwrapper"
+                                    style="position: relative;border:1px solid #434343;" series-type="relation"
+                                    @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
+                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
+                                      alt="" style="width: 85px;height:85px;" fit="fill">
+
+                                    <div class="viewernavitextwrapper">
+                                      <div
+                                        style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                        <div v-if="seriesItem.keySeries" style="color:red">
+                                          Key Images
+                                        </div>
+                                        <div v-else>#{{ seriesItem.seriesNumber }}</div>
+                                        <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
+                                          <el-popover placement="right-start" trigger="click"
+                                            popper-class="instance_frame_wrapper">
+                                            <div class="frame_list">
+                                              <div v-for="(instance, idx) in seriesItem.instanceInfoList"
+                                                :key="instance.Id" class="frame_content"
+                                                :style="{ 'margin-bottom': idx < seriesItem.instanceInfoList.length - 1 ? '5px' : '0px' }"
+                                                @click="showMultiFrames(studyIndex, seriesItem, index, instance)">
+                                                <div>
+                                                  <div>{{ instance.InstanceNumber }}</div>
+                                                  <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1}
+                                                    frame`
+                                                  }}</div>
+                                                </div>
+
+                                              </div>
+                                            </div>
+                                            <i slot="reference" class="el-icon-connection"
+                                              style="font-size: 15px;cursor: pointer;" />
+                                          </el-popover>
+                                        </div>
+
+                                      </div>
+                                      <div v-show="seriesItem.instanceCount" style="padding: 1px;">
+                                        {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
+                                      </div>
+                                      <div v-show="seriesItem.sliceThickness" style="padding: 1px;">
+                                        T: {{ seriesItem.sliceThickness }}
+                                      </div>
+                                      <el-tooltip v-show="seriesItem.description" class="item" effect="dark"
+                                        :content="seriesItem.description" placement="bottom">
+                                        <div v-show="seriesItem.description"
+                                          style="width: 120px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
+                                          {{ seriesItem.description }}
+                                        </div>
+                                      </el-tooltip>
+                                    </div>
+                                  </div>
+                                  <!-- <el-image
                             class="image-preview"
                             style="height:72px;width:72px;"
                             :src="seriesItem.previewImageUrl"
                             fit="fill"
                           /> -->
-                            <div
-                              v-if="seriesItem.prefetchInstanceCount > 0 && seriesItem.prefetchInstanceCount < seriesItem.instanceCount * 100">
-                              <el-progress
-                                :percentage="parseInt((seriesItem.prefetchInstanceCount / seriesItem.instanceCount).toFixed(2))" />
+                                  <div
+                                    v-if="seriesItem.prefetchInstanceCount > 0 && seriesItem.prefetchInstanceCount < seriesItem.instanceCount * 100">
+                                    <el-progress
+                                      :percentage="parseInt((seriesItem.prefetchInstanceCount / seriesItem.instanceCount).toFixed(2))" />
+                                  </div>
+                                </div>
+                              </div>
                             </div>
-                          </div>
-                        </div>
+                          </el-collapse-item>
+                        </template>
+
                       </div>
-                    </el-collapse-item>
+                    </template>
+
                   </el-collapse>
 
                 </div>
@@ -293,6 +307,7 @@ export default {
       visitInfo: '',
       activeName: 'current-study',
       relationStudyList: [],
+      relationStudyListByVisitName: [],
       cachedImages: [],
       isReading: null,
       isStartLoad: false,
@@ -689,10 +704,26 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const res = await getAllRelationStudyList(this.subjectVisitId)
+          let params = {
+            IsReading: !!this.isReading
+          }
+          const res = await getAllRelationStudyList(this.subjectVisitId, params)
           loading.close()
           this.relationStudyList = res.Result
+          this.relationStudyListByVisitName = []
+          res.Result.forEach(item => {
+            let index = this.relationStudyListByVisitName.findIndex(d => d.VisitName === item.VisitName)
+            if (index < 0) {
+              this.relationStudyListByVisitName.push({
+                VisitName: item.VisitName,
+                series: [item]
+              })
+            } else {
+              this.relationStudyListByVisitName[index].series.push(item)
+            }
+          })
         } catch (e) {
+          console.log(e)
           loading.close()
         }
       }
@@ -721,7 +752,8 @@ export default {
           spinner: 'el-icon-loading'
         })
         try {
-          const data = await getSeriesList(`/series/list/${studyId}`)
+          let isReading = !!this.isReading ? `?IsReading=true` : ''
+          const data = await getSeriesList(`/series/list/${studyId}${isReading}`)
           loading.close()
           if (data.Result != null && data.Result.length > 0) {
             var seriesList = []
@@ -798,6 +830,9 @@ export default {
             this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
           })
         }
+        if (this.imageList.length > 0) {
+          this.loopLoad()
+        }
       }
     },
     loadAllImages() {
@@ -886,7 +921,7 @@ export default {
       let file = series.instanceInfoList.find(item => item.ImageId === imageId)
       if (file && this.activeSeriesId === series.seriesId) {
         getNetWorkSpeed()
-        setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+        setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
       }
       if (prefetchInstanceCount >= instanceCount * 100) {
         series.prefetchInstanceCount = instanceCount * 100

src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue

@@ -8,7 +8,8 @@
 
               <div v-if="(visitTaskList.length > 0)" style="display: flex;flex-direction: row;">
                 <div v-for="s in visitTaskList" :key="s.VisitTaskId" class="visit-item"
-                  :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">{{
+                  :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">
+                  {{
                     s.TaskBlindName }}</div>
 
               </div>
@@ -510,13 +511,13 @@ export default {
     },
     cornerstoneimageloadprogress(e) {
       const imageId = e.detail.imageId
-      console.log(imageId,'imageId')
       const params = {}
       const searchParams = new URLSearchParams(imageId.split('?')[1])
       for (const [key, value] of searchParams.entries()) {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
       params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue

@@ -663,6 +663,7 @@ export default {
         params[key] = value
       }
       params.percentComplete = e.detail.percentComplete
+      params.FileTotal = e.detail.total
       params.imageId = imageId
       store.dispatch('reading/setImageLoadedProgress', params)
     }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue

@@ -85,7 +85,7 @@
                       </template>
                     </el-select>
                     <span
-                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select' || scope.row.Type === 'radio'">
+                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
                       {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                     </span>
                     <el-select

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

@@ -1326,7 +1326,7 @@ export default {
       let file = series.find(item => item.ImageId === imageId)
       if (file) {
         getNetWorkSpeed()
-        setNetWorkSpeedSizeAll(percentComplete, file.FileSize, imageId)
+        setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId)
       }
       if (percentComplete === 100) {
         workSpeedclose()

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

@@ -1273,7 +1273,8 @@ export default {
       try {
         let params = {
           TrialId: this.data.TrialId,
-          UserTypeEnum: 3
+          UserTypeEnum: 3,
+          SubjectVisitId: this.data.Id
         }
         let res = await getTrialUserRoleList(params)
         if (res.IsSuccess) {
@@ -1293,18 +1294,17 @@ export default {
           this.$emit('getList')
           this.assignObj.visible = false
           this.$emit("close")
-        } else {
-          if (res.Code === 5 && res.ErrorMessage) {
-            this.$confirm(res.ErrorMessage, {
-              type: 'warning',
-              showCancelButton: false,
-              callback: (action) => { },
-            })
-            this.$emit('getList')
-          }
         }
       } catch (err) {
         console.log(err)
+        if (err.Code === 5 && err.ErrorMessage) {
+          this.$confirm(err.ErrorMessage, {
+            type: 'warning',
+            showCancelButton: false,
+            callback: (action) => { },
+          })
+          this.$emit('getList')
+        }
       }
     },
     // 保存审核问题

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -344,8 +344,9 @@
               <!--复核 -->
               <el-button v-if="scope.row.SecondReviewState === 1 && scope.row.AuditState * 1 === 8"
                 v-hasPermi="['trials:trials-panel:visit:qc-check:reviewTask']"
-                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit-outline"
-                :disabled="scope.row.IsImageBackApplying" @click="reviewTask(scope.row)" />
+                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit"
+                :disabled="(scope.row.CurrentActionUserId && scope.row.CurrentActionUserId !== userId) || scope.row.IsImageBackApplying"
+                @click="reviewTask(scope.row)" />
               <!-- 领取 -->
               <!-- ((scope.row.AuditState*1 === 3 || scope.row.AuditState*1 === 5)) ||(!scope.row.IsTake && (scope.row.AuditState*1 === 4 || scope.row.AuditState*1 === 6)) -->
               <el-button v-hasPermi="['trials:trials-panel:visit:qc-check:receive']"
@@ -814,15 +815,19 @@ export default {
     // 复审
     async reviewTask(row) {
       if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
-      this.loading = true
-      let res = await takeOrReleaseQCTask(row.TrialId, row.Id, true)
-      this.loading = false
-      if (res.IsSuccess) {
-        this.rowData = { ...row }
-        this.qcVisible = true
-      } else {
-        if (res.Code === 5 && res.ErrorMessage) {
-          this.$confirm(res.ErrorMessage, {
+      try {
+        this.loading = true
+        let res = await takeOrReleaseQCTask(row.TrialId, row.Id, true)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.rowData = { ...row }
+          this.qcVisible = true
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+        if (err.Code === 5 && err.ErrorMessage) {
+          this.$confirm(err.ErrorMessage, {
             type: 'warning',
             showCancelButton: false,
             callback: (action) => { },