重传比对算法优化

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

@@ -673,11 +673,9 @@ export default {
               var time = data.string('x00080030')
               var studyTime = ''
               if (date) {
-                // date = `${date.substr(0, 4)}-${date.substr(4, 2)}-${date.substr(6, 2)}`
                 date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
               }
               if (time) {
-                // time = `${time.substr(0, 2)}:${time.substr(2, 2)}:${time.substr(4, 2)}`
                 time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
               }
               if(date){
@@ -757,11 +755,9 @@ export default {
               var time = data.string('x00080031')
               var seriesTime = ''
               if (date) {
-                // date = `${date.substr(0, 4)}-${date.substr(4, 2)}-${date.substr(6, 2)}`
                 date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
               }
               if (time) {
-                // time = `${time.substr(0, 2)}:${time.substr(2, 2)}:${time.substr(4, 2)}`
                 time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
               }
               if(date){
@@ -792,11 +788,9 @@ export default {
               var time = data.string('x00080033')
               var instanceTime = ''
               if (date) {
-                // date = `${date.substr(0, 4)}-${date.substr(4, 2)}-${date.substr(6, 2)}`
                 date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
               }
               if (time) {
-                // time = `${time.substr(0, 2)}:${time.substr(2, 2)}:${time.substr(4, 2)}`
                 time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
               }
               if(date){
@@ -824,7 +818,6 @@ export default {
             }
             resolve()
           } catch (error) {
-            // scope.$alert(scope.$t('trials:trials-panel:message:notIsHasDicom'))
             console.log(error)
             resolve()
           }
@@ -883,37 +876,47 @@ export default {
         var messageArr = []
         res.Result.forEach((item) => {
           const i = this.uploadQueues.findIndex((value) => value.dicomInfo.studyUid === item.StudyInstanceUid)
+          let instanceUidList = []
+          item.UploadedSeriesList.forEach(v => {
+            v.SOPInstanceUIDList.forEach(v1 => {
+              instanceUidList.push(v1)
+            })
+          })
+          // isReUploadinstanceUidList1.includes(instanceUidList2)
           try {
             this.uploadQueues[i].seriesList.forEach(v => {
               let o = item.UploadedSeriesList.find(v1 => {
-                v.instanceList.forEach(v2 => {
-                  let o2 = v1.SOPInstanceUIDList.find(v3 => {
-                    console.log(v3, v2.instanceUid)
-                    return v3 === v2.instanceUid
-                  })
-                  console.log(v2)
-                  if (!!o2) {
-                    v2.isReUpload = true
-                  }
-                })
+                return v.seriesUid === v1.SeriesId
+                // v.instanceList.forEach(v2 => {
+                //   let o2 = v1.SOPInstanceUIDList.find(v3 => {
+                //     return v3 === v2.instanceUid
+                //   })
+                //   if (!!o2) {
+                //     v2.isReUpload = true
+                //   }
+                // })
               })
               if (!!o) {
                 v.isReUpload = true
               }
             })
+            this.uploadQueues[i].seriesList.forEach(v => {
+              v.instanceList.forEach(v2 => {
+                let o2 = instanceUidList.find(v3 => {
+                  return v3 === v2.instanceUid
+                })
+                if (!!o2) {
+                  v2.isReUpload = true
+                }
+              })
+            })
           } catch (e) {
             console.log(e)
           }
           // 不能上传或不能重传时，收集校验结果提示,并取消勾选,设置上传状态
           if (item.ErrorMesseage) {
-            // Uploading not allowed
-            // this.uploadQueues[i].uploadState.stateText = this.$t('trials:uploadDicomList:label:uploadingNotAllowed')
-            // this.uploadQueues[i].uploadState.selected = true
-            // this.uploadQueues[i].uploadState.stateCode = 'Uploading not allowed'
-            // this.uploadQueues[i].uploadState.errorMessage = item.ErrorMesseage
             this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
             this.$refs.dicomFilesTable.toggleRowSelection(this.uploadQueues[i])
-            // const msg = `ACC:${this.uploadQueues[i].dicomInfo.accNumber}, ${item.ErrorMesseage}`
             const msg = `${item.ErrorMesseage}`
             messageArr.push(msg)
           }

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

@@ -638,6 +638,8 @@ import Pagination from '@/components/Pagination'
 import moment from 'moment'
 import { changeURLStatic } from '@/utils/history.js'
 import { getToken } from '@/utils/auth'
+
+
 const searchDataDefault = () => {
   return {
     TrialId: '',