diff --git a/.env.usa b/.env.usa
index 8f48060c..0400515c 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-uat-code.s3.amazonaws.com/2024-09-14/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-uat-code.s3.amazonaws.com/2024-10-14/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/.env.usa_prod b/.env.usa_prod
index aa316930..ceca872d 100644
--- a/.env.usa_prod
+++ b/.env.usa_prod
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-09-05/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-10-14/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/package.json b/package.json
index 42d7985d..f760655a 100644
--- a/package.json
+++ b/package.json
@@ -28,11 +28,13 @@
     "axios": "0.18.1",
     "babel-eslint": "7.2.3",
     "copy-webpack-plugin": "^4.5.2",
+    "@aws-sdk/client-s3": "^3.370.0",
     "core-js": "^3.8.3",
     "cornerstone-core": "^2.6.1",
     "cornerstone-math": "^0.1.10",
     "cornerstone-tools": "^6.0.10",
     "cornerstone-wado-image-loader": "^4.13.2",
+    "crypto-js": "^4.2.0",
     "dcmjs": "^0.29.8",
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
@@ -43,6 +45,7 @@
     "hammerjs": "^2.0.8",
     "html2canvas": "^1.4.1",
     "js-md5": "^0.7.3",
+    "jsencrypt": "^3.3.2",
     "jszip": "^3.7.1",
     "moment": "^2.27.0",
     "node-polyfill-webpack-plugin": "^2.0.1",
diff --git a/public/mitm.html b/public/mitm.html
new file mode 100644
index 00000000..508a9c3b
--- /dev/null
+++ b/public/mitm.html
@@ -0,0 +1,167 @@
+<!--
+	mitm.html is the lite "man in the middle"
+
+	This is only meant to signal the opener's messageChannel to
+	the service worker - when that is done this mitm can be closed
+    but it's better to keep it alive since this also stops the sw
+    from restarting
+
+	The service worker is capable of intercepting all request and fork their
+	own "fake" response - wish we are going to craft
+	when the worker then receives a stream then the worker will tell the opener
+	to open up a link that will start the download
+-->
+<script>
+// This will prevent the sw from restarting
+let keepAlive = () => {
+  keepAlive = () => {}
+  var ping = location.href.substr(0, location.href.lastIndexOf('/')) + '/ping'
+  var interval = setInterval(() => {
+    if (sw) {
+      sw.postMessage('ping')
+    } else {
+      fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)))
+    }
+  }, 10000)
+}
+
+// message event is the first thing we need to setup a listner for
+// don't want the opener to do a random timeout - instead they can listen for
+// the ready event
+// but since we need to wait for the Service Worker registration, we store the
+// message for later
+let messages = []
+window.onmessage = evt => messages.push(evt)
+
+let sw = null
+let scope = ''
+
+function registerWorker() {
+  return navigator.serviceWorker.getRegistration('./').then(swReg => {
+    return swReg || navigator.serviceWorker.register('sw.js', { scope: './' })
+  }).then(swReg => {
+    const swRegTmp = swReg.installing || swReg.waiting
+
+    scope = swReg.scope
+
+    return (sw = swReg.active) || new Promise(resolve => {
+      swRegTmp.addEventListener('statechange', fn = () => {
+        if (swRegTmp.state === 'activated') {
+          swRegTmp.removeEventListener('statechange', fn)
+          sw = swReg.active
+          resolve()
+        }
+      })
+    })
+  })
+}
+
+// Now that we have the Service Worker registered we can process messages
+function onMessage (event) {
+  let { data, ports, origin } = event
+
+  // It's important to have a messageChannel, don't want to interfere
+  // with other simultaneous downloads
+  if (!ports || !ports.length) {
+    throw new TypeError("[StreamSaver] You didn't send a messageChannel")
+  }
+
+  if (typeof data !== 'object') {
+    throw new TypeError("[StreamSaver] You didn't send a object")
+  }
+
+  // the default public service worker for StreamSaver is shared among others.
+  // so all download links needs to be prefixed to avoid any other conflict
+  data.origin = origin
+
+  // if we ever (in some feature versoin of streamsaver) would like to
+  // redirect back to the page of who initiated a http request
+  data.referrer = data.referrer || document.referrer || origin
+
+  // pass along version for possible backwards compatibility in sw.js
+  data.streamSaverVersion = new URLSearchParams(location.search).get('version')
+
+  if (data.streamSaverVersion === '1.2.0') {
+    console.warn('[StreamSaver] please update streamsaver')
+  }
+
+  /** @since v2.0.0 */
+  if (!data.headers) {
+    console.warn("[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts")
+  } else {
+    // test if it's correct
+    // should thorw a typeError if not
+    new Headers(data.headers)
+  }
+
+  /** @since v2.0.0 */
+  if (typeof data.filename === 'string') {
+    console.warn("[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option")
+    // Do what File constructor do with fileNames
+    data.filename = data.filename.replace(/\//g, ':')
+  }
+
+  /** @since v2.0.0 */
+  if (data.size) {
+    console.warn("[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option")
+  }
+
+  /** @since v2.0.0 */
+  if (data.readableStream) {
+    console.warn("[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm")
+  }
+
+  /** @since v2.0.0 */
+  if (!data.pathname) {
+    console.warn("[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)")
+    data.pathname = Math.random().toString().slice(-6) + '/' + data.filename
+  }
+
+  // remove all leading slashes
+  data.pathname = data.pathname.replace(/^\/+/g, '')
+
+  // remove protocol
+  let org = origin.replace(/(^\w+:|^)\/\//, '')
+
+  // set the absolute pathname to the download url.
+  data.url = new URL(`${scope + org}/${data.pathname}`).toString()
+
+  if (!data.url.startsWith(`${scope + org}/`)) {
+    throw new TypeError('[StreamSaver] bad `data.pathname`')
+  }
+
+  // This sends the message data as well as transferring
+  // messageChannel.port2 to the service worker. The service worker can
+  // then use the transferred port to reply via postMessage(), which
+  // will in turn trigger the onmessage handler on messageChannel.port1.
+
+  const transferable = data.readableStream
+    ? [ ports[0], data.readableStream ]
+    : [ ports[0] ]
+
+  if (!(data.readableStream || data.transferringReadable)) {
+    keepAlive()
+  }
+
+  return sw.postMessage(data, transferable)
+}
+
+if (window.opener) {
+  // The opener can't listen to onload event, so we need to help em out!
+  // (telling them that we are ready to accept postMessage's)
+  window.opener.postMessage('StreamSaver::loadedPopup', '*')
+}
+
+if (navigator.serviceWorker) {
+  registerWorker().then(() => {
+    window.onmessage = onMessage
+    messages.forEach(window.onmessage)
+  })
+}
+
+// FF v102 just started to supports transferable streams, but still needs to ping sw.js
+// even tough the service worker dose not have to do any kind of work and listen to any
+// messages... #305
+keepAlive()
+
+</script>
diff --git a/public/sw.js b/public/sw.js
new file mode 100644
index 00000000..dd75c1a5
--- /dev/null
+++ b/public/sw.js
@@ -0,0 +1,130 @@
+/* global self ReadableStream Response */
+
+self.addEventListener('install', () => {
+  self.skipWaiting()
+})
+
+self.addEventListener('activate', event => {
+  event.waitUntil(self.clients.claim())
+})
+
+const map = new Map()
+
+// This should be called once per download
+// Each event has a dataChannel that the data will be piped through
+self.onmessage = event => {
+  // We send a heartbeat every x second to keep the
+  // service worker alive if a transferable stream is not sent
+  if (event.data === 'ping') {
+    return
+  }
+
+  const data = event.data
+  const downloadUrl = data.url || self.registration.scope + Math.random() + '/' + (typeof data === 'string' ? data : data.filename)
+  const port = event.ports[0]
+  const metadata = new Array(3) // [stream, data, port]
+
+  metadata[1] = data
+  metadata[2] = port
+
+  // Note to self:
+  // old streamsaver v1.2.0 might still use `readableStream`...
+  // but v2.0.0 will always transfer the stream through MessageChannel #94
+  if (event.data.readableStream) {
+    metadata[0] = event.data.readableStream
+  } else if (event.data.transferringReadable) {
+    port.onmessage = evt => {
+      port.onmessage = null
+      metadata[0] = evt.data.readableStream
+    }
+  } else {
+    metadata[0] = createStream(port)
+  }
+
+  map.set(downloadUrl, metadata)
+  port.postMessage({ download: downloadUrl })
+}
+
+function createStream (port) {
+  // ReadableStream is only supported by chrome 52
+  return new ReadableStream({
+    start (controller) {
+      // When we receive data on the messageChannel, we write
+      port.onmessage = ({ data }) => {
+        if (data === 'end') {
+          return controller.close()
+        }
+
+        if (data === 'abort') {
+          controller.error('Aborted the download')
+          return
+        }
+
+        controller.enqueue(data)
+      }
+    },
+    cancel (reason) {
+      console.log('user aborted', reason)
+      port.postMessage({ abort: true })
+    }
+  })
+}
+
+self.onfetch = event => {
+  const url = event.request.url
+
+  // this only works for Firefox
+  if (url.endsWith('/ping')) {
+    return event.respondWith(new Response('pong'))
+  }
+
+  const hijacke = map.get(url)
+
+  if (!hijacke) return null
+
+  const [ stream, data, port ] = hijacke
+
+  map.delete(url)
+
+  // Not comfortable letting any user control all headers
+  // so we only copy over the length & disposition
+  const responseHeaders = new Headers({
+    'Content-Type': 'application/octet-stream; charset=utf-8',
+
+    // To be on the safe side, The link can be opened in a iframe.
+    // but octet-stream should stop it.
+    'Content-Security-Policy': "default-src 'none'",
+    'X-Content-Security-Policy': "default-src 'none'",
+    'X-WebKit-CSP': "default-src 'none'",
+    'X-XSS-Protection': '1; mode=block',
+    'Cross-Origin-Embedder-Policy': 'require-corp'
+  })
+
+  let headers = new Headers(data.headers || {})
+
+  if (headers.has('Content-Length')) {
+    responseHeaders.set('Content-Length', headers.get('Content-Length'))
+  }
+
+  if (headers.has('Content-Disposition')) {
+    responseHeaders.set('Content-Disposition', headers.get('Content-Disposition'))
+  }
+
+  // data, data.filename and size should not be used anymore
+  if (data.size) {
+    console.warn('Depricated')
+    responseHeaders.set('Content-Length', data.size)
+  }
+
+  let fileName = typeof data === 'string' ? data : data.filename
+  if (fileName) {
+    console.warn('Depricated')
+    // Make filename RFC5987 compatible
+    fileName = encodeURIComponent(fileName).replace(/['()]/g, escape).replace(/\*/g, '%2A')
+    responseHeaders.set('Content-Disposition', "attachment; filename*=UTF-8''" + fileName)
+  }
+
+  event.respondWith(new Response(stream, { headers: responseHeaders }))
+
+  port.postMessage({ debug: 'Download started' })
+}
diff --git a/src/api/load.js b/src/api/load.js
index cc23cc40..97e44a79 100644
--- a/src/api/load.js
+++ b/src/api/load.js
@@ -8,11 +8,11 @@ export function requestPackageAndAnonymizImage(params) {
     })
 }
 // 获取影像上传列表
-export function getSubjectImageUploadList(params) {
+export function getSubjectImageUploadList(data) {
     return request({
         url: '/DownloadAndUpload/getSubjectImageUploadList',
-        method: 'get',
-        params
+        method: 'post',
+        data
     })
 }
 // 预上传
@@ -39,4 +39,68 @@ export function deleteTaskStudy(params) {
         method: 'delete',
         params
     })
+}
+// 获取iqc下载文件信息
+export function getCRCUploadedStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getCRCUploadedStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务列表
+export function getSubjectImageDownloadSelectList(data) {
+    return request({
+        url: '/DownloadAndUpload/getSubjectImageDownloadSelectList',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务下载文件信息
+export function getIRReadingDownloadStudyInfo(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRReadingDownloadStudyInfo',
+        method: 'post',
+        data
+    })
+}
+// 获取ir阅片和任务非dicom上传列表
+export function getIRUploadTaskNoneDicomStudyList(data) {
+    return request({
+        url: '/DownloadAndUpload/getIRUploadTaskNoneDicomStudyList',
+        method: 'post',
+        data
+    })
+}
+// 校验上传影像
+export function verifyIRStudyAllowUpload(data) {
+    return request({
+        url: '/DownloadAndUpload/verifyIRStudyAllowUpload',
+        method: 'post',
+        data
+    })
+}
+// 影像下载成功确认
+export function downloadImageSuccess(params) {
+    return request({
+        url: '/DownloadAndUpload/downloadImageSuccess',
+        method: 'post',
+        params
+    })
+}
+// 影像下载记录列表
+export function getTrialDownloadList(data) {
+    return request({
+        url: '/DownloadAndUpload/getTrialDownloadList',
+        method: 'post',
+        data
+    })
+}
+// 修改后处理检查类型
+export function updateTaskStudyModality(params) {
+    return request({
+        url: '/DownloadAndUpload/updateTaskStudyModality',
+        method: 'put',
+        params
+    })
 }
\ No newline at end of file
diff --git a/src/api/reading.js b/src/api/reading.js
index e2596fde..a7fa5a6d 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-
+import requestDownload from '@/utils/request-download'
 export function addBaseLineLesion(param) {
   return request({
     url: '/report/addBaseLineLesion',
@@ -133,9 +133,11 @@ export function AddAdjudicationReport(param) {
   })
 }
 
-export function getVisitStudyList(trialId, subjectVisitId, isReading) {
+export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) {
+  let url =  `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
+  url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url
   return request({
-    url: `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`,
+    url: url,
     method: 'get'
   })
 }
@@ -194,3 +196,58 @@ export function resetReadingTask(param) {
     data: param
   })
 }
+export function getTaskUploadedDicomStudyList(param) {
+  return request({
+    url: `/DownloadAndUpload/getTaskUploadedDicomStudyList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getIVUSTemplate(param) {
+  return requestDownload({
+    url: '/IVUSCalculate/getIVUSTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadIVUSTemplate(param) {
+  return request({
+    url: `/IVUSCalculate/uploadIVUSTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTFCTTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTFCTTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+
+export function uploadOCTFCTTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTFCTTemplate`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getOCTLipidAngleTemplate(param) {
+  return requestDownload({
+    url: '/OCTCalculate/getOCTLipidAngleTemplate',
+    method: 'post',
+    responseType: 'blob',
+    data: param
+  })
+}
+export function uploadOCTLipidAngleTemplate(param) {
+  return request({
+    url: `/OCTCalculate/uploadOCTLipidAngleTemplate`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/api/trials.js b/src/api/trials.js
index bd299412..a07d282a 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1364,9 +1364,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
     method: 'get'
   })
 }
diff --git a/src/api/user.js b/src/api/user.js
index 67027318..f7a60455 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -4,7 +4,8 @@ export function login(data) {
   return request({
     url: '/user/login',
     method: 'post',
-    data
+    data,
+    ENCRYPT: true
   })
 }
 export function loginOut(params) {
@@ -185,3 +186,10 @@ export function sendMFAEmail(params) {
     params
   })
 }
+// 获取公钥
+export function getPublicKey() {
+  return request({
+    url: `/user/getPublicKey`,
+    method: 'get',
+  })
+}
diff --git a/src/assets/zip.png b/src/assets/zip.png
index bf027c11..274663ad 100644
Binary files a/src/assets/zip.png and b/src/assets/zip.png differ
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index dd5970d0..24cce9e1 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -81,16 +81,25 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
+    <el-dialog
+      v-if="dcmTag.visible"
+      :visible.sync="dcmTag.visible"
+      :close-on-click-modal="false"
+      :title="dcmTag.title"
+      width="1000px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <DicomTags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import Vue from 'vue'
-import Contextmenu from 'vue-contextmenujs'
-Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
+
 const scroll = cornerstoneTools.import('util/scrollToIndex')
 import Hammer from 'hammerjs'
 import getOrientationString from '@/views/trials/trials-panel/reading/dicoms/tools/OrientationMarkers/getOrientationString'
@@ -108,8 +117,10 @@ cornerstoneTools.toolColors.setActiveColor('rgb(0, 255, 0)')
 // cornerstoneTools.init({ showSVGCursors: true })
 cornerstoneTools.init()
 const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
+import DicomTags from './DicomTags'
 export default {
   name: 'DicomCanvas',
+  components: { DicomTags },
   data() {
     return {
       loading: false,
@@ -164,7 +175,8 @@ export default {
       mousePosition: { x: '', y: '', mo: '' },
       markers: { top: '', right: '', bottom: '', left: '' },
       orientationMarkers: [],
-      originalMarkers: []
+      originalMarkers: [],
+      dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') }
     }
   },
 
@@ -215,7 +227,7 @@ export default {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
         this.loading = true
-        
+
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
           .then(image => {
             this.loading = false
@@ -364,8 +376,8 @@ export default {
       if (this.dicomInfo.thick) {
         this.dicomInfo.thick = this.dicomInfo.thick.toFixed(2)
       }
-      let newImageIdIndex = this.stack.imageIds.findIndex(i=>i===e.detail.image.imageId)
-      if(newImageIdIndex === -1) return
+      const newImageIdIndex = this.stack.imageIds.findIndex(i => i === e.detail.image.imageId)
+      if (newImageIdIndex === -1) return
       this.stack.currentImageIdIndex = newImageIdIndex
       this.stack.imageIdIndex = newImageIdIndex
       this.series.imageIdIndex = newImageIdIndex
@@ -441,7 +453,7 @@ export default {
       if (!markers) {
         return
       }
-      
+
       this.orientationMarkers = [oppositeColumn, row, column, oppositeRow]
       this.originalMarkers = [oppositeColumn, row, column, oppositeRow]
       this.setMarkers()
@@ -636,7 +648,7 @@ export default {
       enabledElement.renderingTools.renderCanvasData = renderCanvasData
     },
     scrollPage(offset) {
-      if(this.loading) return
+      if (this.loading) return
       var index = this.stack.currentImageIdIndex + offset
       if (index < 0) index = 0
       else if (index >= this.stack.imageIds.length) {
@@ -648,7 +660,7 @@ export default {
     },
 
     toggleClipPlay() {
-      if(this.loading) return
+      if (this.loading) return
       if (this.toolState.clipPlaying) {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false
@@ -668,7 +680,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter
@@ -707,7 +719,7 @@ export default {
         this.orientationMarkers = [...this.originalMarkers]
         this.setMarkers()
       }
-      
+
       var viewport = cornerstone.getViewport(this.canvas)
       viewport.hflip = false
       viewport.vflip = false
@@ -747,6 +759,9 @@ export default {
       var uid = cornerstone.getImage(this.canvas).data.string('x00080018')
       cornerstoneTools.SaveAs(this.canvas, `${uid}.png`)
     },
+    showTags() {
+      this.dcmTag.visible = true
+    },
     fitToWindow() {
       if (this.stack.seriesNumber) {
         cornerstone.fitToWindow(this.canvas)
diff --git a/src/components/Dicom/DicomTags.vue b/src/components/Dicom/DicomTags.vue
new file mode 100644
index 00000000..c3f6ec44
--- /dev/null
+++ b/src/components/Dicom/DicomTags.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="dcm-tag">
+    <el-input
+      v-model="search"
+      size="mini"
+      :placeholder="$t('trials:dicom-tag:keywords')"
+      style="width:200px"
+    />
+
+    <el-table
+      :data="filterList(list)"
+      row-key="id"
+      default-expand-all
+      :tree-props="{children: 'child', hasChildren: 'hasChildren'}"
+      :default-sort="{prop: 'tagCode', order: 'ascending'}"
+      height="500"
+    >
+      <el-table-column
+        prop="tagCode"
+        label="Tag"
+        min-width="120"
+        sortable
+      />
+      <el-table-column
+        prop="tagName"
+        label="Description"
+        min-width="150"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="vr"
+        label="VR"
+        min-width="50"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="tagLength"
+        label="Length"
+        min-width="80"
+        show-overflow-tooltip
+        sortable
+      />
+      <el-table-column
+        prop="value"
+        label="Value"
+        min-width="200"
+        show-overflow-tooltip
+        sortable
+      />
+    </el-table>
+  </div>
+</template>
+<script>
+import TAG_DICT from './dataDictionary'
+import * as cornerstone from 'cornerstone-core'
+import dicomParser from 'dicom-parser'
+export default {
+  name: 'DicomTags',
+  props: {
+    imageId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      list: [],
+      idx: 0,
+      search: ''
+    }
+  },
+  async mounted() {
+    const image = await cornerstone.loadAndCacheImage(this.imageId)
+    var dataSet = dicomParser.parseDicom(image.data.byteArray)
+    var output = []
+    this.dumpDataSet(dataSet, output)
+    this.list = output
+  },
+  methods: {
+    filterList(list) {
+      if (list.length === 0) return []
+      if (!this.search) {
+        return list
+      } else {
+        const search = isNaN(parseFloat(this.search)) ? this.search.toLowerCase() : String(this.search)
+        const arr = list.filter(data => {
+          if (data.tagCode && data.tagCode.toLowerCase().includes(search)) {
+            return data
+          } else if (data.tagName && data.tagName.toLowerCase().includes(search)) {
+            return data
+          } else if (data.value) {
+            let v = ''
+            if (!isNaN(parseFloat(data.value))) {
+              v = String(data.value)
+            } else {
+              v = data.value.toLowerCase()
+            }
+            if (v.includes(search)) {
+              return data
+            }
+          }
+        })
+        return arr
+      }
+    },
+    dumpDataSet(dataSet, output) {
+      try {
+        for (const propertyName in dataSet.elements) {
+          const elementObject = {}
+          const element = dataSet.elements[propertyName]
+          const tag = this.getTag(element.tag)
+          elementObject.id = `${this.idx++}${new Date().getTime()}`
+          if (!tag) {
+            const group = element.tag.substring(1, 5)
+            const el = element.tag.substring(5, 9)
+            elementObject.tagCode = ('(' + group + ',' + el + ')').toUpperCase()
+          } else {
+            elementObject.tagCode = tag ? tag.tag : ''
+            elementObject.tagName = tag ? tag.name : ''
+          }
+
+          elementObject.tagLength = element.length
+          elementObject.value = ''
+          elementObject.child = []
+
+          if (element.items) {
+            element.items.forEach(item => {
+              const childOutput = []
+              this.dumpDataSet(item.dataSet, childOutput)
+              elementObject.child.push(...childOutput)
+            })
+          } else if (element.fragments) {
+            // 多帧处理
+          } else {
+            var vr
+            if (element.vr !== undefined) {
+              vr = element.vr
+            } else {
+              if (tag !== undefined) {
+                vr = tag.vr
+              }
+            }
+            elementObject.vr = vr
+            if (element.length < 128) {
+              // const str = dataSet.string(propertyName)
+              // if (elementObject.tagCode === 'x00280010') {
+              //   console.log(str)
+              // }
+              // const stringIsAscii = this.isASCII(str)
+              // if (stringIsAscii && str !== undefined) {
+              //   elementObject.value = str
+              // }
+
+              if (element.vr === undefined && tag === undefined) {
+                if (element.length === 2) {
+                  elementObject.value = dataSet.uint16(propertyName)
+                } else if (element.length === 4) {
+                  elementObject.value = dataSet.uint32(propertyName)
+                }
+                const str = dataSet.string(propertyName)
+                const stringIsAscii = this.isASCII(str)
+
+                if (stringIsAscii) {
+                  if (str !== undefined) {
+                    elementObject.value = str
+                  }
+                } else {
+                  if (element.length !== 2 && element.length !== 4) {
+                    // elementObject.value = 'binary data'
+                  }
+                }
+              } else {
+                if (this.isStringVr(vr)) {
+                  const str = dataSet.string(propertyName)
+                  const stringIsAscii = this.isASCII(str)
+
+                  if (stringIsAscii) {
+                    if (str !== undefined) {
+                      elementObject.value = str
+                    }
+                  } else {
+                    if (element.length !== 2 && element.length !== 4) {
+                      // elementObject.value = 'binary data'
+                    }
+                  }
+                } else if (vr === 'US') {
+                  let text = dataSet.uint16(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 2; i++) {
+                    text += '\\' + dataSet.uint16(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'SS') {
+                  let text = dataSet.int16(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 2; i++) {
+                    text += '\\' + dataSet.int16(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'UL') {
+                  let text = dataSet.uint32(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.uint32(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'SL') {
+                  let text = dataSet.int32(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.int32(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'FD') {
+                  let text = dataSet.double(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 8; i++) {
+                    text += '\\' + dataSet.double(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'FL') {
+                  let text = dataSet.float(propertyName)
+                  for (let i = 1; i < dataSet.elements[propertyName].length / 4; i++) {
+                    text += '\\' + dataSet.float(propertyName, i)
+                  }
+                  elementObject.value = text
+                } else if (vr === 'OB' || vr === 'OW' || vr === 'UN' || vr === 'OF' || vr === 'UT') {
+                  if (element.length === 2) {
+                    elementObject.value = dataSet.uint16(propertyName)
+                  } else if (element.length === 4) {
+                    elementObject.value = dataSet.uint32(propertyName)
+                  } else {
+
+                  }
+                } else if (vr === 'AT') {
+                  // var group = dataSet.uint16(propertyName, 0);
+                  // var groupHexStr = ("0000" + group.toString(16)).substr(-4);
+                  // var element = dataSet.uint16(propertyName, 1);
+                  // var elementHexStr = ("0000" + element.toString(16)).substr(-4);
+                  // text += "x" + groupHexStr + elementHexStr;
+                } else if (vr === 'SQ') {
+                } else {
+                  // no display code for VR yet, sorry!
+                }
+              }
+            }
+          }
+
+          output.push(elementObject)
+        }
+      } catch (err) {
+        const ex = {
+          exception: err,
+          output: output
+        }
+        console.log(ex)
+      }
+    },
+    getTag(tag) {
+      var group = tag.substring(1, 5)
+      var element = tag.substring(5, 9)
+      var tagIndex = ('(' + group + ',' + element + ')').toUpperCase()
+      var attr = TAG_DICT[tagIndex]
+      return attr
+    },
+    isASCII(str) {
+      return /^[\x00-\x7F]*$/.test(str)
+    },
+    isStringVr(vr) {
+      if (vr === 'AT' || vr === 'FL' || vr === 'FD' || vr === 'OB' || vr === 'OF' || vr === 'OW' || vr === 'SI' || vr === 'SQ' || vr === 'SS' || vr === 'UL' || vr === 'US') {
+        return false
+      }
+      return true
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.dcm-tag{
+  // user-select: none;
+  ::-webkit-scrollbar {
+    width: 8px;
+    height: 15px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+}
+</style>
diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue
index 5ea237e1..8d091c24 100644
--- a/src/components/Dicom/DicomViewer.vue
+++ b/src/components/Dicom/DicomViewer.vue
@@ -182,7 +182,7 @@
             <svg-icon icon-class="fitToImage" style="font-size:20px;" />
           </button>
           <!-- <button title="旋转" class="btn-link dropdown" data-tool="Rotate" @click="setToolActive($event,'Rotate')"> -->
-          
+
         </div>
       </div>
       <!-- 测量标注 -->
@@ -233,6 +233,10 @@
           <button :title="$t('trials:dicom-show:image')" class="btn-link" @click="currentDicomCanvas.saveImage()">
             <svg-icon icon-class="image" style="font-size:20px;" />
           </button>
+          <!-- 标签 -->
+          <button :title="$t('trials:dicom-show:tags')" class="btn-link" @click="currentDicomCanvas.showTags()">
+            <svg-icon icon-class="dictionary" style="font-size:20px;" />
+          </button>
         </div>
       </div>
       <div class="measureTool-wrapper">
@@ -405,7 +409,7 @@ export default {
     loadImageStack(dicomSeries) {
       this.currentDicomCanvas.toolState.clipPlaying = false
       this.$nextTick(() => {
-        let series = Object.assign({}, dicomSeries)
+        const series = Object.assign({}, dicomSeries)
         this.currentDicomCanvas.loadImageStack(series)
       })
     },
@@ -416,7 +420,7 @@ export default {
         Array.from(elements).forEach((element, index) => {
           const canvasIndex = element.getAttribute('data-index')
           if (index < seriesList.length && element.style.display !== 'none') {
-            let series = Object.assign({}, seriesList[index])
+            const series = Object.assign({}, seriesList[index])
             this.$refs[`dicomCanvas${canvasIndex}`].loadImageStack(series)
           }
         })
diff --git a/src/components/Dicom/dataDictionary.js b/src/components/Dicom/dataDictionary.js
new file mode 100644
index 00000000..02e4c74d
--- /dev/null
+++ b/src/components/Dicom/dataDictionary.js
@@ -0,0 +1,3648 @@
+'use strict'
+export default {
+  '(0000,0000)': { 'tag': '(0000,0000)', 'vr': 'UL', 'vm': '1', 'name': 'CommandGroupLength' },
+  '(0000,0001)': { 'tag': '(0000,0001)', 'vr': 'UL', 'vm': '1', 'name': 'CommandLengthToEnd' },
+  '(0000,0002)': { 'tag': '(0000,0002)', 'vr': 'UI', 'vm': '1', 'name': 'AffectedSOPClassUID' },
+  '(0000,0003)': { 'tag': '(0000,0003)', 'vr': 'UI', 'vm': '1', 'name': 'RequestedSOPClassUID' },
+  '(0000,0010)': { 'tag': '(0000,0010)', 'vr': 'SH', 'vm': '1', 'name': 'CommandRecognitionCode' },
+  '(0000,0100)': { 'tag': '(0000,0100)', 'vr': 'US', 'vm': '1', 'name': 'CommandField' },
+  '(0000,0110)': { 'tag': '(0000,0110)', 'vr': 'US', 'vm': '1', 'name': 'MessageID' },
+  '(0000,0120)': { 'tag': '(0000,0120)', 'vr': 'US', 'vm': '1', 'name': 'MessageIDBeingRespondedTo' },
+  '(0000,0200)': { 'tag': '(0000,0200)', 'vr': 'AE', 'vm': '1', 'name': 'Initiator' },
+  '(0000,0300)': { 'tag': '(0000,0300)', 'vr': 'AE', 'vm': '1', 'name': 'Receiver' },
+  '(0000,0400)': { 'tag': '(0000,0400)', 'vr': 'AE', 'vm': '1', 'name': 'FindLocation' },
+  '(0000,0600)': { 'tag': '(0000,0600)', 'vr': 'AE', 'vm': '1', 'name': 'MoveDestination' },
+  '(0000,0700)': { 'tag': '(0000,0700)', 'vr': 'US', 'vm': '1', 'name': 'Priority' },
+  '(0000,0800)': { 'tag': '(0000,0800)', 'vr': 'US', 'vm': '1', 'name': 'CommandDataSetType' },
+  '(0000,0850)': { 'tag': '(0000,0850)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfMatches' },
+  '(0000,0860)': { 'tag': '(0000,0860)', 'vr': 'US', 'vm': '1', 'name': 'ResponseSequenceNumber' },
+  '(0000,0900)': { 'tag': '(0000,0900)', 'vr': 'US', 'vm': '1', 'name': 'Status' },
+  '(0000,0901)': { 'tag': '(0000,0901)', 'vr': 'AT', 'vm': '1-n', 'name': 'OffendingElement' },
+  '(0000,0902)': { 'tag': '(0000,0902)', 'vr': 'LO', 'vm': '1', 'name': 'ErrorComment' },
+  '(0000,0903)': { 'tag': '(0000,0903)', 'vr': 'US', 'vm': '1', 'name': 'ErrorID' },
+  '(0000,1000)': { 'tag': '(0000,1000)', 'vr': 'UI', 'vm': '1', 'name': 'AffectedSOPInstanceUID' },
+  '(0000,1001)': { 'tag': '(0000,1001)', 'vr': 'UI', 'vm': '1', 'name': 'RequestedSOPInstanceUID' },
+  '(0000,1002)': { 'tag': '(0000,1002)', 'vr': 'US', 'vm': '1', 'name': 'EventTypeID' },
+  '(0000,1005)': { 'tag': '(0000,1005)', 'vr': 'AT', 'vm': '1-n', 'name': 'AttributeIdentifierList' },
+  '(0000,1008)': { 'tag': '(0000,1008)', 'vr': 'US', 'vm': '1', 'name': 'ActionTypeID' },
+  '(0000,1020)': { 'tag': '(0000,1020)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfRemainingSuboperations' },
+  '(0000,1021)': { 'tag': '(0000,1021)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfCompletedSuboperations' },
+  '(0000,1022)': { 'tag': '(0000,1022)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfFailedSuboperations' },
+  '(0000,1023)': { 'tag': '(0000,1023)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfWarningSuboperations' },
+  '(0000,1030)': { 'tag': '(0000,1030)', 'vr': 'AE', 'vm': '1', 'name': 'MoveOriginatorApplicationEntityTitle' },
+  '(0000,1031)': { 'tag': '(0000,1031)', 'vr': 'US', 'vm': '1', 'name': 'MoveOriginatorMessageID' },
+  '(0000,4000)': { 'tag': '(0000,4000)', 'vr': 'LT', 'vm': '1', 'name': 'DialogReceiver' },
+  '(0000,4010)': { 'tag': '(0000,4010)', 'vr': 'LT', 'vm': '1', 'name': 'TerminalType' },
+  '(0000,5010)': { 'tag': '(0000,5010)', 'vr': 'SH', 'vm': '1', 'name': 'MessageSetID' },
+  '(0000,5020)': { 'tag': '(0000,5020)', 'vr': 'SH', 'vm': '1', 'name': 'EndMessageID' },
+  '(0000,5110)': { 'tag': '(0000,5110)', 'vr': 'LT', 'vm': '1', 'name': 'DisplayFormat' },
+  '(0000,5120)': { 'tag': '(0000,5120)', 'vr': 'LT', 'vm': '1', 'name': 'PagePositionID' },
+  '(0000,5130)': { 'tag': '(0000,5130)', 'vr': 'CS', 'vm': '1', 'name': 'TextFormatID' },
+  '(0000,5140)': { 'tag': '(0000,5140)', 'vr': 'CS', 'vm': '1', 'name': 'NormalReverse' },
+  '(0000,5150)': { 'tag': '(0000,5150)', 'vr': 'CS', 'vm': '1', 'name': 'AddGrayScale' },
+  '(0000,5160)': { 'tag': '(0000,5160)', 'vr': 'CS', 'vm': '1', 'name': 'Borders' },
+  '(0000,5170)': { 'tag': '(0000,5170)', 'vr': 'IS', 'vm': '1', 'name': 'Copies' },
+  '(0000,5180)': { 'tag': '(0000,5180)', 'vr': 'CS', 'vm': '1', 'name': 'CommandMagnificationType' },
+  '(0000,5190)': { 'tag': '(0000,5190)', 'vr': 'CS', 'vm': '1', 'name': 'Erase' },
+  '(0000,51A0)': { 'tag': '(0000,51A0)', 'vr': 'CS', 'vm': '1', 'name': 'Print' },
+  '(0000,51B0)': { 'tag': '(0000,51B0)', 'vr': 'US', 'vm': '1-n', 'name': 'Overlays' },
+  '(0002,0000)': { 'tag': '(0002,0000)', 'vr': 'UL', 'vm': '1', 'name': 'FileMetaInformationGroupLength' },
+  '(0002,0001)': { 'tag': '(0002,0001)', 'vr': 'OB', 'vm': '1', 'name': 'FileMetaInformationVersion' },
+  '(0002,0002)': { 'tag': '(0002,0002)', 'vr': 'UI', 'vm': '1', 'name': 'MediaStorageSOPClassUID' },
+  '(0002,0003)': { 'tag': '(0002,0003)', 'vr': 'UI', 'vm': '1', 'name': 'MediaStorageSOPInstanceUID' },
+  '(0002,0010)': { 'tag': '(0002,0010)', 'vr': 'UI', 'vm': '1', 'name': 'TransferSyntaxUID' },
+  '(0002,0012)': { 'tag': '(0002,0012)', 'vr': 'UI', 'vm': '1', 'name': 'ImplementationClassUID' },
+  '(0002,0013)': { 'tag': '(0002,0013)', 'vr': 'SH', 'vm': '1', 'name': 'ImplementationVersionName' },
+  '(0002,0016)': { 'tag': '(0002,0016)', 'vr': 'AE', 'vm': '1', 'name': 'SourceApplicationEntityTitle' },
+  '(0002,0100)': { 'tag': '(0002,0100)', 'vr': 'UI', 'vm': '1', 'name': 'PrivateInformationCreatorUID' },
+  '(0002,0102)': { 'tag': '(0002,0102)', 'vr': 'OB', 'vm': '1', 'name': 'PrivateInformation' },
+  '(0004,1130)': { 'tag': '(0004,1130)', 'vr': 'CS', 'vm': '1', 'name': 'FileSetID' },
+  '(0004,1141)': { 'tag': '(0004,1141)', 'vr': 'CS', 'vm': '1-8', 'name': 'FileSetDescriptorFileID' },
+  '(0004,1142)': { 'tag': '(0004,1142)', 'vr': 'CS', 'vm': '1', 'name': 'SpecificCharacterSetOfFileSetDescriptorFile' },
+  '(0004,1200)': { 'tag': '(0004,1200)', 'vr': 'UL', 'vm': '1', 'name': 'OffsetOfTheFirstDirectoryRecordOfTheRootDirectoryEntity' },
+  '(0004,1202)': { 'tag': '(0004,1202)', 'vr': 'UL', 'vm': '1', 'name': 'OffsetOfTheLastDirectoryRecordOfTheRootDirectoryEntity' },
+  '(0004,1212)': { 'tag': '(0004,1212)', 'vr': 'US', 'vm': '1', 'name': 'FileSetConsistencyFlag' },
+  '(0004,1220)': { 'tag': '(0004,1220)', 'vr': 'SQ', 'vm': '1', 'name': 'DirectoryRecordSequence' },
+  '(0004,1400)': { 'tag': '(0004,1400)', 'vr': 'UL', 'vm': '1', 'name': 'OffsetOfTheNextDirectoryRecord' },
+  '(0004,1410)': { 'tag': '(0004,1410)', 'vr': 'US', 'vm': '1', 'name': 'RecordInUseFlag' },
+  '(0004,1420)': { 'tag': '(0004,1420)', 'vr': 'UL', 'vm': '1', 'name': 'OffsetOfReferencedLowerLevelDirectoryEntity' },
+  '(0004,1430)': { 'tag': '(0004,1430)', 'vr': 'CS', 'vm': '1', 'name': 'DirectoryRecordType' },
+  '(0004,1432)': { 'tag': '(0004,1432)', 'vr': 'UI', 'vm': '1', 'name': 'PrivateRecordUID' },
+  '(0004,1500)': { 'tag': '(0004,1500)', 'vr': 'CS', 'vm': '1-8', 'name': 'ReferencedFileID' },
+  '(0004,1504)': { 'tag': '(0004,1504)', 'vr': 'UL', 'vm': '1', 'name': 'MRDRDirectoryRecordOffset' },
+  '(0004,1510)': { 'tag': '(0004,1510)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedSOPClassUIDInFile' },
+  '(0004,1511)': { 'tag': '(0004,1511)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedSOPInstanceUIDInFile' },
+  '(0004,1512)': { 'tag': '(0004,1512)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedTransferSyntaxUIDInFile' },
+  '(0004,151A)': { 'tag': '(0004,151A)', 'vr': 'UI', 'vm': '1-n', 'name': 'ReferencedRelatedGeneralSOPClassUIDInFile' },
+  '(0004,1600)': { 'tag': '(0004,1600)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfReferences' },
+  '(0008,0001)': { 'tag': '(0008,0001)', 'vr': 'UL', 'vm': '1', 'name': 'LengthToEnd' },
+  '(0008,0005)': { 'tag': '(0008,0005)', 'vr': 'CS', 'vm': '1-n', 'name': 'SpecificCharacterSet' },
+  '(0008,0006)': { 'tag': '(0008,0006)', 'vr': 'SQ', 'vm': '1', 'name': 'LanguageCodeSequence' },
+  '(0008,0008)': { 'tag': '(0008,0008)', 'vr': 'CS', 'vm': '2-n', 'name': 'ImageType' },
+  '(0008,0010)': { 'tag': '(0008,0010)', 'vr': 'SH', 'vm': '1', 'name': 'RecognitionCode' },
+  '(0008,0012)': { 'tag': '(0008,0012)', 'vr': 'DA', 'vm': '1', 'name': 'InstanceCreationDate' },
+  '(0008,0013)': { 'tag': '(0008,0013)', 'vr': 'TM', 'vm': '1', 'name': 'InstanceCreationTime' },
+  '(0008,0014)': { 'tag': '(0008,0014)', 'vr': 'UI', 'vm': '1', 'name': 'InstanceCreatorUID' },
+  '(0008,0016)': { 'tag': '(0008,0016)', 'vr': 'UI', 'vm': '1', 'name': 'SOPClassUID' },
+  '(0008,0018)': { 'tag': '(0008,0018)', 'vr': 'UI', 'vm': '1', 'name': 'SOPInstanceUID' },
+  '(0008,001A)': { 'tag': '(0008,001A)', 'vr': 'UI', 'vm': '1-n', 'name': 'RelatedGeneralSOPClassUID' },
+  '(0008,001B)': { 'tag': '(0008,001B)', 'vr': 'UI', 'vm': '1', 'name': 'OriginalSpecializedSOPClassUID' },
+  '(0008,0020)': { 'tag': '(0008,0020)', 'vr': 'DA', 'vm': '1', 'name': 'StudyDate' },
+  '(0008,0021)': { 'tag': '(0008,0021)', 'vr': 'DA', 'vm': '1', 'name': 'SeriesDate' },
+  '(0008,0022)': { 'tag': '(0008,0022)', 'vr': 'DA', 'vm': '1', 'name': 'AcquisitionDate' },
+  '(0008,0023)': { 'tag': '(0008,0023)', 'vr': 'DA', 'vm': '1', 'name': 'ContentDate' },
+  '(0008,0024)': { 'tag': '(0008,0024)', 'vr': 'DA', 'vm': '1', 'name': 'OverlayDate' },
+  '(0008,0025)': { 'tag': '(0008,0025)', 'vr': 'DA', 'vm': '1', 'name': 'CurveDate' },
+  '(0008,002A)': { 'tag': '(0008,002A)', 'vr': 'DT', 'vm': '1', 'name': 'AcquisitionDateTime' },
+  '(0008,0030)': { 'tag': '(0008,0030)', 'vr': 'TM', 'vm': '1', 'name': 'StudyTime' },
+  '(0008,0031)': { 'tag': '(0008,0031)', 'vr': 'TM', 'vm': '1', 'name': 'SeriesTime' },
+  '(0008,0032)': { 'tag': '(0008,0032)', 'vr': 'TM', 'vm': '1', 'name': 'AcquisitionTime' },
+  '(0008,0033)': { 'tag': '(0008,0033)', 'vr': 'TM', 'vm': '1', 'name': 'ContentTime' },
+  '(0008,0034)': { 'tag': '(0008,0034)', 'vr': 'TM', 'vm': '1', 'name': 'OverlayTime' },
+  '(0008,0035)': { 'tag': '(0008,0035)', 'vr': 'TM', 'vm': '1', 'name': 'CurveTime' },
+  '(0008,0040)': { 'tag': '(0008,0040)', 'vr': 'US', 'vm': '1', 'name': 'DataSetType' },
+  '(0008,0041)': { 'tag': '(0008,0041)', 'vr': 'LO', 'vm': '1', 'name': 'DataSetSubtype' },
+  '(0008,0042)': { 'tag': '(0008,0042)', 'vr': 'CS', 'vm': '1', 'name': 'NuclearMedicineSeriesType' },
+  '(0008,0050)': { 'tag': '(0008,0050)', 'vr': 'SH', 'vm': '1', 'name': 'AccessionNumber' },
+  '(0008,0051)': { 'tag': '(0008,0051)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfAccessionNumberSequence' },
+  '(0008,0052)': { 'tag': '(0008,0052)', 'vr': 'CS', 'vm': '1', 'name': 'QueryRetrieveLevel' },
+  '(0008,0054)': { 'tag': '(0008,0054)', 'vr': 'AE', 'vm': '1-n', 'name': 'RetrieveAETitle' },
+  '(0008,0056)': { 'tag': '(0008,0056)', 'vr': 'CS', 'vm': '1', 'name': 'InstanceAvailability' },
+  '(0008,0058)': { 'tag': '(0008,0058)', 'vr': 'UI', 'vm': '1-n', 'name': 'FailedSOPInstanceUIDList' },
+  '(0008,0060)': { 'tag': '(0008,0060)', 'vr': 'CS', 'vm': '1', 'name': 'Modality' },
+  '(0008,0061)': { 'tag': '(0008,0061)', 'vr': 'CS', 'vm': '1-n', 'name': 'ModalitiesInStudy' },
+  '(0008,0062)': { 'tag': '(0008,0062)', 'vr': 'UI', 'vm': '1-n', 'name': 'SOPClassesInStudy' },
+  '(0008,0064)': { 'tag': '(0008,0064)', 'vr': 'CS', 'vm': '1', 'name': 'ConversionType' },
+  '(0008,0068)': { 'tag': '(0008,0068)', 'vr': 'CS', 'vm': '1', 'name': 'PresentationIntentType' },
+  '(0008,0070)': { 'tag': '(0008,0070)', 'vr': 'LO', 'vm': '1', 'name': 'Manufacturer' },
+  '(0008,0080)': { 'tag': '(0008,0080)', 'vr': 'LO', 'vm': '1', 'name': 'InstitutionName' },
+  '(0008,0081)': { 'tag': '(0008,0081)', 'vr': 'ST', 'vm': '1', 'name': 'InstitutionAddress' },
+  '(0008,0082)': { 'tag': '(0008,0082)', 'vr': 'SQ', 'vm': '1', 'name': 'InstitutionCodeSequence' },
+  '(0008,0090)': { 'tag': '(0008,0090)', 'vr': 'PN', 'vm': '1', 'name': 'ReferringPhysicianName' },
+  '(0008,0092)': { 'tag': '(0008,0092)', 'vr': 'ST', 'vm': '1', 'name': 'ReferringPhysicianAddress' },
+  '(0008,0094)': { 'tag': '(0008,0094)', 'vr': 'SH', 'vm': '1-n', 'name': 'ReferringPhysicianTelephoneNumbers' },
+  '(0008,0096)': { 'tag': '(0008,0096)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferringPhysicianIdentificationSequence' },
+  '(0008,0100)': { 'tag': '(0008,0100)', 'vr': 'SH', 'vm': '1', 'name': 'CodeValue' },
+  '(0008,0102)': { 'tag': '(0008,0102)', 'vr': 'SH', 'vm': '1', 'name': 'CodingSchemeDesignator' },
+  '(0008,0103)': { 'tag': '(0008,0103)', 'vr': 'SH', 'vm': '1', 'name': 'CodingSchemeVersion' },
+  '(0008,0104)': { 'tag': '(0008,0104)', 'vr': 'LO', 'vm': '1', 'name': 'CodeMeaning' },
+  '(0008,0105)': { 'tag': '(0008,0105)', 'vr': 'CS', 'vm': '1', 'name': 'MappingResource' },
+  '(0008,0106)': { 'tag': '(0008,0106)', 'vr': 'DT', 'vm': '1', 'name': 'ContextGroupVersion' },
+  '(0008,0107)': { 'tag': '(0008,0107)', 'vr': 'DT', 'vm': '1', 'name': 'ContextGroupLocalVersion' },
+  '(0008,010B)': { 'tag': '(0008,010B)', 'vr': 'CS', 'vm': '1', 'name': 'ContextGroupExtensionFlag' },
+  '(0008,010C)': { 'tag': '(0008,010C)', 'vr': 'UI', 'vm': '1', 'name': 'CodingSchemeUID' },
+  '(0008,010D)': { 'tag': '(0008,010D)', 'vr': 'UI', 'vm': '1', 'name': 'ContextGroupExtensionCreatorUID' },
+  '(0008,010F)': { 'tag': '(0008,010F)', 'vr': 'CS', 'vm': '1', 'name': 'ContextIdentifier' },
+  '(0008,0110)': { 'tag': '(0008,0110)', 'vr': 'SQ', 'vm': '1', 'name': 'CodingSchemeIdentificationSequence' },
+  '(0008,0112)': { 'tag': '(0008,0112)', 'vr': 'LO', 'vm': '1', 'name': 'CodingSchemeRegistry' },
+  '(0008,0114)': { 'tag': '(0008,0114)', 'vr': 'ST', 'vm': '1', 'name': 'CodingSchemeExternalID' },
+  '(0008,0115)': { 'tag': '(0008,0115)', 'vr': 'ST', 'vm': '1', 'name': 'CodingSchemeName' },
+  '(0008,0116)': { 'tag': '(0008,0116)', 'vr': 'ST', 'vm': '1', 'name': 'CodingSchemeResponsibleOrganization' },
+  '(0008,0117)': { 'tag': '(0008,0117)', 'vr': 'UI', 'vm': '1', 'name': 'ContextUID' },
+  '(0008,0201)': { 'tag': '(0008,0201)', 'vr': 'SH', 'vm': '1', 'name': 'TimezoneOffsetFromUTC' },
+  '(0008,1000)': { 'tag': '(0008,1000)', 'vr': 'AE', 'vm': '1', 'name': 'NetworkID' },
+  '(0008,1010)': { 'tag': '(0008,1010)', 'vr': 'SH', 'vm': '1', 'name': 'StationName' },
+  '(0008,1030)': { 'tag': '(0008,1030)', 'vr': 'LO', 'vm': '1', 'name': 'StudyDescription' },
+  '(0008,1032)': { 'tag': '(0008,1032)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureCodeSequence' },
+  '(0008,103E)': { 'tag': '(0008,103E)', 'vr': 'LO', 'vm': '1', 'name': 'SeriesDescription' },
+  '(0008,103F)': { 'tag': '(0008,103F)', 'vr': 'SQ', 'vm': '1', 'name': 'SeriesDescriptionCodeSequence' },
+  '(0008,1040)': { 'tag': '(0008,1040)', 'vr': 'LO', 'vm': '1', 'name': 'InstitutionalDepartmentName' },
+  '(0008,1048)': { 'tag': '(0008,1048)', 'vr': 'PN', 'vm': '1-n', 'name': 'PhysiciansOfRecord' },
+  '(0008,1049)': { 'tag': '(0008,1049)', 'vr': 'SQ', 'vm': '1', 'name': 'PhysiciansOfRecordIdentificationSequence' },
+  '(0008,1050)': { 'tag': '(0008,1050)', 'vr': 'PN', 'vm': '1-n', 'name': 'PerformingPhysicianName' },
+  '(0008,1052)': { 'tag': '(0008,1052)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformingPhysicianIdentificationSequence' },
+  '(0008,1060)': { 'tag': '(0008,1060)', 'vr': 'PN', 'vm': '1-n', 'name': 'NameOfPhysiciansReadingStudy' },
+  '(0008,1062)': { 'tag': '(0008,1062)', 'vr': 'SQ', 'vm': '1', 'name': 'PhysiciansReadingStudyIdentificationSequence' },
+  '(0008,1070)': { 'tag': '(0008,1070)', 'vr': 'PN', 'vm': '1-n', 'name': 'OperatorsName' },
+  '(0008,1072)': { 'tag': '(0008,1072)', 'vr': 'SQ', 'vm': '1', 'name': 'OperatorIdentificationSequence' },
+  '(0008,1080)': { 'tag': '(0008,1080)', 'vr': 'LO', 'vm': '1-n', 'name': 'AdmittingDiagnosesDescription' },
+  '(0008,1084)': { 'tag': '(0008,1084)', 'vr': 'SQ', 'vm': '1', 'name': 'AdmittingDiagnosesCodeSequence' },
+  '(0008,1090)': { 'tag': '(0008,1090)', 'vr': 'LO', 'vm': '1', 'name': 'ManufacturerModelName' },
+  '(0008,1100)': { 'tag': '(0008,1100)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedResultsSequence' },
+  '(0008,1110)': { 'tag': '(0008,1110)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedStudySequence' },
+  '(0008,1111)': { 'tag': '(0008,1111)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPerformedProcedureStepSequence' },
+  '(0008,1115)': { 'tag': '(0008,1115)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSeriesSequence' },
+  '(0008,1120)': { 'tag': '(0008,1120)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPatientSequence' },
+  '(0008,1125)': { 'tag': '(0008,1125)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedVisitSequence' },
+  '(0008,1130)': { 'tag': '(0008,1130)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedOverlaySequence' },
+  '(0008,1134)': { 'tag': '(0008,1134)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedStereometricInstanceSequence' },
+  '(0008,113A)': { 'tag': '(0008,113A)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedWaveformSequence' },
+  '(0008,1140)': { 'tag': '(0008,1140)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageSequence' },
+  '(0008,1145)': { 'tag': '(0008,1145)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedCurveSequence' },
+  '(0008,114A)': { 'tag': '(0008,114A)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedInstanceSequence' },
+  '(0008,114B)': { 'tag': '(0008,114B)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedRealWorldValueMappingInstanceSequence' },
+  '(0008,1150)': { 'tag': '(0008,1150)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedSOPClassUID' },
+  '(0008,1155)': { 'tag': '(0008,1155)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedSOPInstanceUID' },
+  '(0008,115A)': { 'tag': '(0008,115A)', 'vr': 'UI', 'vm': '1-n', 'name': 'SOPClassesSupported' },
+  '(0008,1160)': { 'tag': '(0008,1160)', 'vr': 'IS', 'vm': '1-n', 'name': 'ReferencedFrameNumber' },
+  '(0008,1161)': { 'tag': '(0008,1161)', 'vr': 'UL', 'vm': '1-n', 'name': 'SimpleFrameList' },
+  '(0008,1162)': { 'tag': '(0008,1162)', 'vr': 'UL', 'vm': '3-3n', 'name': 'CalculatedFrameList' },
+  '(0008,1163)': { 'tag': '(0008,1163)', 'vr': 'FD', 'vm': '2', 'name': 'TimeRange' },
+  '(0008,1164)': { 'tag': '(0008,1164)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameExtractionSequence' },
+  '(0008,1167)': { 'tag': '(0008,1167)', 'vr': 'UI', 'vm': '1', 'name': 'MultiFrameSourceSOPInstanceUID' },
+  '(0008,1195)': { 'tag': '(0008,1195)', 'vr': 'UI', 'vm': '1', 'name': 'TransactionUID' },
+  '(0008,1197)': { 'tag': '(0008,1197)', 'vr': 'US', 'vm': '1', 'name': 'FailureReason' },
+  '(0008,1198)': { 'tag': '(0008,1198)', 'vr': 'SQ', 'vm': '1', 'name': 'FailedSOPSequence' },
+  '(0008,1199)': { 'tag': '(0008,1199)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSOPSequence' },
+  '(0008,1200)': { 'tag': '(0008,1200)', 'vr': 'SQ', 'vm': '1', 'name': 'StudiesContainingOtherReferencedInstancesSequence' },
+  '(0008,1250)': { 'tag': '(0008,1250)', 'vr': 'SQ', 'vm': '1', 'name': 'RelatedSeriesSequence' },
+  '(0008,2110)': { 'tag': '(0008,2110)', 'vr': 'CS', 'vm': '1', 'name': 'LossyImageCompressionRetired' },
+  '(0008,2111)': { 'tag': '(0008,2111)', 'vr': 'ST', 'vm': '1', 'name': 'DerivationDescription' },
+  '(0008,2112)': { 'tag': '(0008,2112)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceImageSequence' },
+  '(0008,2120)': { 'tag': '(0008,2120)', 'vr': 'SH', 'vm': '1', 'name': 'StageName' },
+  '(0008,2122)': { 'tag': '(0008,2122)', 'vr': 'IS', 'vm': '1', 'name': 'StageNumber' },
+  '(0008,2124)': { 'tag': '(0008,2124)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfStages' },
+  '(0008,2127)': { 'tag': '(0008,2127)', 'vr': 'SH', 'vm': '1', 'name': 'ViewName' },
+  '(0008,2128)': { 'tag': '(0008,2128)', 'vr': 'IS', 'vm': '1', 'name': 'ViewNumber' },
+  '(0008,2129)': { 'tag': '(0008,2129)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfEventTimers' },
+  '(0008,212A)': { 'tag': '(0008,212A)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfViewsInStage' },
+  '(0008,2130)': { 'tag': '(0008,2130)', 'vr': 'DS', 'vm': '1-n', 'name': 'EventElapsedTimes' },
+  '(0008,2132)': { 'tag': '(0008,2132)', 'vr': 'LO', 'vm': '1-n', 'name': 'EventTimerNames' },
+  '(0008,2133)': { 'tag': '(0008,2133)', 'vr': 'SQ', 'vm': '1', 'name': 'EventTimerSequence' },
+  '(0008,2134)': { 'tag': '(0008,2134)', 'vr': 'FD', 'vm': '1', 'name': 'EventTimeOffset' },
+  '(0008,2135)': { 'tag': '(0008,2135)', 'vr': 'SQ', 'vm': '1', 'name': 'EventCodeSequence' },
+  '(0008,2142)': { 'tag': '(0008,2142)', 'vr': 'IS', 'vm': '1', 'name': 'StartTrim' },
+  '(0008,2143)': { 'tag': '(0008,2143)', 'vr': 'IS', 'vm': '1', 'name': 'StopTrim' },
+  '(0008,2144)': { 'tag': '(0008,2144)', 'vr': 'IS', 'vm': '1', 'name': 'RecommendedDisplayFrameRate' },
+  '(0008,2200)': { 'tag': '(0008,2200)', 'vr': 'CS', 'vm': '1', 'name': 'TransducerPosition' },
+  '(0008,2204)': { 'tag': '(0008,2204)', 'vr': 'CS', 'vm': '1', 'name': 'TransducerOrientation' },
+  '(0008,2208)': { 'tag': '(0008,2208)', 'vr': 'CS', 'vm': '1', 'name': 'AnatomicStructure' },
+  '(0008,2218)': { 'tag': '(0008,2218)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicRegionSequence' },
+  '(0008,2220)': { 'tag': '(0008,2220)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicRegionModifierSequence' },
+  '(0008,2228)': { 'tag': '(0008,2228)', 'vr': 'SQ', 'vm': '1', 'name': 'PrimaryAnatomicStructureSequence' },
+  '(0008,2229)': { 'tag': '(0008,2229)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicStructureSpaceOrRegionSequence' },
+  '(0008,2230)': { 'tag': '(0008,2230)', 'vr': 'SQ', 'vm': '1', 'name': 'PrimaryAnatomicStructureModifierSequence' },
+  '(0008,2240)': { 'tag': '(0008,2240)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerPositionSequence' },
+  '(0008,2242)': { 'tag': '(0008,2242)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerPositionModifierSequence' },
+  '(0008,2244)': { 'tag': '(0008,2244)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerOrientationSequence' },
+  '(0008,2246)': { 'tag': '(0008,2246)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerOrientationModifierSequence' },
+  '(0008,2251)': { 'tag': '(0008,2251)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicStructureSpaceOrRegionCodeSequenceTrial' },
+  '(0008,2253)': { 'tag': '(0008,2253)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicPortalOfEntranceCodeSequenceTrial' },
+  '(0008,2255)': { 'tag': '(0008,2255)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicApproachDirectionCodeSequenceTrial' },
+  '(0008,2256)': { 'tag': '(0008,2256)', 'vr': 'ST', 'vm': '1', 'name': 'AnatomicPerspectiveDescriptionTrial' },
+  '(0008,2257)': { 'tag': '(0008,2257)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicPerspectiveCodeSequenceTrial' },
+  '(0008,2258)': { 'tag': '(0008,2258)', 'vr': 'ST', 'vm': '1', 'name': 'AnatomicLocationOfExaminingInstrumentDescriptionTrial' },
+  '(0008,2259)': { 'tag': '(0008,2259)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicLocationOfExaminingInstrumentCodeSequenceTrial' },
+  '(0008,225A)': { 'tag': '(0008,225A)', 'vr': 'SQ', 'vm': '1', 'name': 'AnatomicStructureSpaceOrRegionModifierCodeSequenceTrial' },
+  '(0008,225C)': { 'tag': '(0008,225C)', 'vr': 'SQ', 'vm': '1', 'name': 'OnAxisBackgroundAnatomicStructureCodeSequenceTrial' },
+  '(0008,3001)': { 'tag': '(0008,3001)', 'vr': 'SQ', 'vm': '1', 'name': 'AlternateRepresentationSequence' },
+  '(0008,3010)': { 'tag': '(0008,3010)', 'vr': 'UI', 'vm': '1', 'name': 'IrradiationEventUID' },
+  '(0008,4000)': { 'tag': '(0008,4000)', 'vr': 'LT', 'vm': '1', 'name': 'IdentifyingComments' },
+  '(0008,9007)': { 'tag': '(0008,9007)', 'vr': 'CS', 'vm': '4', 'name': 'FrameType' },
+  '(0008,9092)': { 'tag': '(0008,9092)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageEvidenceSequence' },
+  '(0008,9121)': { 'tag': '(0008,9121)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedRawDataSequence' },
+  '(0008,9123)': { 'tag': '(0008,9123)', 'vr': 'UI', 'vm': '1', 'name': 'CreatorVersionUID' },
+  '(0008,9124)': { 'tag': '(0008,9124)', 'vr': 'SQ', 'vm': '1', 'name': 'DerivationImageSequence' },
+  '(0008,9154)': { 'tag': '(0008,9154)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceImageEvidenceSequence' },
+  '(0008,9205)': { 'tag': '(0008,9205)', 'vr': 'CS', 'vm': '1', 'name': 'PixelPresentation' },
+  '(0008,9206)': { 'tag': '(0008,9206)', 'vr': 'CS', 'vm': '1', 'name': 'VolumetricProperties' },
+  '(0008,9207)': { 'tag': '(0008,9207)', 'vr': 'CS', 'vm': '1', 'name': 'VolumeBasedCalculationTechnique' },
+  '(0008,9208)': { 'tag': '(0008,9208)', 'vr': 'CS', 'vm': '1', 'name': 'ComplexImageComponent' },
+  '(0008,9209)': { 'tag': '(0008,9209)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionContrast' },
+  '(0008,9215)': { 'tag': '(0008,9215)', 'vr': 'SQ', 'vm': '1', 'name': 'DerivationCodeSequence' },
+  '(0008,9237)': { 'tag': '(0008,9237)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPresentationStateSequence' },
+  '(0008,9410)': { 'tag': '(0008,9410)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedOtherPlaneSequence' },
+  '(0008,9458)': { 'tag': '(0008,9458)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameDisplaySequence' },
+  '(0008,9459)': { 'tag': '(0008,9459)', 'vr': 'FL', 'vm': '1', 'name': 'RecommendedDisplayFrameRateInFloat' },
+  '(0008,9460)': { 'tag': '(0008,9460)', 'vr': 'CS', 'vm': '1', 'name': 'SkipFrameRangeFlag' },
+  '(0010,0010)': { 'tag': '(0010,0010)', 'vr': 'PN', 'vm': '1', 'name': 'PatientName' },
+  '(0010,0020)': { 'tag': '(0010,0020)', 'vr': 'LO', 'vm': '1', 'name': 'PatientID' },
+  '(0010,0021)': { 'tag': '(0010,0021)', 'vr': 'LO', 'vm': '1', 'name': 'IssuerOfPatientID' },
+  '(0010,0022)': { 'tag': '(0010,0022)', 'vr': 'CS', 'vm': '1', 'name': 'TypeOfPatientID' },
+  '(0010,0024)': { 'tag': '(0010,0024)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfPatientIDQualifiersSequence' },
+  '(0010,0030)': { 'tag': '(0010,0030)', 'vr': 'DA', 'vm': '1', 'name': 'PatientBirthDate' },
+  '(0010,0032)': { 'tag': '(0010,0032)', 'vr': 'TM', 'vm': '1', 'name': 'PatientBirthTime' },
+  '(0010,0040)': { 'tag': '(0010,0040)', 'vr': 'CS', 'vm': '1', 'name': 'PatientSex' },
+  '(0010,0050)': { 'tag': '(0010,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientInsurancePlanCodeSequence' },
+  '(0010,0101)': { 'tag': '(0010,0101)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientPrimaryLanguageCodeSequence' },
+  '(0010,0102)': { 'tag': '(0010,0102)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientPrimaryLanguageModifierCodeSequence' },
+  '(0010,1000)': { 'tag': '(0010,1000)', 'vr': 'LO', 'vm': '1-n', 'name': 'OtherPatientIDs' },
+  '(0010,1001)': { 'tag': '(0010,1001)', 'vr': 'PN', 'vm': '1-n', 'name': 'OtherPatientNames' },
+  '(0010,1002)': { 'tag': '(0010,1002)', 'vr': 'SQ', 'vm': '1', 'name': 'OtherPatientIDsSequence' },
+  '(0010,1005)': { 'tag': '(0010,1005)', 'vr': 'PN', 'vm': '1', 'name': 'PatientBirthName' },
+  '(0010,1010)': { 'tag': '(0010,1010)', 'vr': 'AS', 'vm': '1', 'name': 'PatientAge' },
+  '(0010,1020)': { 'tag': '(0010,1020)', 'vr': 'DS', 'vm': '1', 'name': 'PatientSize' },
+  '(0010,1021)': { 'tag': '(0010,1021)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientSizeCodeSequence' },
+  '(0010,1030)': { 'tag': '(0010,1030)', 'vr': 'DS', 'vm': '1', 'name': 'PatientWeight' },
+  '(0010,1040)': { 'tag': '(0010,1040)', 'vr': 'LO', 'vm': '1', 'name': 'PatientAddress' },
+  '(0010,1050)': { 'tag': '(0010,1050)', 'vr': 'LO', 'vm': '1-n', 'name': 'InsurancePlanIdentification' },
+  '(0010,1060)': { 'tag': '(0010,1060)', 'vr': 'PN', 'vm': '1', 'name': 'PatientMotherBirthName' },
+  '(0010,1080)': { 'tag': '(0010,1080)', 'vr': 'LO', 'vm': '1', 'name': 'MilitaryRank' },
+  '(0010,1081)': { 'tag': '(0010,1081)', 'vr': 'LO', 'vm': '1', 'name': 'BranchOfService' },
+  '(0010,1090)': { 'tag': '(0010,1090)', 'vr': 'LO', 'vm': '1', 'name': 'MedicalRecordLocator' },
+  '(0010,2000)': { 'tag': '(0010,2000)', 'vr': 'LO', 'vm': '1-n', 'name': 'MedicalAlerts' },
+  '(0010,2110)': { 'tag': '(0010,2110)', 'vr': 'LO', 'vm': '1-n', 'name': 'Allergies' },
+  '(0010,2150)': { 'tag': '(0010,2150)', 'vr': 'LO', 'vm': '1', 'name': 'CountryOfResidence' },
+  '(0010,2152)': { 'tag': '(0010,2152)', 'vr': 'LO', 'vm': '1', 'name': 'RegionOfResidence' },
+  '(0010,2154)': { 'tag': '(0010,2154)', 'vr': 'SH', 'vm': '1-n', 'name': 'PatientTelephoneNumbers' },
+  '(0010,2160)': { 'tag': '(0010,2160)', 'vr': 'SH', 'vm': '1', 'name': 'EthnicGroup' },
+  '(0010,2180)': { 'tag': '(0010,2180)', 'vr': 'SH', 'vm': '1', 'name': 'Occupation' },
+  '(0010,21A0)': { 'tag': '(0010,21A0)', 'vr': 'CS', 'vm': '1', 'name': 'SmokingStatus' },
+  '(0010,21B0)': { 'tag': '(0010,21B0)', 'vr': 'LT', 'vm': '1', 'name': 'AdditionalPatientHistory' },
+  '(0010,21C0)': { 'tag': '(0010,21C0)', 'vr': 'US', 'vm': '1', 'name': 'PregnancyStatus' },
+  '(0010,21D0)': { 'tag': '(0010,21D0)', 'vr': 'DA', 'vm': '1', 'name': 'LastMenstrualDate' },
+  '(0010,21F0)': { 'tag': '(0010,21F0)', 'vr': 'LO', 'vm': '1', 'name': 'PatientReligiousPreference' },
+  '(0010,2201)': { 'tag': '(0010,2201)', 'vr': 'LO', 'vm': '1', 'name': 'PatientSpeciesDescription' },
+  '(0010,2202)': { 'tag': '(0010,2202)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientSpeciesCodeSequence' },
+  '(0010,2203)': { 'tag': '(0010,2203)', 'vr': 'CS', 'vm': '1', 'name': 'PatientSexNeutered' },
+  '(0010,2210)': { 'tag': '(0010,2210)', 'vr': 'CS', 'vm': '1', 'name': 'AnatomicalOrientationType' },
+  '(0010,2292)': { 'tag': '(0010,2292)', 'vr': 'LO', 'vm': '1', 'name': 'PatientBreedDescription' },
+  '(0010,2293)': { 'tag': '(0010,2293)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientBreedCodeSequence' },
+  '(0010,2294)': { 'tag': '(0010,2294)', 'vr': 'SQ', 'vm': '1', 'name': 'BreedRegistrationSequence' },
+  '(0010,2295)': { 'tag': '(0010,2295)', 'vr': 'LO', 'vm': '1', 'name': 'BreedRegistrationNumber' },
+  '(0010,2296)': { 'tag': '(0010,2296)', 'vr': 'SQ', 'vm': '1', 'name': 'BreedRegistryCodeSequence' },
+  '(0010,2297)': { 'tag': '(0010,2297)', 'vr': 'PN', 'vm': '1', 'name': 'ResponsiblePerson' },
+  '(0010,2298)': { 'tag': '(0010,2298)', 'vr': 'CS', 'vm': '1', 'name': 'ResponsiblePersonRole' },
+  '(0010,2299)': { 'tag': '(0010,2299)', 'vr': 'LO', 'vm': '1', 'name': 'ResponsibleOrganization' },
+  '(0010,4000)': { 'tag': '(0010,4000)', 'vr': 'LT', 'vm': '1', 'name': 'PatientComments' },
+  '(0010,9431)': { 'tag': '(0010,9431)', 'vr': 'FL', 'vm': '1', 'name': 'ExaminedBodyThickness' },
+  '(0012,0010)': { 'tag': '(0012,0010)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSponsorName' },
+  '(0012,0020)': { 'tag': '(0012,0020)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialProtocolID' },
+  '(0012,0021)': { 'tag': '(0012,0021)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialProtocolName' },
+  '(0012,0030)': { 'tag': '(0012,0030)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSiteID' },
+  '(0012,0031)': { 'tag': '(0012,0031)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSiteName' },
+  '(0012,0040)': { 'tag': '(0012,0040)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSubjectID' },
+  '(0012,0042)': { 'tag': '(0012,0042)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSubjectReadingID' },
+  '(0012,0050)': { 'tag': '(0012,0050)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialTimePointID' },
+  '(0012,0051)': { 'tag': '(0012,0051)', 'vr': 'ST', 'vm': '1', 'name': 'ClinicalTrialTimePointDescription' },
+  '(0012,0060)': { 'tag': '(0012,0060)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialCoordinatingCenterName' },
+  '(0012,0062)': { 'tag': '(0012,0062)', 'vr': 'CS', 'vm': '1', 'name': 'PatientIdentityRemoved' },
+  '(0012,0063)': { 'tag': '(0012,0063)', 'vr': 'LO', 'vm': '1-n', 'name': 'DeidentificationMethod' },
+  '(0012,0064)': { 'tag': '(0012,0064)', 'vr': 'SQ', 'vm': '1', 'name': 'DeidentificationMethodCodeSequence' },
+  '(0012,0071)': { 'tag': '(0012,0071)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSeriesID' },
+  '(0012,0072)': { 'tag': '(0012,0072)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialSeriesDescription' },
+  '(0012,0081)': { 'tag': '(0012,0081)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialProtocolEthicsCommitteeName' },
+  '(0012,0082)': { 'tag': '(0012,0082)', 'vr': 'LO', 'vm': '1', 'name': 'ClinicalTrialProtocolEthicsCommitteeApprovalNumber' },
+  '(0012,0083)': { 'tag': '(0012,0083)', 'vr': 'SQ', 'vm': '1', 'name': 'ConsentForClinicalTrialUseSequence' },
+  '(0012,0084)': { 'tag': '(0012,0084)', 'vr': 'CS', 'vm': '1', 'name': 'DistributionType' },
+  '(0012,0085)': { 'tag': '(0012,0085)', 'vr': 'CS', 'vm': '1', 'name': 'ConsentForDistributionFlag' },
+  '(0014,0023)': { 'tag': '(0014,0023)', 'vr': 'ST', 'vm': '1-n', 'name': 'CADFileFormat' },
+  '(0014,0024)': { 'tag': '(0014,0024)', 'vr': 'ST', 'vm': '1-n', 'name': 'ComponentReferenceSystem' },
+  '(0014,0025)': { 'tag': '(0014,0025)', 'vr': 'ST', 'vm': '1-n', 'name': 'ComponentManufacturingProcedure' },
+  '(0014,0028)': { 'tag': '(0014,0028)', 'vr': 'ST', 'vm': '1-n', 'name': 'ComponentManufacturer' },
+  '(0014,0030)': { 'tag': '(0014,0030)', 'vr': 'DS', 'vm': '1-n', 'name': 'MaterialThickness' },
+  '(0014,0032)': { 'tag': '(0014,0032)', 'vr': 'DS', 'vm': '1-n', 'name': 'MaterialPipeDiameter' },
+  '(0014,0034)': { 'tag': '(0014,0034)', 'vr': 'DS', 'vm': '1-n', 'name': 'MaterialIsolationDiameter' },
+  '(0014,0042)': { 'tag': '(0014,0042)', 'vr': 'ST', 'vm': '1-n', 'name': 'MaterialGrade' },
+  '(0014,0044)': { 'tag': '(0014,0044)', 'vr': 'ST', 'vm': '1-n', 'name': 'MaterialPropertiesFileID' },
+  '(0014,0045)': { 'tag': '(0014,0045)', 'vr': 'ST', 'vm': '1-n', 'name': 'MaterialPropertiesFileFormat' },
+  '(0014,0046)': { 'tag': '(0014,0046)', 'vr': 'LT', 'vm': '1', 'name': 'MaterialNotes' },
+  '(0014,0050)': { 'tag': '(0014,0050)', 'vr': 'CS', 'vm': '1', 'name': 'ComponentShape' },
+  '(0014,0052)': { 'tag': '(0014,0052)', 'vr': 'CS', 'vm': '1', 'name': 'CurvatureType' },
+  '(0014,0054)': { 'tag': '(0014,0054)', 'vr': 'DS', 'vm': '1', 'name': 'OuterDiameter' },
+  '(0014,0056)': { 'tag': '(0014,0056)', 'vr': 'DS', 'vm': '1', 'name': 'InnerDiameter' },
+  '(0014,1010)': { 'tag': '(0014,1010)', 'vr': 'ST', 'vm': '1', 'name': 'ActualEnvironmentalConditions' },
+  '(0014,1020)': { 'tag': '(0014,1020)', 'vr': 'DA', 'vm': '1', 'name': 'ExpiryDate' },
+  '(0014,1040)': { 'tag': '(0014,1040)', 'vr': 'ST', 'vm': '1', 'name': 'EnvironmentalConditions' },
+  '(0014,2002)': { 'tag': '(0014,2002)', 'vr': 'SQ', 'vm': '1', 'name': 'EvaluatorSequence' },
+  '(0014,2004)': { 'tag': '(0014,2004)', 'vr': 'IS', 'vm': '1', 'name': 'EvaluatorNumber' },
+  '(0014,2006)': { 'tag': '(0014,2006)', 'vr': 'PN', 'vm': '1', 'name': 'EvaluatorName' },
+  '(0014,2008)': { 'tag': '(0014,2008)', 'vr': 'IS', 'vm': '1', 'name': 'EvaluationAttempt' },
+  '(0014,2012)': { 'tag': '(0014,2012)', 'vr': 'SQ', 'vm': '1', 'name': 'IndicationSequence' },
+  '(0014,2014)': { 'tag': '(0014,2014)', 'vr': 'IS', 'vm': '1', 'name': 'IndicationNumber ' },
+  '(0014,2016)': { 'tag': '(0014,2016)', 'vr': 'SH', 'vm': '1', 'name': 'IndicationLabel' },
+  '(0014,2018)': { 'tag': '(0014,2018)', 'vr': 'ST', 'vm': '1', 'name': 'IndicationDescription' },
+  '(0014,201A)': { 'tag': '(0014,201A)', 'vr': 'CS', 'vm': '1-n', 'name': 'IndicationType' },
+  '(0014,201C)': { 'tag': '(0014,201C)', 'vr': 'CS', 'vm': '1', 'name': 'IndicationDisposition' },
+  '(0014,201E)': { 'tag': '(0014,201E)', 'vr': 'SQ', 'vm': '1', 'name': 'IndicationROISequence' },
+  '(0014,2030)': { 'tag': '(0014,2030)', 'vr': 'SQ', 'vm': '1', 'name': 'IndicationPhysicalPropertySequence' },
+  '(0014,2032)': { 'tag': '(0014,2032)', 'vr': 'SH', 'vm': '1', 'name': 'PropertyLabel' },
+  '(0014,2202)': { 'tag': '(0014,2202)', 'vr': 'IS', 'vm': '1', 'name': 'CoordinateSystemNumberOfAxes ' },
+  '(0014,2204)': { 'tag': '(0014,2204)', 'vr': 'SQ', 'vm': '1', 'name': 'CoordinateSystemAxesSequence' },
+  '(0014,2206)': { 'tag': '(0014,2206)', 'vr': 'ST', 'vm': '1', 'name': 'CoordinateSystemAxisDescription' },
+  '(0014,2208)': { 'tag': '(0014,2208)', 'vr': 'CS', 'vm': '1', 'name': 'CoordinateSystemDataSetMapping' },
+  '(0014,220A)': { 'tag': '(0014,220A)', 'vr': 'IS', 'vm': '1', 'name': 'CoordinateSystemAxisNumber' },
+  '(0014,220C)': { 'tag': '(0014,220C)', 'vr': 'CS', 'vm': '1', 'name': 'CoordinateSystemAxisType' },
+  '(0014,220E)': { 'tag': '(0014,220E)', 'vr': 'CS', 'vm': '1', 'name': 'CoordinateSystemAxisUnits' },
+  '(0014,2210)': { 'tag': '(0014,2210)', 'vr': 'OB', 'vm': '1', 'name': 'CoordinateSystemAxisValues' },
+  '(0014,2220)': { 'tag': '(0014,2220)', 'vr': 'SQ', 'vm': '1', 'name': 'CoordinateSystemTransformSequence' },
+  '(0014,2222)': { 'tag': '(0014,2222)', 'vr': 'ST', 'vm': '1', 'name': 'TransformDescription' },
+  '(0014,2224)': { 'tag': '(0014,2224)', 'vr': 'IS', 'vm': '1', 'name': 'TransformNumberOfAxes' },
+  '(0014,2226)': { 'tag': '(0014,2226)', 'vr': 'IS', 'vm': '1-n', 'name': 'TransformOrderOfAxes' },
+  '(0014,2228)': { 'tag': '(0014,2228)', 'vr': 'CS', 'vm': '1', 'name': 'TransformedAxisUnits' },
+  '(0014,222A)': { 'tag': '(0014,222A)', 'vr': 'DS', 'vm': '1-n', 'name': 'CoordinateSystemTransformRotationAndScaleMatrix' },
+  '(0014,222C)': { 'tag': '(0014,222C)', 'vr': 'DS', 'vm': '1-n', 'name': 'CoordinateSystemTransformTranslationMatrix' },
+  '(0014,3011)': { 'tag': '(0014,3011)', 'vr': 'DS', 'vm': '1', 'name': 'InternalDetectorFrameTime' },
+  '(0014,3012)': { 'tag': '(0014,3012)', 'vr': 'DS', 'vm': '1', 'name': 'NumberOfFramesIntegrated' },
+  '(0014,3020)': { 'tag': '(0014,3020)', 'vr': 'SQ', 'vm': '1', 'name': 'DetectorTemperatureSequence' },
+  '(0014,3022)': { 'tag': '(0014,3022)', 'vr': 'DS', 'vm': '1', 'name': 'SensorName' },
+  '(0014,3024)': { 'tag': '(0014,3024)', 'vr': 'DS', 'vm': '1', 'name': 'HorizontalOffsetOfSensor' },
+  '(0014,3026)': { 'tag': '(0014,3026)', 'vr': 'DS', 'vm': '1', 'name': 'VerticalOffsetOfSensor' },
+  '(0014,3028)': { 'tag': '(0014,3028)', 'vr': 'DS', 'vm': '1', 'name': 'SensorTemperature' },
+  '(0014,3040)': { 'tag': '(0014,3040)', 'vr': 'SQ', 'vm': '1', 'name': 'DarkCurrentSequence' },
+  '(0014,3050)': { 'tag': '(0014,3050)', 'vr': 'OB|OW', 'vm': '1', 'name': 'DarkCurrentCounts' },
+  '(0014,3060)': { 'tag': '(0014,3060)', 'vr': 'SQ', 'vm': '1', 'name': 'GainCorrectionReferenceSequence' },
+  '(0014,3070)': { 'tag': '(0014,3070)', 'vr': 'OB|OW', 'vm': '1', 'name': 'AirCounts' },
+  '(0014,3071)': { 'tag': '(0014,3071)', 'vr': 'DS', 'vm': '1', 'name': 'KVUsedInGainCalibration' },
+  '(0014,3072)': { 'tag': '(0014,3072)', 'vr': 'DS', 'vm': '1', 'name': 'MAUsedInGainCalibration' },
+  '(0014,3073)': { 'tag': '(0014,3073)', 'vr': 'DS', 'vm': '1', 'name': 'NumberOfFramesUsedForIntegration' },
+  '(0014,3074)': { 'tag': '(0014,3074)', 'vr': 'LO', 'vm': '1', 'name': 'FilterMaterialUsedInGainCalibration' },
+  '(0014,3075)': { 'tag': '(0014,3075)', 'vr': 'DS', 'vm': '1', 'name': 'FilterThicknessUsedInGainCalibration' },
+  '(0014,3076)': { 'tag': '(0014,3076)', 'vr': 'DA', 'vm': '1', 'name': 'DateOfGainCalibration' },
+  '(0014,3077)': { 'tag': '(0014,3077)', 'vr': 'TM', 'vm': '1', 'name': 'TimeOfGainCalibration' },
+  '(0014,3080)': { 'tag': '(0014,3080)', 'vr': 'OB', 'vm': '1', 'name': 'BadPixelImage' },
+  '(0014,3099)': { 'tag': '(0014,3099)', 'vr': 'LT', 'vm': '1', 'name': 'CalibrationNotes' },
+  '(0014,4002)': { 'tag': '(0014,4002)', 'vr': 'SQ', 'vm': '1', 'name': 'PulserEquipmentSequence' },
+  '(0014,4004)': { 'tag': '(0014,4004)', 'vr': 'CS', 'vm': '1', 'name': 'PulserType' },
+  '(0014,4006)': { 'tag': '(0014,4006)', 'vr': 'LT', 'vm': '1', 'name': 'PulserNotes' },
+  '(0014,4008)': { 'tag': '(0014,4008)', 'vr': 'SQ', 'vm': '1', 'name': 'ReceiverEquipmentSequence' },
+  '(0014,400A)': { 'tag': '(0014,400A)', 'vr': 'CS', 'vm': '1', 'name': 'AmplifierType' },
+  '(0014,400C)': { 'tag': '(0014,400C)', 'vr': 'LT', 'vm': '1', 'name': 'ReceiverNotes' },
+  '(0014,400E)': { 'tag': '(0014,400E)', 'vr': 'SQ', 'vm': '1', 'name': 'PreAmplifierEquipmentSequence' },
+  '(0014,400F)': { 'tag': '(0014,400F)', 'vr': 'LT', 'vm': '1', 'name': 'PreAmplifierNotes' },
+  '(0014,4010)': { 'tag': '(0014,4010)', 'vr': 'SQ', 'vm': '1', 'name': 'TransmitTransducerSequence' },
+  '(0014,4011)': { 'tag': '(0014,4011)', 'vr': 'SQ', 'vm': '1', 'name': 'ReceiveTransducerSequence' },
+  '(0014,4012)': { 'tag': '(0014,4012)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfElements' },
+  '(0014,4013)': { 'tag': '(0014,4013)', 'vr': 'CS', 'vm': '1', 'name': 'ElementShape' },
+  '(0014,4014)': { 'tag': '(0014,4014)', 'vr': 'DS', 'vm': '1', 'name': 'ElementDimensionA' },
+  '(0014,4015)': { 'tag': '(0014,4015)', 'vr': 'DS', 'vm': '1', 'name': 'ElementDimensionB' },
+  '(0014,4016)': { 'tag': '(0014,4016)', 'vr': 'DS', 'vm': '1', 'name': 'ElementPitch' },
+  '(0014,4017)': { 'tag': '(0014,4017)', 'vr': 'DS', 'vm': '1', 'name': 'MeasuredBeamDimensionA' },
+  '(0014,4018)': { 'tag': '(0014,4018)', 'vr': 'DS', 'vm': '1', 'name': 'MeasuredBeamDimensionB' },
+  '(0014,4019)': { 'tag': '(0014,4019)', 'vr': 'DS', 'vm': '1', 'name': 'LocationOfMeasuredBeamDiameter' },
+  '(0014,401A)': { 'tag': '(0014,401A)', 'vr': 'DS', 'vm': '1', 'name': 'NominalFrequency' },
+  '(0014,401B)': { 'tag': '(0014,401B)', 'vr': 'DS', 'vm': '1', 'name': 'MeasuredCenterFrequency' },
+  '(0014,401C)': { 'tag': '(0014,401C)', 'vr': 'DS', 'vm': '1', 'name': 'MeasuredBandwidth' },
+  '(0014,4020)': { 'tag': '(0014,4020)', 'vr': 'SQ', 'vm': '1', 'name': 'PulserSettingsSequence' },
+  '(0014,4022)': { 'tag': '(0014,4022)', 'vr': 'DS', 'vm': '1', 'name': 'PulseWidth' },
+  '(0014,4024)': { 'tag': '(0014,4024)', 'vr': 'DS', 'vm': '1', 'name': 'ExcitationFrequency' },
+  '(0014,4026)': { 'tag': '(0014,4026)', 'vr': 'CS', 'vm': '1', 'name': 'ModulationType' },
+  '(0014,4028)': { 'tag': '(0014,4028)', 'vr': 'DS', 'vm': '1', 'name': 'Damping' },
+  '(0014,4030)': { 'tag': '(0014,4030)', 'vr': 'SQ', 'vm': '1', 'name': 'ReceiverSettingsSequence' },
+  '(0014,4031)': { 'tag': '(0014,4031)', 'vr': 'DS', 'vm': '1', 'name': 'AcquiredSoundpathLength' },
+  '(0014,4032)': { 'tag': '(0014,4032)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionCompressionType' },
+  '(0014,4033)': { 'tag': '(0014,4033)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionSampleSize' },
+  '(0014,4034)': { 'tag': '(0014,4034)', 'vr': 'DS', 'vm': '1', 'name': 'RectifierSmoothing' },
+  '(0014,4035)': { 'tag': '(0014,4035)', 'vr': 'SQ', 'vm': '1', 'name': 'DACSequence' },
+  '(0014,4036)': { 'tag': '(0014,4036)', 'vr': 'CS', 'vm': '1', 'name': 'DACType' },
+  '(0014,4038)': { 'tag': '(0014,4038)', 'vr': 'DS', 'vm': '1-n', 'name': 'DACGainPoints' },
+  '(0014,403A)': { 'tag': '(0014,403A)', 'vr': 'DS', 'vm': '1-n', 'name': 'DACTimePoints' },
+  '(0014,403C)': { 'tag': '(0014,403C)', 'vr': 'DS', 'vm': '1-n', 'name': 'DACAmplitude' },
+  '(0014,4040)': { 'tag': '(0014,4040)', 'vr': 'SQ', 'vm': '1', 'name': 'PreAmplifierSettingsSequence' },
+  '(0014,4050)': { 'tag': '(0014,4050)', 'vr': 'SQ', 'vm': '1', 'name': 'TransmitTransducerSettingsSequence' },
+  '(0014,4051)': { 'tag': '(0014,4051)', 'vr': 'SQ', 'vm': '1', 'name': 'ReceiveTransducerSettingsSequence' },
+  '(0014,4052)': { 'tag': '(0014,4052)', 'vr': 'DS', 'vm': '1', 'name': 'IncidentAngle' },
+  '(0014,4054)': { 'tag': '(0014,4054)', 'vr': 'ST', 'vm': '1', 'name': 'CouplingTechnique' },
+  '(0014,4056)': { 'tag': '(0014,4056)', 'vr': 'ST', 'vm': '1', 'name': 'CouplingMedium' },
+  '(0014,4057)': { 'tag': '(0014,4057)', 'vr': 'DS', 'vm': '1', 'name': 'CouplingVelocity' },
+  '(0014,4058)': { 'tag': '(0014,4058)', 'vr': 'DS', 'vm': '1', 'name': 'CrystalCenterLocationX' },
+  '(0014,4059)': { 'tag': '(0014,4059)', 'vr': 'DS', 'vm': '1', 'name': 'CrystalCenterLocationZ' },
+  '(0014,405A)': { 'tag': '(0014,405A)', 'vr': 'DS', 'vm': '1', 'name': 'SoundPathLength' },
+  '(0014,405C)': { 'tag': '(0014,405C)', 'vr': 'ST', 'vm': '1', 'name': 'DelayLawIdentifier' },
+  '(0014,4060)': { 'tag': '(0014,4060)', 'vr': 'SQ', 'vm': '1', 'name': 'GateSettingsSequence' },
+  '(0014,4062)': { 'tag': '(0014,4062)', 'vr': 'DS', 'vm': '1', 'name': 'GateThreshold' },
+  '(0014,4064)': { 'tag': '(0014,4064)', 'vr': 'DS', 'vm': '1', 'name': 'VelocityOfSound' },
+  '(0014,4070)': { 'tag': '(0014,4070)', 'vr': 'SQ', 'vm': '1', 'name': 'CalibrationSettingsSequence' },
+  '(0014,4072)': { 'tag': '(0014,4072)', 'vr': 'ST', 'vm': '1', 'name': 'CalibrationProcedure' },
+  '(0014,4074)': { 'tag': '(0014,4074)', 'vr': 'SH', 'vm': '1', 'name': 'ProcedureVersion' },
+  '(0014,4076)': { 'tag': '(0014,4076)', 'vr': 'DA', 'vm': '1', 'name': 'ProcedureCreationDate' },
+  '(0014,4078)': { 'tag': '(0014,4078)', 'vr': 'DA', 'vm': '1', 'name': 'ProcedureExpirationDate' },
+  '(0014,407A)': { 'tag': '(0014,407A)', 'vr': 'DA', 'vm': '1', 'name': 'ProcedureLastModifiedDate' },
+  '(0014,407C)': { 'tag': '(0014,407C)', 'vr': 'TM', 'vm': '1-n', 'name': 'CalibrationTime' },
+  '(0014,407E)': { 'tag': '(0014,407E)', 'vr': 'DA', 'vm': '1-n', 'name': 'CalibrationDate' },
+  '(0014,5002)': { 'tag': '(0014,5002)', 'vr': 'IS', 'vm': '1', 'name': 'LINACEnergy' },
+  '(0014,5004)': { 'tag': '(0014,5004)', 'vr': 'IS', 'vm': '1', 'name': 'LINACOutput' },
+  '(0018,0010)': { 'tag': '(0018,0010)', 'vr': 'LO', 'vm': '1', 'name': 'ContrastBolusAgent' },
+  '(0018,0012)': { 'tag': '(0018,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'ContrastBolusAgentSequence' },
+  '(0018,0014)': { 'tag': '(0018,0014)', 'vr': 'SQ', 'vm': '1', 'name': 'ContrastBolusAdministrationRouteSequence' },
+  '(0018,0015)': { 'tag': '(0018,0015)', 'vr': 'CS', 'vm': '1', 'name': 'BodyPartExamined' },
+  '(0018,0020)': { 'tag': '(0018,0020)', 'vr': 'CS', 'vm': '1-n', 'name': 'ScanningSequence' },
+  '(0018,0021)': { 'tag': '(0018,0021)', 'vr': 'CS', 'vm': '1-n', 'name': 'SequenceVariant' },
+  '(0018,0022)': { 'tag': '(0018,0022)', 'vr': 'CS', 'vm': '1-n', 'name': 'ScanOptions' },
+  '(0018,0023)': { 'tag': '(0018,0023)', 'vr': 'CS', 'vm': '1', 'name': 'MRAcquisitionType' },
+  '(0018,0024)': { 'tag': '(0018,0024)', 'vr': 'SH', 'vm': '1', 'name': 'SequenceName' },
+  '(0018,0025)': { 'tag': '(0018,0025)', 'vr': 'CS', 'vm': '1', 'name': 'AngioFlag' },
+  '(0018,0026)': { 'tag': '(0018,0026)', 'vr': 'SQ', 'vm': '1', 'name': 'InterventionDrugInformationSequence' },
+  '(0018,0027)': { 'tag': '(0018,0027)', 'vr': 'TM', 'vm': '1', 'name': 'InterventionDrugStopTime' },
+  '(0018,0028)': { 'tag': '(0018,0028)', 'vr': 'DS', 'vm': '1', 'name': 'InterventionDrugDose' },
+  '(0018,0029)': { 'tag': '(0018,0029)', 'vr': 'SQ', 'vm': '1', 'name': 'InterventionDrugCodeSequence' },
+  '(0018,002A)': { 'tag': '(0018,002A)', 'vr': 'SQ', 'vm': '1', 'name': 'AdditionalDrugSequence' },
+  '(0018,0030)': { 'tag': '(0018,0030)', 'vr': 'LO', 'vm': '1-n', 'name': 'Radionuclide' },
+  '(0018,0031)': { 'tag': '(0018,0031)', 'vr': 'LO', 'vm': '1', 'name': 'Radiopharmaceutical' },
+  '(0018,0032)': { 'tag': '(0018,0032)', 'vr': 'DS', 'vm': '1', 'name': 'EnergyWindowCenterline' },
+  '(0018,0033)': { 'tag': '(0018,0033)', 'vr': 'DS', 'vm': '1-n', 'name': 'EnergyWindowTotalWidth' },
+  '(0018,0034)': { 'tag': '(0018,0034)', 'vr': 'LO', 'vm': '1', 'name': 'InterventionDrugName' },
+  '(0018,0035)': { 'tag': '(0018,0035)', 'vr': 'TM', 'vm': '1', 'name': 'InterventionDrugStartTime' },
+  '(0018,0036)': { 'tag': '(0018,0036)', 'vr': 'SQ', 'vm': '1', 'name': 'InterventionSequence' },
+  '(0018,0037)': { 'tag': '(0018,0037)', 'vr': 'CS', 'vm': '1', 'name': 'TherapyType' },
+  '(0018,0038)': { 'tag': '(0018,0038)', 'vr': 'CS', 'vm': '1', 'name': 'InterventionStatus' },
+  '(0018,0039)': { 'tag': '(0018,0039)', 'vr': 'CS', 'vm': '1', 'name': 'TherapyDescription' },
+  '(0018,003A)': { 'tag': '(0018,003A)', 'vr': 'ST', 'vm': '1', 'name': 'InterventionDescription' },
+  '(0018,0040)': { 'tag': '(0018,0040)', 'vr': 'IS', 'vm': '1', 'name': 'CineRate' },
+  '(0018,0042)': { 'tag': '(0018,0042)', 'vr': 'CS', 'vm': '1', 'name': 'InitialCineRunState' },
+  '(0018,0050)': { 'tag': '(0018,0050)', 'vr': 'DS', 'vm': '1', 'name': 'SliceThickness' },
+  '(0018,0060)': { 'tag': '(0018,0060)', 'vr': 'DS', 'vm': '1', 'name': 'KVP' },
+  '(0018,0070)': { 'tag': '(0018,0070)', 'vr': 'IS', 'vm': '1', 'name': 'CountsAccumulated' },
+  '(0018,0071)': { 'tag': '(0018,0071)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionTerminationCondition' },
+  '(0018,0072)': { 'tag': '(0018,0072)', 'vr': 'DS', 'vm': '1', 'name': 'EffectiveDuration' },
+  '(0018,0073)': { 'tag': '(0018,0073)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionStartCondition' },
+  '(0018,0074)': { 'tag': '(0018,0074)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionStartConditionData' },
+  '(0018,0075)': { 'tag': '(0018,0075)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionTerminationConditionData' },
+  '(0018,0080)': { 'tag': '(0018,0080)', 'vr': 'DS', 'vm': '1', 'name': 'RepetitionTime' },
+  '(0018,0081)': { 'tag': '(0018,0081)', 'vr': 'DS', 'vm': '1', 'name': 'EchoTime' },
+  '(0018,0082)': { 'tag': '(0018,0082)', 'vr': 'DS', 'vm': '1', 'name': 'InversionTime' },
+  '(0018,0083)': { 'tag': '(0018,0083)', 'vr': 'DS', 'vm': '1', 'name': 'NumberOfAverages' },
+  '(0018,0084)': { 'tag': '(0018,0084)', 'vr': 'DS', 'vm': '1', 'name': 'ImagingFrequency' },
+  '(0018,0085)': { 'tag': '(0018,0085)', 'vr': 'SH', 'vm': '1', 'name': 'ImagedNucleus' },
+  '(0018,0086)': { 'tag': '(0018,0086)', 'vr': 'IS', 'vm': '1-n', 'name': 'EchoNumbers' },
+  '(0018,0087)': { 'tag': '(0018,0087)', 'vr': 'DS', 'vm': '1', 'name': 'MagneticFieldStrength' },
+  '(0018,0088)': { 'tag': '(0018,0088)', 'vr': 'DS', 'vm': '1', 'name': 'SpacingBetweenSlices' },
+  '(0018,0089)': { 'tag': '(0018,0089)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPhaseEncodingSteps' },
+  '(0018,0090)': { 'tag': '(0018,0090)', 'vr': 'DS', 'vm': '1', 'name': 'DataCollectionDiameter' },
+  '(0018,0091)': { 'tag': '(0018,0091)', 'vr': 'IS', 'vm': '1', 'name': 'EchoTrainLength' },
+  '(0018,0093)': { 'tag': '(0018,0093)', 'vr': 'DS', 'vm': '1', 'name': 'PercentSampling' },
+  '(0018,0094)': { 'tag': '(0018,0094)', 'vr': 'DS', 'vm': '1', 'name': 'PercentPhaseFieldOfView' },
+  '(0018,0095)': { 'tag': '(0018,0095)', 'vr': 'DS', 'vm': '1', 'name': 'PixelBandwidth' },
+  '(0018,1000)': { 'tag': '(0018,1000)', 'vr': 'LO', 'vm': '1', 'name': 'DeviceSerialNumber' },
+  '(0018,1002)': { 'tag': '(0018,1002)', 'vr': 'UI', 'vm': '1', 'name': 'DeviceUID' },
+  '(0018,1003)': { 'tag': '(0018,1003)', 'vr': 'LO', 'vm': '1', 'name': 'DeviceID' },
+  '(0018,1004)': { 'tag': '(0018,1004)', 'vr': 'LO', 'vm': '1', 'name': 'PlateID' },
+  '(0018,1005)': { 'tag': '(0018,1005)', 'vr': 'LO', 'vm': '1', 'name': 'GeneratorID' },
+  '(0018,1006)': { 'tag': '(0018,1006)', 'vr': 'LO', 'vm': '1', 'name': 'GridID' },
+  '(0018,1007)': { 'tag': '(0018,1007)', 'vr': 'LO', 'vm': '1', 'name': 'CassetteID' },
+  '(0018,1008)': { 'tag': '(0018,1008)', 'vr': 'LO', 'vm': '1', 'name': 'GantryID' },
+  '(0018,1010)': { 'tag': '(0018,1010)', 'vr': 'LO', 'vm': '1', 'name': 'SecondaryCaptureDeviceID' },
+  '(0018,1011)': { 'tag': '(0018,1011)', 'vr': 'LO', 'vm': '1', 'name': 'HardcopyCreationDeviceID' },
+  '(0018,1012)': { 'tag': '(0018,1012)', 'vr': 'DA', 'vm': '1', 'name': 'DateOfSecondaryCapture' },
+  '(0018,1014)': { 'tag': '(0018,1014)', 'vr': 'TM', 'vm': '1', 'name': 'TimeOfSecondaryCapture' },
+  '(0018,1016)': { 'tag': '(0018,1016)', 'vr': 'LO', 'vm': '1', 'name': 'SecondaryCaptureDeviceManufacturer' },
+  '(0018,1017)': { 'tag': '(0018,1017)', 'vr': 'LO', 'vm': '1', 'name': 'HardcopyDeviceManufacturer' },
+  '(0018,1018)': { 'tag': '(0018,1018)', 'vr': 'LO', 'vm': '1', 'name': 'SecondaryCaptureDeviceManufacturerModelName' },
+  '(0018,1019)': { 'tag': '(0018,1019)', 'vr': 'LO', 'vm': '1-n', 'name': 'SecondaryCaptureDeviceSoftwareVersions' },
+  '(0018,101A)': { 'tag': '(0018,101A)', 'vr': 'LO', 'vm': '1-n', 'name': 'HardcopyDeviceSoftwareVersion' },
+  '(0018,101B)': { 'tag': '(0018,101B)', 'vr': 'LO', 'vm': '1', 'name': 'HardcopyDeviceManufacturerModelName' },
+  '(0018,1020)': { 'tag': '(0018,1020)', 'vr': 'LO', 'vm': '1-n', 'name': 'SoftwareVersions' },
+  '(0018,1022)': { 'tag': '(0018,1022)', 'vr': 'SH', 'vm': '1', 'name': 'VideoImageFormatAcquired' },
+  '(0018,1023)': { 'tag': '(0018,1023)', 'vr': 'LO', 'vm': '1', 'name': 'DigitalImageFormatAcquired' },
+  '(0018,1030)': { 'tag': '(0018,1030)', 'vr': 'LO', 'vm': '1', 'name': 'ProtocolName' },
+  '(0018,1040)': { 'tag': '(0018,1040)', 'vr': 'LO', 'vm': '1', 'name': 'ContrastBolusRoute' },
+  '(0018,1041)': { 'tag': '(0018,1041)', 'vr': 'DS', 'vm': '1', 'name': 'ContrastBolusVolume' },
+  '(0018,1042)': { 'tag': '(0018,1042)', 'vr': 'TM', 'vm': '1', 'name': 'ContrastBolusStartTime' },
+  '(0018,1043)': { 'tag': '(0018,1043)', 'vr': 'TM', 'vm': '1', 'name': 'ContrastBolusStopTime' },
+  '(0018,1044)': { 'tag': '(0018,1044)', 'vr': 'DS', 'vm': '1', 'name': 'ContrastBolusTotalDose' },
+  '(0018,1045)': { 'tag': '(0018,1045)', 'vr': 'IS', 'vm': '1', 'name': 'SyringeCounts' },
+  '(0018,1046)': { 'tag': '(0018,1046)', 'vr': 'DS', 'vm': '1-n', 'name': 'ContrastFlowRate' },
+  '(0018,1047)': { 'tag': '(0018,1047)', 'vr': 'DS', 'vm': '1-n', 'name': 'ContrastFlowDuration' },
+  '(0018,1048)': { 'tag': '(0018,1048)', 'vr': 'CS', 'vm': '1', 'name': 'ContrastBolusIngredient' },
+  '(0018,1049)': { 'tag': '(0018,1049)', 'vr': 'DS', 'vm': '1', 'name': 'ContrastBolusIngredientConcentration' },
+  '(0018,1050)': { 'tag': '(0018,1050)', 'vr': 'DS', 'vm': '1', 'name': 'SpatialResolution' },
+  '(0018,1060)': { 'tag': '(0018,1060)', 'vr': 'DS', 'vm': '1', 'name': 'TriggerTime' },
+  '(0018,1061)': { 'tag': '(0018,1061)', 'vr': 'LO', 'vm': '1', 'name': 'TriggerSourceOrType' },
+  '(0018,1062)': { 'tag': '(0018,1062)', 'vr': 'IS', 'vm': '1', 'name': 'NominalInterval' },
+  '(0018,1063)': { 'tag': '(0018,1063)', 'vr': 'DS', 'vm': '1', 'name': 'FrameTime' },
+  '(0018,1064)': { 'tag': '(0018,1064)', 'vr': 'LO', 'vm': '1', 'name': 'CardiacFramingType' },
+  '(0018,1065)': { 'tag': '(0018,1065)', 'vr': 'DS', 'vm': '1-n', 'name': 'FrameTimeVector' },
+  '(0018,1066)': { 'tag': '(0018,1066)', 'vr': 'DS', 'vm': '1', 'name': 'FrameDelay' },
+  '(0018,1067)': { 'tag': '(0018,1067)', 'vr': 'DS', 'vm': '1', 'name': 'ImageTriggerDelay' },
+  '(0018,1068)': { 'tag': '(0018,1068)', 'vr': 'DS', 'vm': '1', 'name': 'MultiplexGroupTimeOffset' },
+  '(0018,1069)': { 'tag': '(0018,1069)', 'vr': 'DS', 'vm': '1', 'name': 'TriggerTimeOffset' },
+  '(0018,106A)': { 'tag': '(0018,106A)', 'vr': 'CS', 'vm': '1', 'name': 'SynchronizationTrigger' },
+  '(0018,106C)': { 'tag': '(0018,106C)', 'vr': 'US', 'vm': '2', 'name': 'SynchronizationChannel' },
+  '(0018,106E)': { 'tag': '(0018,106E)', 'vr': 'UL', 'vm': '1', 'name': 'TriggerSamplePosition' },
+  '(0018,1070)': { 'tag': '(0018,1070)', 'vr': 'LO', 'vm': '1', 'name': 'RadiopharmaceuticalRoute' },
+  '(0018,1071)': { 'tag': '(0018,1071)', 'vr': 'DS', 'vm': '1', 'name': 'RadiopharmaceuticalVolume' },
+  '(0018,1072)': { 'tag': '(0018,1072)', 'vr': 'TM', 'vm': '1', 'name': 'RadiopharmaceuticalStartTime' },
+  '(0018,1073)': { 'tag': '(0018,1073)', 'vr': 'TM', 'vm': '1', 'name': 'RadiopharmaceuticalStopTime' },
+  '(0018,1074)': { 'tag': '(0018,1074)', 'vr': 'DS', 'vm': '1', 'name': 'RadionuclideTotalDose' },
+  '(0018,1075)': { 'tag': '(0018,1075)', 'vr': 'DS', 'vm': '1', 'name': 'RadionuclideHalfLife' },
+  '(0018,1076)': { 'tag': '(0018,1076)', 'vr': 'DS', 'vm': '1', 'name': 'RadionuclidePositronFraction' },
+  '(0018,1077)': { 'tag': '(0018,1077)', 'vr': 'DS', 'vm': '1', 'name': 'RadiopharmaceuticalSpecificActivity' },
+  '(0018,1078)': { 'tag': '(0018,1078)', 'vr': 'DT', 'vm': '1', 'name': 'RadiopharmaceuticalStartDateTime' },
+  '(0018,1079)': { 'tag': '(0018,1079)', 'vr': 'DT', 'vm': '1', 'name': 'RadiopharmaceuticalStopDateTime' },
+  '(0018,1080)': { 'tag': '(0018,1080)', 'vr': 'CS', 'vm': '1', 'name': 'BeatRejectionFlag' },
+  '(0018,1081)': { 'tag': '(0018,1081)', 'vr': 'IS', 'vm': '1', 'name': 'LowRRValue' },
+  '(0018,1082)': { 'tag': '(0018,1082)', 'vr': 'IS', 'vm': '1', 'name': 'HighRRValue' },
+  '(0018,1083)': { 'tag': '(0018,1083)', 'vr': 'IS', 'vm': '1', 'name': 'IntervalsAcquired' },
+  '(0018,1084)': { 'tag': '(0018,1084)', 'vr': 'IS', 'vm': '1', 'name': 'IntervalsRejected' },
+  '(0018,1085)': { 'tag': '(0018,1085)', 'vr': 'LO', 'vm': '1', 'name': 'PVCRejection' },
+  '(0018,1086)': { 'tag': '(0018,1086)', 'vr': 'IS', 'vm': '1', 'name': 'SkipBeats' },
+  '(0018,1088)': { 'tag': '(0018,1088)', 'vr': 'IS', 'vm': '1', 'name': 'HeartRate' },
+  '(0018,1090)': { 'tag': '(0018,1090)', 'vr': 'IS', 'vm': '1', 'name': 'CardiacNumberOfImages' },
+  '(0018,1094)': { 'tag': '(0018,1094)', 'vr': 'IS', 'vm': '1', 'name': 'TriggerWindow' },
+  '(0018,1100)': { 'tag': '(0018,1100)', 'vr': 'DS', 'vm': '1', 'name': 'ReconstructionDiameter' },
+  '(0018,1110)': { 'tag': '(0018,1110)', 'vr': 'DS', 'vm': '1', 'name': 'DistanceSourceToDetector' },
+  '(0018,1111)': { 'tag': '(0018,1111)', 'vr': 'DS', 'vm': '1', 'name': 'DistanceSourceToPatient' },
+  '(0018,1114)': { 'tag': '(0018,1114)', 'vr': 'DS', 'vm': '1', 'name': 'EstimatedRadiographicMagnificationFactor' },
+  '(0018,1120)': { 'tag': '(0018,1120)', 'vr': 'DS', 'vm': '1', 'name': 'GantryDetectorTilt' },
+  '(0018,1121)': { 'tag': '(0018,1121)', 'vr': 'DS', 'vm': '1', 'name': 'GantryDetectorSlew' },
+  '(0018,1130)': { 'tag': '(0018,1130)', 'vr': 'DS', 'vm': '1', 'name': 'TableHeight' },
+  '(0018,1131)': { 'tag': '(0018,1131)', 'vr': 'DS', 'vm': '1', 'name': 'TableTraverse' },
+  '(0018,1134)': { 'tag': '(0018,1134)', 'vr': 'CS', 'vm': '1', 'name': 'TableMotion' },
+  '(0018,1135)': { 'tag': '(0018,1135)', 'vr': 'DS', 'vm': '1-n', 'name': 'TableVerticalIncrement' },
+  '(0018,1136)': { 'tag': '(0018,1136)', 'vr': 'DS', 'vm': '1-n', 'name': 'TableLateralIncrement' },
+  '(0018,1137)': { 'tag': '(0018,1137)', 'vr': 'DS', 'vm': '1-n', 'name': 'TableLongitudinalIncrement' },
+  '(0018,1138)': { 'tag': '(0018,1138)', 'vr': 'DS', 'vm': '1', 'name': 'TableAngle' },
+  '(0018,113A)': { 'tag': '(0018,113A)', 'vr': 'CS', 'vm': '1', 'name': 'TableType' },
+  '(0018,1140)': { 'tag': '(0018,1140)', 'vr': 'CS', 'vm': '1', 'name': 'RotationDirection' },
+  '(0018,1141)': { 'tag': '(0018,1141)', 'vr': 'DS', 'vm': '1', 'name': 'AngularPosition' },
+  '(0018,1142)': { 'tag': '(0018,1142)', 'vr': 'DS', 'vm': '1-n', 'name': 'RadialPosition' },
+  '(0018,1143)': { 'tag': '(0018,1143)', 'vr': 'DS', 'vm': '1', 'name': 'ScanArc' },
+  '(0018,1144)': { 'tag': '(0018,1144)', 'vr': 'DS', 'vm': '1', 'name': 'AngularStep' },
+  '(0018,1145)': { 'tag': '(0018,1145)', 'vr': 'DS', 'vm': '1', 'name': 'CenterOfRotationOffset' },
+  '(0018,1146)': { 'tag': '(0018,1146)', 'vr': 'DS', 'vm': '1-n', 'name': 'RotationOffset' },
+  '(0018,1147)': { 'tag': '(0018,1147)', 'vr': 'CS', 'vm': '1', 'name': 'FieldOfViewShape' },
+  '(0018,1149)': { 'tag': '(0018,1149)', 'vr': 'IS', 'vm': '1-2', 'name': 'FieldOfViewDimensions' },
+  '(0018,1150)': { 'tag': '(0018,1150)', 'vr': 'IS', 'vm': '1', 'name': 'ExposureTime' },
+  '(0018,1151)': { 'tag': '(0018,1151)', 'vr': 'IS', 'vm': '1', 'name': 'XRayTubeCurrent' },
+  '(0018,1152)': { 'tag': '(0018,1152)', 'vr': 'IS', 'vm': '1', 'name': 'Exposure' },
+  '(0018,1153)': { 'tag': '(0018,1153)', 'vr': 'IS', 'vm': '1', 'name': 'ExposureInuAs' },
+  '(0018,1154)': { 'tag': '(0018,1154)', 'vr': 'DS', 'vm': '1', 'name': 'AveragePulseWidth' },
+  '(0018,1155)': { 'tag': '(0018,1155)', 'vr': 'CS', 'vm': '1', 'name': 'RadiationSetting' },
+  '(0018,1156)': { 'tag': '(0018,1156)', 'vr': 'CS', 'vm': '1', 'name': 'RectificationType' },
+  '(0018,115A)': { 'tag': '(0018,115A)', 'vr': 'CS', 'vm': '1', 'name': 'RadiationMode' },
+  '(0018,115E)': { 'tag': '(0018,115E)', 'vr': 'DS', 'vm': '1', 'name': 'ImageAndFluoroscopyAreaDoseProduct' },
+  '(0018,1160)': { 'tag': '(0018,1160)', 'vr': 'SH', 'vm': '1', 'name': 'FilterType' },
+  '(0018,1161)': { 'tag': '(0018,1161)', 'vr': 'LO', 'vm': '1-n', 'name': 'TypeOfFilters' },
+  '(0018,1162)': { 'tag': '(0018,1162)', 'vr': 'DS', 'vm': '1', 'name': 'IntensifierSize' },
+  '(0018,1164)': { 'tag': '(0018,1164)', 'vr': 'DS', 'vm': '2', 'name': 'ImagerPixelSpacing' },
+  '(0018,1166)': { 'tag': '(0018,1166)', 'vr': 'CS', 'vm': '1-n', 'name': 'Grid' },
+  '(0018,1170)': { 'tag': '(0018,1170)', 'vr': 'IS', 'vm': '1', 'name': 'GeneratorPower' },
+  '(0018,1180)': { 'tag': '(0018,1180)', 'vr': 'SH', 'vm': '1', 'name': 'CollimatorGridName' },
+  '(0018,1181)': { 'tag': '(0018,1181)', 'vr': 'CS', 'vm': '1', 'name': 'CollimatorType' },
+  '(0018,1182)': { 'tag': '(0018,1182)', 'vr': 'IS', 'vm': '1-2', 'name': 'FocalDistance' },
+  '(0018,1183)': { 'tag': '(0018,1183)', 'vr': 'DS', 'vm': '1-2', 'name': 'XFocusCenter' },
+  '(0018,1184)': { 'tag': '(0018,1184)', 'vr': 'DS', 'vm': '1-2', 'name': 'YFocusCenter' },
+  '(0018,1190)': { 'tag': '(0018,1190)', 'vr': 'DS', 'vm': '1-n', 'name': 'FocalSpots' },
+  '(0018,1191)': { 'tag': '(0018,1191)', 'vr': 'CS', 'vm': '1', 'name': 'AnodeTargetMaterial' },
+  '(0018,11A0)': { 'tag': '(0018,11A0)', 'vr': 'DS', 'vm': '1', 'name': 'BodyPartThickness' },
+  '(0018,11A2)': { 'tag': '(0018,11A2)', 'vr': 'DS', 'vm': '1', 'name': 'CompressionForce' },
+  '(0018,1200)': { 'tag': '(0018,1200)', 'vr': 'DA', 'vm': '1-n', 'name': 'DateOfLastCalibration' },
+  '(0018,1201)': { 'tag': '(0018,1201)', 'vr': 'TM', 'vm': '1-n', 'name': 'TimeOfLastCalibration' },
+  '(0018,1210)': { 'tag': '(0018,1210)', 'vr': 'SH', 'vm': '1-n', 'name': 'ConvolutionKernel' },
+  '(0018,1240)': { 'tag': '(0018,1240)', 'vr': 'IS', 'vm': '1-n', 'name': 'UpperLowerPixelValues' },
+  '(0018,1242)': { 'tag': '(0018,1242)', 'vr': 'IS', 'vm': '1', 'name': 'ActualFrameDuration' },
+  '(0018,1243)': { 'tag': '(0018,1243)', 'vr': 'IS', 'vm': '1', 'name': 'CountRate' },
+  '(0018,1244)': { 'tag': '(0018,1244)', 'vr': 'US', 'vm': '1', 'name': 'PreferredPlaybackSequencing' },
+  '(0018,1250)': { 'tag': '(0018,1250)', 'vr': 'SH', 'vm': '1', 'name': 'ReceiveCoilName' },
+  '(0018,1251)': { 'tag': '(0018,1251)', 'vr': 'SH', 'vm': '1', 'name': 'TransmitCoilName' },
+  '(0018,1260)': { 'tag': '(0018,1260)', 'vr': 'SH', 'vm': '1', 'name': 'PlateType' },
+  '(0018,1261)': { 'tag': '(0018,1261)', 'vr': 'LO', 'vm': '1', 'name': 'PhosphorType' },
+  '(0018,1300)': { 'tag': '(0018,1300)', 'vr': 'DS', 'vm': '1', 'name': 'ScanVelocity' },
+  '(0018,1301)': { 'tag': '(0018,1301)', 'vr': 'CS', 'vm': '1-n', 'name': 'WholeBodyTechnique' },
+  '(0018,1302)': { 'tag': '(0018,1302)', 'vr': 'IS', 'vm': '1', 'name': 'ScanLength' },
+  '(0018,1310)': { 'tag': '(0018,1310)', 'vr': 'US', 'vm': '4', 'name': 'AcquisitionMatrix' },
+  '(0018,1312)': { 'tag': '(0018,1312)', 'vr': 'CS', 'vm': '1', 'name': 'InPlanePhaseEncodingDirection' },
+  '(0018,1314)': { 'tag': '(0018,1314)', 'vr': 'DS', 'vm': '1', 'name': 'FlipAngle' },
+  '(0018,1315)': { 'tag': '(0018,1315)', 'vr': 'CS', 'vm': '1', 'name': 'VariableFlipAngleFlag' },
+  '(0018,1316)': { 'tag': '(0018,1316)', 'vr': 'DS', 'vm': '1', 'name': 'SAR' },
+  '(0018,1318)': { 'tag': '(0018,1318)', 'vr': 'DS', 'vm': '1', 'name': 'dBdt' },
+  '(0018,1400)': { 'tag': '(0018,1400)', 'vr': 'LO', 'vm': '1', 'name': 'AcquisitionDeviceProcessingDescription' },
+  '(0018,1401)': { 'tag': '(0018,1401)', 'vr': 'LO', 'vm': '1', 'name': 'AcquisitionDeviceProcessingCode' },
+  '(0018,1402)': { 'tag': '(0018,1402)', 'vr': 'CS', 'vm': '1', 'name': 'CassetteOrientation' },
+  '(0018,1403)': { 'tag': '(0018,1403)', 'vr': 'CS', 'vm': '1', 'name': 'CassetteSize' },
+  '(0018,1404)': { 'tag': '(0018,1404)', 'vr': 'US', 'vm': '1', 'name': 'ExposuresOnPlate' },
+  '(0018,1405)': { 'tag': '(0018,1405)', 'vr': 'IS', 'vm': '1', 'name': 'RelativeXRayExposure' },
+  '(0018,1411)': { 'tag': '(0018,1411)', 'vr': 'DS', 'vm': '1', 'name': 'ExposureIndex' },
+  '(0018,1412)': { 'tag': '(0018,1412)', 'vr': 'DS', 'vm': '1', 'name': 'TargetExposureIndex' },
+  '(0018,1413)': { 'tag': '(0018,1413)', 'vr': 'DS', 'vm': '1', 'name': 'DeviationIndex' },
+  '(0018,1450)': { 'tag': '(0018,1450)', 'vr': 'DS', 'vm': '1', 'name': 'ColumnAngulation' },
+  '(0018,1460)': { 'tag': '(0018,1460)', 'vr': 'DS', 'vm': '1', 'name': 'TomoLayerHeight' },
+  '(0018,1470)': { 'tag': '(0018,1470)', 'vr': 'DS', 'vm': '1', 'name': 'TomoAngle' },
+  '(0018,1480)': { 'tag': '(0018,1480)', 'vr': 'DS', 'vm': '1', 'name': 'TomoTime' },
+  '(0018,1490)': { 'tag': '(0018,1490)', 'vr': 'CS', 'vm': '1', 'name': 'TomoType' },
+  '(0018,1491)': { 'tag': '(0018,1491)', 'vr': 'CS', 'vm': '1', 'name': 'TomoClass' },
+  '(0018,1495)': { 'tag': '(0018,1495)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfTomosynthesisSourceImages' },
+  '(0018,1500)': { 'tag': '(0018,1500)', 'vr': 'CS', 'vm': '1', 'name': 'PositionerMotion' },
+  '(0018,1508)': { 'tag': '(0018,1508)', 'vr': 'CS', 'vm': '1', 'name': 'PositionerType' },
+  '(0018,1510)': { 'tag': '(0018,1510)', 'vr': 'DS', 'vm': '1', 'name': 'PositionerPrimaryAngle' },
+  '(0018,1511)': { 'tag': '(0018,1511)', 'vr': 'DS', 'vm': '1', 'name': 'PositionerSecondaryAngle' },
+  '(0018,1520)': { 'tag': '(0018,1520)', 'vr': 'DS', 'vm': '1-n', 'name': 'PositionerPrimaryAngleIncrement' },
+  '(0018,1521)': { 'tag': '(0018,1521)', 'vr': 'DS', 'vm': '1-n', 'name': 'PositionerSecondaryAngleIncrement' },
+  '(0018,1530)': { 'tag': '(0018,1530)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorPrimaryAngle' },
+  '(0018,1531)': { 'tag': '(0018,1531)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorSecondaryAngle' },
+  '(0018,1600)': { 'tag': '(0018,1600)', 'vr': 'CS', 'vm': '1-3', 'name': 'ShutterShape' },
+  '(0018,1602)': { 'tag': '(0018,1602)', 'vr': 'IS', 'vm': '1', 'name': 'ShutterLeftVerticalEdge' },
+  '(0018,1604)': { 'tag': '(0018,1604)', 'vr': 'IS', 'vm': '1', 'name': 'ShutterRightVerticalEdge' },
+  '(0018,1606)': { 'tag': '(0018,1606)', 'vr': 'IS', 'vm': '1', 'name': 'ShutterUpperHorizontalEdge' },
+  '(0018,1608)': { 'tag': '(0018,1608)', 'vr': 'IS', 'vm': '1', 'name': 'ShutterLowerHorizontalEdge' },
+  '(0018,1610)': { 'tag': '(0018,1610)', 'vr': 'IS', 'vm': '2', 'name': 'CenterOfCircularShutter' },
+  '(0018,1612)': { 'tag': '(0018,1612)', 'vr': 'IS', 'vm': '1', 'name': 'RadiusOfCircularShutter' },
+  '(0018,1620)': { 'tag': '(0018,1620)', 'vr': 'IS', 'vm': '2-2n', 'name': 'VerticesOfThePolygonalShutter' },
+  '(0018,1622)': { 'tag': '(0018,1622)', 'vr': 'US', 'vm': '1', 'name': 'ShutterPresentationValue' },
+  '(0018,1623)': { 'tag': '(0018,1623)', 'vr': 'US', 'vm': '1', 'name': 'ShutterOverlayGroup' },
+  '(0018,1624)': { 'tag': '(0018,1624)', 'vr': 'US', 'vm': '3', 'name': 'ShutterPresentationColorCIELabValue' },
+  '(0018,1700)': { 'tag': '(0018,1700)', 'vr': 'CS', 'vm': '1-3', 'name': 'CollimatorShape' },
+  '(0018,1702)': { 'tag': '(0018,1702)', 'vr': 'IS', 'vm': '1', 'name': 'CollimatorLeftVerticalEdge' },
+  '(0018,1704)': { 'tag': '(0018,1704)', 'vr': 'IS', 'vm': '1', 'name': 'CollimatorRightVerticalEdge' },
+  '(0018,1706)': { 'tag': '(0018,1706)', 'vr': 'IS', 'vm': '1', 'name': 'CollimatorUpperHorizontalEdge' },
+  '(0018,1708)': { 'tag': '(0018,1708)', 'vr': 'IS', 'vm': '1', 'name': 'CollimatorLowerHorizontalEdge' },
+  '(0018,1710)': { 'tag': '(0018,1710)', 'vr': 'IS', 'vm': '2', 'name': 'CenterOfCircularCollimator' },
+  '(0018,1712)': { 'tag': '(0018,1712)', 'vr': 'IS', 'vm': '1', 'name': 'RadiusOfCircularCollimator' },
+  '(0018,1720)': { 'tag': '(0018,1720)', 'vr': 'IS', 'vm': '2-2n', 'name': 'VerticesOfThePolygonalCollimator' },
+  '(0018,1800)': { 'tag': '(0018,1800)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionTimeSynchronized' },
+  '(0018,1801)': { 'tag': '(0018,1801)', 'vr': 'SH', 'vm': '1', 'name': 'TimeSource' },
+  '(0018,1802)': { 'tag': '(0018,1802)', 'vr': 'CS', 'vm': '1', 'name': 'TimeDistributionProtocol' },
+  '(0018,1803)': { 'tag': '(0018,1803)', 'vr': 'LO', 'vm': '1', 'name': 'NTPSourceAddress' },
+  '(0018,2001)': { 'tag': '(0018,2001)', 'vr': 'IS', 'vm': '1-n', 'name': 'PageNumberVector' },
+  '(0018,2002)': { 'tag': '(0018,2002)', 'vr': 'SH', 'vm': '1-n', 'name': 'FrameLabelVector' },
+  '(0018,2003)': { 'tag': '(0018,2003)', 'vr': 'DS', 'vm': '1-n', 'name': 'FramePrimaryAngleVector' },
+  '(0018,2004)': { 'tag': '(0018,2004)', 'vr': 'DS', 'vm': '1-n', 'name': 'FrameSecondaryAngleVector' },
+  '(0018,2005)': { 'tag': '(0018,2005)', 'vr': 'DS', 'vm': '1-n', 'name': 'SliceLocationVector' },
+  '(0018,2006)': { 'tag': '(0018,2006)', 'vr': 'SH', 'vm': '1-n', 'name': 'DisplayWindowLabelVector' },
+  '(0018,2010)': { 'tag': '(0018,2010)', 'vr': 'DS', 'vm': '2', 'name': 'NominalScannedPixelSpacing' },
+  '(0018,2020)': { 'tag': '(0018,2020)', 'vr': 'CS', 'vm': '1', 'name': 'DigitizingDeviceTransportDirection' },
+  '(0018,2030)': { 'tag': '(0018,2030)', 'vr': 'DS', 'vm': '1', 'name': 'RotationOfScannedFilm' },
+  '(0018,3100)': { 'tag': '(0018,3100)', 'vr': 'CS', 'vm': '1', 'name': 'IVUSAcquisition' },
+  '(0018,3101)': { 'tag': '(0018,3101)', 'vr': 'DS', 'vm': '1', 'name': 'IVUSPullbackRate' },
+  '(0018,3102)': { 'tag': '(0018,3102)', 'vr': 'DS', 'vm': '1', 'name': 'IVUSGatedRate' },
+  '(0018,3103)': { 'tag': '(0018,3103)', 'vr': 'IS', 'vm': '1', 'name': 'IVUSPullbackStartFrameNumber' },
+  '(0018,3104)': { 'tag': '(0018,3104)', 'vr': 'IS', 'vm': '1', 'name': 'IVUSPullbackStopFrameNumber' },
+  '(0018,3105)': { 'tag': '(0018,3105)', 'vr': 'IS', 'vm': '1-n', 'name': 'LesionNumber' },
+  '(0018,4000)': { 'tag': '(0018,4000)', 'vr': 'LT', 'vm': '1', 'name': 'AcquisitionComments' },
+  '(0018,5000)': { 'tag': '(0018,5000)', 'vr': 'SH', 'vm': '1-n', 'name': 'OutputPower' },
+  '(0018,5010)': { 'tag': '(0018,5010)', 'vr': 'LO', 'vm': '1-n', 'name': 'TransducerData' },
+  '(0018,5012)': { 'tag': '(0018,5012)', 'vr': 'DS', 'vm': '1', 'name': 'FocusDepth' },
+  '(0018,5020)': { 'tag': '(0018,5020)', 'vr': 'LO', 'vm': '1', 'name': 'ProcessingFunction' },
+  '(0018,5021)': { 'tag': '(0018,5021)', 'vr': 'LO', 'vm': '1', 'name': 'PostprocessingFunction' },
+  '(0018,5022)': { 'tag': '(0018,5022)', 'vr': 'DS', 'vm': '1', 'name': 'MechanicalIndex' },
+  '(0018,5024)': { 'tag': '(0018,5024)', 'vr': 'DS', 'vm': '1', 'name': 'BoneThermalIndex' },
+  '(0018,5026)': { 'tag': '(0018,5026)', 'vr': 'DS', 'vm': '1', 'name': 'CranialThermalIndex' },
+  '(0018,5027)': { 'tag': '(0018,5027)', 'vr': 'DS', 'vm': '1', 'name': 'SoftTissueThermalIndex' },
+  '(0018,5028)': { 'tag': '(0018,5028)', 'vr': 'DS', 'vm': '1', 'name': 'SoftTissueFocusThermalIndex' },
+  '(0018,5029)': { 'tag': '(0018,5029)', 'vr': 'DS', 'vm': '1', 'name': 'SoftTissueSurfaceThermalIndex' },
+  '(0018,5030)': { 'tag': '(0018,5030)', 'vr': 'DS', 'vm': '1', 'name': 'DynamicRange' },
+  '(0018,5040)': { 'tag': '(0018,5040)', 'vr': 'DS', 'vm': '1', 'name': 'TotalGain' },
+  '(0018,5050)': { 'tag': '(0018,5050)', 'vr': 'IS', 'vm': '1', 'name': 'DepthOfScanField' },
+  '(0018,5100)': { 'tag': '(0018,5100)', 'vr': 'CS', 'vm': '1', 'name': 'PatientPosition' },
+  '(0018,5101)': { 'tag': '(0018,5101)', 'vr': 'CS', 'vm': '1', 'name': 'ViewPosition' },
+  '(0018,5104)': { 'tag': '(0018,5104)', 'vr': 'SQ', 'vm': '1', 'name': 'ProjectionEponymousNameCodeSequence' },
+  '(0018,5210)': { 'tag': '(0018,5210)', 'vr': 'DS', 'vm': '6', 'name': 'ImageTransformationMatrix' },
+  '(0018,5212)': { 'tag': '(0018,5212)', 'vr': 'DS', 'vm': '3', 'name': 'ImageTranslationVector' },
+  '(0018,6000)': { 'tag': '(0018,6000)', 'vr': 'DS', 'vm': '1', 'name': 'Sensitivity' },
+  '(0018,6011)': { 'tag': '(0018,6011)', 'vr': 'SQ', 'vm': '1', 'name': 'SequenceOfUltrasoundRegions' },
+  '(0018,6012)': { 'tag': '(0018,6012)', 'vr': 'US', 'vm': '1', 'name': 'RegionSpatialFormat' },
+  '(0018,6014)': { 'tag': '(0018,6014)', 'vr': 'US', 'vm': '1', 'name': 'RegionDataType' },
+  '(0018,6016)': { 'tag': '(0018,6016)', 'vr': 'UL', 'vm': '1', 'name': 'RegionFlags' },
+  '(0018,6018)': { 'tag': '(0018,6018)', 'vr': 'UL', 'vm': '1', 'name': 'RegionLocationMinX0' },
+  '(0018,601A)': { 'tag': '(0018,601A)', 'vr': 'UL', 'vm': '1', 'name': 'RegionLocationMinY0' },
+  '(0018,601C)': { 'tag': '(0018,601C)', 'vr': 'UL', 'vm': '1', 'name': 'RegionLocationMaxX1' },
+  '(0018,601E)': { 'tag': '(0018,601E)', 'vr': 'UL', 'vm': '1', 'name': 'RegionLocationMaxY1' },
+  '(0018,6020)': { 'tag': '(0018,6020)', 'vr': 'SL', 'vm': '1', 'name': 'ReferencePixelX0' },
+  '(0018,6022)': { 'tag': '(0018,6022)', 'vr': 'SL', 'vm': '1', 'name': 'ReferencePixelY0' },
+  '(0018,6024)': { 'tag': '(0018,6024)', 'vr': 'US', 'vm': '1', 'name': 'PhysicalUnitsXDirection' },
+  '(0018,6026)': { 'tag': '(0018,6026)', 'vr': 'US', 'vm': '1', 'name': 'PhysicalUnitsYDirection' },
+  '(0018,6028)': { 'tag': '(0018,6028)', 'vr': 'FD', 'vm': '1', 'name': 'ReferencePixelPhysicalValueX' },
+  '(0018,602A)': { 'tag': '(0018,602A)', 'vr': 'FD', 'vm': '1', 'name': 'ReferencePixelPhysicalValueY' },
+  '(0018,602C)': { 'tag': '(0018,602C)', 'vr': 'FD', 'vm': '1', 'name': 'PhysicalDeltaX' },
+  '(0018,602E)': { 'tag': '(0018,602E)', 'vr': 'FD', 'vm': '1', 'name': 'PhysicalDeltaY' },
+  '(0018,6030)': { 'tag': '(0018,6030)', 'vr': 'UL', 'vm': '1', 'name': 'TransducerFrequency' },
+  '(0018,6031)': { 'tag': '(0018,6031)', 'vr': 'CS', 'vm': '1', 'name': 'TransducerType' },
+  '(0018,6032)': { 'tag': '(0018,6032)', 'vr': 'UL', 'vm': '1', 'name': 'PulseRepetitionFrequency' },
+  '(0018,6034)': { 'tag': '(0018,6034)', 'vr': 'FD', 'vm': '1', 'name': 'DopplerCorrectionAngle' },
+  '(0018,6036)': { 'tag': '(0018,6036)', 'vr': 'FD', 'vm': '1', 'name': 'SteeringAngle' },
+  '(0018,6038)': { 'tag': '(0018,6038)', 'vr': 'UL', 'vm': '1', 'name': 'DopplerSampleVolumeXPositionRetired' },
+  '(0018,6039)': { 'tag': '(0018,6039)', 'vr': 'SL', 'vm': '1', 'name': 'DopplerSampleVolumeXPosition' },
+  '(0018,603A)': { 'tag': '(0018,603A)', 'vr': 'UL', 'vm': '1', 'name': 'DopplerSampleVolumeYPositionRetired' },
+  '(0018,603B)': { 'tag': '(0018,603B)', 'vr': 'SL', 'vm': '1', 'name': 'DopplerSampleVolumeYPosition' },
+  '(0018,603C)': { 'tag': '(0018,603C)', 'vr': 'UL', 'vm': '1', 'name': 'TMLinePositionX0Retired' },
+  '(0018,603D)': { 'tag': '(0018,603D)', 'vr': 'SL', 'vm': '1', 'name': 'TMLinePositionX0' },
+  '(0018,603E)': { 'tag': '(0018,603E)', 'vr': 'UL', 'vm': '1', 'name': 'TMLinePositionY0Retired' },
+  '(0018,603F)': { 'tag': '(0018,603F)', 'vr': 'SL', 'vm': '1', 'name': 'TMLinePositionY0' },
+  '(0018,6040)': { 'tag': '(0018,6040)', 'vr': 'UL', 'vm': '1', 'name': 'TMLinePositionX1Retired' },
+  '(0018,6041)': { 'tag': '(0018,6041)', 'vr': 'SL', 'vm': '1', 'name': 'TMLinePositionX1' },
+  '(0018,6042)': { 'tag': '(0018,6042)', 'vr': 'UL', 'vm': '1', 'name': 'TMLinePositionY1Retired' },
+  '(0018,6043)': { 'tag': '(0018,6043)', 'vr': 'SL', 'vm': '1', 'name': 'TMLinePositionY1' },
+  '(0018,6044)': { 'tag': '(0018,6044)', 'vr': 'US', 'vm': '1', 'name': 'PixelComponentOrganization' },
+  '(0018,6046)': { 'tag': '(0018,6046)', 'vr': 'UL', 'vm': '1', 'name': 'PixelComponentMask' },
+  '(0018,6048)': { 'tag': '(0018,6048)', 'vr': 'UL', 'vm': '1', 'name': 'PixelComponentRangeStart' },
+  '(0018,604A)': { 'tag': '(0018,604A)', 'vr': 'UL', 'vm': '1', 'name': 'PixelComponentRangeStop' },
+  '(0018,604C)': { 'tag': '(0018,604C)', 'vr': 'US', 'vm': '1', 'name': 'PixelComponentPhysicalUnits' },
+  '(0018,604E)': { 'tag': '(0018,604E)', 'vr': 'US', 'vm': '1', 'name': 'PixelComponentDataType' },
+  '(0018,6050)': { 'tag': '(0018,6050)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfTableBreakPoints' },
+  '(0018,6052)': { 'tag': '(0018,6052)', 'vr': 'UL', 'vm': '1-n', 'name': 'TableOfXBreakPoints' },
+  '(0018,6054)': { 'tag': '(0018,6054)', 'vr': 'FD', 'vm': '1-n', 'name': 'TableOfYBreakPoints' },
+  '(0018,6056)': { 'tag': '(0018,6056)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfTableEntries' },
+  '(0018,6058)': { 'tag': '(0018,6058)', 'vr': 'UL', 'vm': '1-n', 'name': 'TableOfPixelValues' },
+  '(0018,605A)': { 'tag': '(0018,605A)', 'vr': 'FL', 'vm': '1-n', 'name': 'TableOfParameterValues' },
+  '(0018,6060)': { 'tag': '(0018,6060)', 'vr': 'FL', 'vm': '1-n', 'name': 'RWaveTimeVector' },
+  '(0018,7000)': { 'tag': '(0018,7000)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorConditionsNominalFlag' },
+  '(0018,7001)': { 'tag': '(0018,7001)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorTemperature' },
+  '(0018,7004)': { 'tag': '(0018,7004)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorType' },
+  '(0018,7005)': { 'tag': '(0018,7005)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorConfiguration' },
+  '(0018,7006)': { 'tag': '(0018,7006)', 'vr': 'LT', 'vm': '1', 'name': 'DetectorDescription' },
+  '(0018,7008)': { 'tag': '(0018,7008)', 'vr': 'LT', 'vm': '1', 'name': 'DetectorMode' },
+  '(0018,700A)': { 'tag': '(0018,700A)', 'vr': 'SH', 'vm': '1', 'name': 'DetectorID' },
+  '(0018,700C)': { 'tag': '(0018,700C)', 'vr': 'DA', 'vm': '1', 'name': 'DateOfLastDetectorCalibration' },
+  '(0018,700E)': { 'tag': '(0018,700E)', 'vr': 'TM', 'vm': '1', 'name': 'TimeOfLastDetectorCalibration' },
+  '(0018,7010)': { 'tag': '(0018,7010)', 'vr': 'IS', 'vm': '1', 'name': 'ExposuresOnDetectorSinceLastCalibration' },
+  '(0018,7011)': { 'tag': '(0018,7011)', 'vr': 'IS', 'vm': '1', 'name': 'ExposuresOnDetectorSinceManufactured' },
+  '(0018,7012)': { 'tag': '(0018,7012)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorTimeSinceLastExposure' },
+  '(0018,7014)': { 'tag': '(0018,7014)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorActiveTime' },
+  '(0018,7016)': { 'tag': '(0018,7016)', 'vr': 'DS', 'vm': '1', 'name': 'DetectorActivationOffsetFromExposure' },
+  '(0018,701A)': { 'tag': '(0018,701A)', 'vr': 'DS', 'vm': '2', 'name': 'DetectorBinning' },
+  '(0018,7020)': { 'tag': '(0018,7020)', 'vr': 'DS', 'vm': '2', 'name': 'DetectorElementPhysicalSize' },
+  '(0018,7022)': { 'tag': '(0018,7022)', 'vr': 'DS', 'vm': '2', 'name': 'DetectorElementSpacing' },
+  '(0018,7024)': { 'tag': '(0018,7024)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorActiveShape' },
+  '(0018,7026)': { 'tag': '(0018,7026)', 'vr': 'DS', 'vm': '1-2', 'name': 'DetectorActiveDimensions' },
+  '(0018,7028)': { 'tag': '(0018,7028)', 'vr': 'DS', 'vm': '2', 'name': 'DetectorActiveOrigin' },
+  '(0018,702A)': { 'tag': '(0018,702A)', 'vr': 'LO', 'vm': '1', 'name': 'DetectorManufacturerName' },
+  '(0018,702B)': { 'tag': '(0018,702B)', 'vr': 'LO', 'vm': '1', 'name': 'DetectorManufacturerModelName' },
+  '(0018,7030)': { 'tag': '(0018,7030)', 'vr': 'DS', 'vm': '2', 'name': 'FieldOfViewOrigin' },
+  '(0018,7032)': { 'tag': '(0018,7032)', 'vr': 'DS', 'vm': '1', 'name': 'FieldOfViewRotation' },
+  '(0018,7034)': { 'tag': '(0018,7034)', 'vr': 'CS', 'vm': '1', 'name': 'FieldOfViewHorizontalFlip' },
+  '(0018,7036)': { 'tag': '(0018,7036)', 'vr': 'FL', 'vm': '2', 'name': 'PixelDataAreaOriginRelativeToFOV' },
+  '(0018,7038)': { 'tag': '(0018,7038)', 'vr': 'FL', 'vm': '1', 'name': 'PixelDataAreaRotationAngleRelativeToFOV' },
+  '(0018,7040)': { 'tag': '(0018,7040)', 'vr': 'LT', 'vm': '1', 'name': 'GridAbsorbingMaterial' },
+  '(0018,7041)': { 'tag': '(0018,7041)', 'vr': 'LT', 'vm': '1', 'name': 'GridSpacingMaterial' },
+  '(0018,7042)': { 'tag': '(0018,7042)', 'vr': 'DS', 'vm': '1', 'name': 'GridThickness' },
+  '(0018,7044)': { 'tag': '(0018,7044)', 'vr': 'DS', 'vm': '1', 'name': 'GridPitch' },
+  '(0018,7046)': { 'tag': '(0018,7046)', 'vr': 'IS', 'vm': '2', 'name': 'GridAspectRatio' },
+  '(0018,7048)': { 'tag': '(0018,7048)', 'vr': 'DS', 'vm': '1', 'name': 'GridPeriod' },
+  '(0018,704C)': { 'tag': '(0018,704C)', 'vr': 'DS', 'vm': '1', 'name': 'GridFocalDistance' },
+  '(0018,7050)': { 'tag': '(0018,7050)', 'vr': 'CS', 'vm': '1-n', 'name': 'FilterMaterial' },
+  '(0018,7052)': { 'tag': '(0018,7052)', 'vr': 'DS', 'vm': '1-n', 'name': 'FilterThicknessMinimum' },
+  '(0018,7054)': { 'tag': '(0018,7054)', 'vr': 'DS', 'vm': '1-n', 'name': 'FilterThicknessMaximum' },
+  '(0018,7056)': { 'tag': '(0018,7056)', 'vr': 'FL', 'vm': '1-n', 'name': 'FilterBeamPathLengthMinimum' },
+  '(0018,7058)': { 'tag': '(0018,7058)', 'vr': 'FL', 'vm': '1-n', 'name': 'FilterBeamPathLengthMaximum' },
+  '(0018,7060)': { 'tag': '(0018,7060)', 'vr': 'CS', 'vm': '1', 'name': 'ExposureControlMode' },
+  '(0018,7062)': { 'tag': '(0018,7062)', 'vr': 'LT', 'vm': '1', 'name': 'ExposureControlModeDescription' },
+  '(0018,7064)': { 'tag': '(0018,7064)', 'vr': 'CS', 'vm': '1', 'name': 'ExposureStatus' },
+  '(0018,7065)': { 'tag': '(0018,7065)', 'vr': 'DS', 'vm': '1', 'name': 'PhototimerSetting' },
+  '(0018,8150)': { 'tag': '(0018,8150)', 'vr': 'DS', 'vm': '1', 'name': 'ExposureTimeInuS' },
+  '(0018,8151)': { 'tag': '(0018,8151)', 'vr': 'DS', 'vm': '1', 'name': 'XRayTubeCurrentInuA' },
+  '(0018,9004)': { 'tag': '(0018,9004)', 'vr': 'CS', 'vm': '1', 'name': 'ContentQualification' },
+  '(0018,9005)': { 'tag': '(0018,9005)', 'vr': 'SH', 'vm': '1', 'name': 'PulseSequenceName' },
+  '(0018,9006)': { 'tag': '(0018,9006)', 'vr': 'SQ', 'vm': '1', 'name': 'MRImagingModifierSequence' },
+  '(0018,9008)': { 'tag': '(0018,9008)', 'vr': 'CS', 'vm': '1', 'name': 'EchoPulseSequence' },
+  '(0018,9009)': { 'tag': '(0018,9009)', 'vr': 'CS', 'vm': '1', 'name': 'InversionRecovery' },
+  '(0018,9010)': { 'tag': '(0018,9010)', 'vr': 'CS', 'vm': '1', 'name': 'FlowCompensation' },
+  '(0018,9011)': { 'tag': '(0018,9011)', 'vr': 'CS', 'vm': '1', 'name': 'MultipleSpinEcho' },
+  '(0018,9012)': { 'tag': '(0018,9012)', 'vr': 'CS', 'vm': '1', 'name': 'MultiPlanarExcitation' },
+  '(0018,9014)': { 'tag': '(0018,9014)', 'vr': 'CS', 'vm': '1', 'name': 'PhaseContrast' },
+  '(0018,9015)': { 'tag': '(0018,9015)', 'vr': 'CS', 'vm': '1', 'name': 'TimeOfFlightContrast' },
+  '(0018,9016)': { 'tag': '(0018,9016)', 'vr': 'CS', 'vm': '1', 'name': 'Spoiling' },
+  '(0018,9017)': { 'tag': '(0018,9017)', 'vr': 'CS', 'vm': '1', 'name': 'SteadyStatePulseSequence' },
+  '(0018,9018)': { 'tag': '(0018,9018)', 'vr': 'CS', 'vm': '1', 'name': 'EchoPlanarPulseSequence' },
+  '(0018,9019)': { 'tag': '(0018,9019)', 'vr': 'FD', 'vm': '1', 'name': 'TagAngleFirstAxis' },
+  '(0018,9020)': { 'tag': '(0018,9020)', 'vr': 'CS', 'vm': '1', 'name': 'MagnetizationTransfer' },
+  '(0018,9021)': { 'tag': '(0018,9021)', 'vr': 'CS', 'vm': '1', 'name': 'T2Preparation' },
+  '(0018,9022)': { 'tag': '(0018,9022)', 'vr': 'CS', 'vm': '1', 'name': 'BloodSignalNulling' },
+  '(0018,9024)': { 'tag': '(0018,9024)', 'vr': 'CS', 'vm': '1', 'name': 'SaturationRecovery' },
+  '(0018,9025)': { 'tag': '(0018,9025)', 'vr': 'CS', 'vm': '1', 'name': 'SpectrallySelectedSuppression' },
+  '(0018,9026)': { 'tag': '(0018,9026)', 'vr': 'CS', 'vm': '1', 'name': 'SpectrallySelectedExcitation' },
+  '(0018,9027)': { 'tag': '(0018,9027)', 'vr': 'CS', 'vm': '1', 'name': 'SpatialPresaturation' },
+  '(0018,9028)': { 'tag': '(0018,9028)', 'vr': 'CS', 'vm': '1', 'name': 'Tagging' },
+  '(0018,9029)': { 'tag': '(0018,9029)', 'vr': 'CS', 'vm': '1', 'name': 'OversamplingPhase' },
+  '(0018,9030)': { 'tag': '(0018,9030)', 'vr': 'FD', 'vm': '1', 'name': 'TagSpacingFirstDimension' },
+  '(0018,9032)': { 'tag': '(0018,9032)', 'vr': 'CS', 'vm': '1', 'name': 'GeometryOfKSpaceTraversal' },
+  '(0018,9033)': { 'tag': '(0018,9033)', 'vr': 'CS', 'vm': '1', 'name': 'SegmentedKSpaceTraversal' },
+  '(0018,9034)': { 'tag': '(0018,9034)', 'vr': 'CS', 'vm': '1', 'name': 'RectilinearPhaseEncodeReordering' },
+  '(0018,9035)': { 'tag': '(0018,9035)', 'vr': 'FD', 'vm': '1', 'name': 'TagThickness' },
+  '(0018,9036)': { 'tag': '(0018,9036)', 'vr': 'CS', 'vm': '1', 'name': 'PartialFourierDirection' },
+  '(0018,9037)': { 'tag': '(0018,9037)', 'vr': 'CS', 'vm': '1', 'name': 'CardiacSynchronizationTechnique' },
+  '(0018,9041)': { 'tag': '(0018,9041)', 'vr': 'LO', 'vm': '1', 'name': 'ReceiveCoilManufacturerName' },
+  '(0018,9042)': { 'tag': '(0018,9042)', 'vr': 'SQ', 'vm': '1', 'name': 'MRReceiveCoilSequence' },
+  '(0018,9043)': { 'tag': '(0018,9043)', 'vr': 'CS', 'vm': '1', 'name': 'ReceiveCoilType' },
+  '(0018,9044)': { 'tag': '(0018,9044)', 'vr': 'CS', 'vm': '1', 'name': 'QuadratureReceiveCoil' },
+  '(0018,9045)': { 'tag': '(0018,9045)', 'vr': 'SQ', 'vm': '1', 'name': 'MultiCoilDefinitionSequence' },
+  '(0018,9046)': { 'tag': '(0018,9046)', 'vr': 'LO', 'vm': '1', 'name': 'MultiCoilConfiguration' },
+  '(0018,9047)': { 'tag': '(0018,9047)', 'vr': 'SH', 'vm': '1', 'name': 'MultiCoilElementName' },
+  '(0018,9048)': { 'tag': '(0018,9048)', 'vr': 'CS', 'vm': '1', 'name': 'MultiCoilElementUsed' },
+  '(0018,9049)': { 'tag': '(0018,9049)', 'vr': 'SQ', 'vm': '1', 'name': 'MRTransmitCoilSequence' },
+  '(0018,9050)': { 'tag': '(0018,9050)', 'vr': 'LO', 'vm': '1', 'name': 'TransmitCoilManufacturerName' },
+  '(0018,9051)': { 'tag': '(0018,9051)', 'vr': 'CS', 'vm': '1', 'name': 'TransmitCoilType' },
+  '(0018,9052)': { 'tag': '(0018,9052)', 'vr': 'FD', 'vm': '1-2', 'name': 'SpectralWidth' },
+  '(0018,9053)': { 'tag': '(0018,9053)', 'vr': 'FD', 'vm': '1-2', 'name': 'ChemicalShiftReference' },
+  '(0018,9054)': { 'tag': '(0018,9054)', 'vr': 'CS', 'vm': '1', 'name': 'VolumeLocalizationTechnique' },
+  '(0018,9058)': { 'tag': '(0018,9058)', 'vr': 'US', 'vm': '1', 'name': 'MRAcquisitionFrequencyEncodingSteps' },
+  '(0018,9059)': { 'tag': '(0018,9059)', 'vr': 'CS', 'vm': '1', 'name': 'Decoupling' },
+  '(0018,9060)': { 'tag': '(0018,9060)', 'vr': 'CS', 'vm': '1-2', 'name': 'DecoupledNucleus' },
+  '(0018,9061)': { 'tag': '(0018,9061)', 'vr': 'FD', 'vm': '1-2', 'name': 'DecouplingFrequency' },
+  '(0018,9062)': { 'tag': '(0018,9062)', 'vr': 'CS', 'vm': '1', 'name': 'DecouplingMethod' },
+  '(0018,9063)': { 'tag': '(0018,9063)', 'vr': 'FD', 'vm': '1-2', 'name': 'DecouplingChemicalShiftReference' },
+  '(0018,9064)': { 'tag': '(0018,9064)', 'vr': 'CS', 'vm': '1', 'name': 'KSpaceFiltering' },
+  '(0018,9065)': { 'tag': '(0018,9065)', 'vr': 'CS', 'vm': '1-2', 'name': 'TimeDomainFiltering' },
+  '(0018,9066)': { 'tag': '(0018,9066)', 'vr': 'US', 'vm': '1-2', 'name': 'NumberOfZeroFills' },
+  '(0018,9067)': { 'tag': '(0018,9067)', 'vr': 'CS', 'vm': '1', 'name': 'BaselineCorrection' },
+  '(0018,9069)': { 'tag': '(0018,9069)', 'vr': 'FD', 'vm': '1', 'name': 'ParallelReductionFactorInPlane' },
+  '(0018,9070)': { 'tag': '(0018,9070)', 'vr': 'FD', 'vm': '1', 'name': 'CardiacRRIntervalSpecified' },
+  '(0018,9073)': { 'tag': '(0018,9073)', 'vr': 'FD', 'vm': '1', 'name': 'AcquisitionDuration' },
+  '(0018,9074)': { 'tag': '(0018,9074)', 'vr': 'DT', 'vm': '1', 'name': 'FrameAcquisitionDateTime' },
+  '(0018,9075)': { 'tag': '(0018,9075)', 'vr': 'CS', 'vm': '1', 'name': 'DiffusionDirectionality' },
+  '(0018,9076)': { 'tag': '(0018,9076)', 'vr': 'SQ', 'vm': '1', 'name': 'DiffusionGradientDirectionSequence' },
+  '(0018,9077)': { 'tag': '(0018,9077)', 'vr': 'CS', 'vm': '1', 'name': 'ParallelAcquisition' },
+  '(0018,9078)': { 'tag': '(0018,9078)', 'vr': 'CS', 'vm': '1', 'name': 'ParallelAcquisitionTechnique' },
+  '(0018,9079)': { 'tag': '(0018,9079)', 'vr': 'FD', 'vm': '1-n', 'name': 'InversionTimes' },
+  '(0018,9080)': { 'tag': '(0018,9080)', 'vr': 'ST', 'vm': '1', 'name': 'MetaboliteMapDescription' },
+  '(0018,9081)': { 'tag': '(0018,9081)', 'vr': 'CS', 'vm': '1', 'name': 'PartialFourier' },
+  '(0018,9082)': { 'tag': '(0018,9082)', 'vr': 'FD', 'vm': '1', 'name': 'EffectiveEchoTime' },
+  '(0018,9083)': { 'tag': '(0018,9083)', 'vr': 'SQ', 'vm': '1', 'name': 'MetaboliteMapCodeSequence' },
+  '(0018,9084)': { 'tag': '(0018,9084)', 'vr': 'SQ', 'vm': '1', 'name': 'ChemicalShiftSequence' },
+  '(0018,9085)': { 'tag': '(0018,9085)', 'vr': 'CS', 'vm': '1', 'name': 'CardiacSignalSource' },
+  '(0018,9087)': { 'tag': '(0018,9087)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValue' },
+  '(0018,9089)': { 'tag': '(0018,9089)', 'vr': 'FD', 'vm': '3', 'name': 'DiffusionGradientOrientation' },
+  '(0018,9090)': { 'tag': '(0018,9090)', 'vr': 'FD', 'vm': '3', 'name': 'VelocityEncodingDirection' },
+  '(0018,9091)': { 'tag': '(0018,9091)', 'vr': 'FD', 'vm': '1', 'name': 'VelocityEncodingMinimumValue' },
+  '(0018,9092)': { 'tag': '(0018,9092)', 'vr': 'SQ', 'vm': '1', 'name': 'VelocityEncodingAcquisitionSequence' },
+  '(0018,9093)': { 'tag': '(0018,9093)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfKSpaceTrajectories' },
+  '(0018,9094)': { 'tag': '(0018,9094)', 'vr': 'CS', 'vm': '1', 'name': 'CoverageOfKSpace' },
+  '(0018,9095)': { 'tag': '(0018,9095)', 'vr': 'UL', 'vm': '1', 'name': 'SpectroscopyAcquisitionPhaseRows' },
+  '(0018,9096)': { 'tag': '(0018,9096)', 'vr': 'FD', 'vm': '1', 'name': 'ParallelReductionFactorInPlaneRetired' },
+  '(0018,9098)': { 'tag': '(0018,9098)', 'vr': 'FD', 'vm': '1-2', 'name': 'TransmitterFrequency' },
+  '(0018,9100)': { 'tag': '(0018,9100)', 'vr': 'CS', 'vm': '1-2', 'name': 'ResonantNucleus' },
+  '(0018,9101)': { 'tag': '(0018,9101)', 'vr': 'CS', 'vm': '1', 'name': 'FrequencyCorrection' },
+  '(0018,9103)': { 'tag': '(0018,9103)', 'vr': 'SQ', 'vm': '1', 'name': 'MRSpectroscopyFOVGeometrySequence' },
+  '(0018,9104)': { 'tag': '(0018,9104)', 'vr': 'FD', 'vm': '1', 'name': 'SlabThickness' },
+  '(0018,9105)': { 'tag': '(0018,9105)', 'vr': 'FD', 'vm': '3', 'name': 'SlabOrientation' },
+  '(0018,9106)': { 'tag': '(0018,9106)', 'vr': 'FD', 'vm': '3', 'name': 'MidSlabPosition' },
+  '(0018,9107)': { 'tag': '(0018,9107)', 'vr': 'SQ', 'vm': '1', 'name': 'MRSpatialSaturationSequence' },
+  '(0018,9112)': { 'tag': '(0018,9112)', 'vr': 'SQ', 'vm': '1', 'name': 'MRTimingAndRelatedParametersSequence' },
+  '(0018,9114)': { 'tag': '(0018,9114)', 'vr': 'SQ', 'vm': '1', 'name': 'MREchoSequence' },
+  '(0018,9115)': { 'tag': '(0018,9115)', 'vr': 'SQ', 'vm': '1', 'name': 'MRModifierSequence' },
+  '(0018,9117)': { 'tag': '(0018,9117)', 'vr': 'SQ', 'vm': '1', 'name': 'MRDiffusionSequence' },
+  '(0018,9118)': { 'tag': '(0018,9118)', 'vr': 'SQ', 'vm': '1', 'name': 'CardiacSynchronizationSequence' },
+  '(0018,9119)': { 'tag': '(0018,9119)', 'vr': 'SQ', 'vm': '1', 'name': 'MRAveragesSequence' },
+  '(0018,9125)': { 'tag': '(0018,9125)', 'vr': 'SQ', 'vm': '1', 'name': 'MRFOVGeometrySequence' },
+  '(0018,9126)': { 'tag': '(0018,9126)', 'vr': 'SQ', 'vm': '1', 'name': 'VolumeLocalizationSequence' },
+  '(0018,9127)': { 'tag': '(0018,9127)', 'vr': 'UL', 'vm': '1', 'name': 'SpectroscopyAcquisitionDataColumns' },
+  '(0018,9147)': { 'tag': '(0018,9147)', 'vr': 'CS', 'vm': '1', 'name': 'DiffusionAnisotropyType' },
+  '(0018,9151)': { 'tag': '(0018,9151)', 'vr': 'DT', 'vm': '1', 'name': 'FrameReferenceDateTime' },
+  '(0018,9152)': { 'tag': '(0018,9152)', 'vr': 'SQ', 'vm': '1', 'name': 'MRMetaboliteMapSequence' },
+  '(0018,9155)': { 'tag': '(0018,9155)', 'vr': 'FD', 'vm': '1', 'name': 'ParallelReductionFactorOutOfPlane' },
+  '(0018,9159)': { 'tag': '(0018,9159)', 'vr': 'UL', 'vm': '1', 'name': 'SpectroscopyAcquisitionOutOfPlanePhaseSteps' },
+  '(0018,9166)': { 'tag': '(0018,9166)', 'vr': 'CS', 'vm': '1', 'name': 'BulkMotionStatus' },
+  '(0018,9168)': { 'tag': '(0018,9168)', 'vr': 'FD', 'vm': '1', 'name': 'ParallelReductionFactorSecondInPlane' },
+  '(0018,9169)': { 'tag': '(0018,9169)', 'vr': 'CS', 'vm': '1', 'name': 'CardiacBeatRejectionTechnique' },
+  '(0018,9170)': { 'tag': '(0018,9170)', 'vr': 'CS', 'vm': '1', 'name': 'RespiratoryMotionCompensationTechnique' },
+  '(0018,9171)': { 'tag': '(0018,9171)', 'vr': 'CS', 'vm': '1', 'name': 'RespiratorySignalSource' },
+  '(0018,9172)': { 'tag': '(0018,9172)', 'vr': 'CS', 'vm': '1', 'name': 'BulkMotionCompensationTechnique' },
+  '(0018,9173)': { 'tag': '(0018,9173)', 'vr': 'CS', 'vm': '1', 'name': 'BulkMotionSignalSource' },
+  '(0018,9174)': { 'tag': '(0018,9174)', 'vr': 'CS', 'vm': '1', 'name': 'ApplicableSafetyStandardAgency' },
+  '(0018,9175)': { 'tag': '(0018,9175)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicableSafetyStandardDescription' },
+  '(0018,9176)': { 'tag': '(0018,9176)', 'vr': 'SQ', 'vm': '1', 'name': 'OperatingModeSequence' },
+  '(0018,9177)': { 'tag': '(0018,9177)', 'vr': 'CS', 'vm': '1', 'name': 'OperatingModeType' },
+  '(0018,9178)': { 'tag': '(0018,9178)', 'vr': 'CS', 'vm': '1', 'name': 'OperatingMode' },
+  '(0018,9179)': { 'tag': '(0018,9179)', 'vr': 'CS', 'vm': '1', 'name': 'SpecificAbsorptionRateDefinition' },
+  '(0018,9180)': { 'tag': '(0018,9180)', 'vr': 'CS', 'vm': '1', 'name': 'GradientOutputType' },
+  '(0018,9181)': { 'tag': '(0018,9181)', 'vr': 'FD', 'vm': '1', 'name': 'SpecificAbsorptionRateValue' },
+  '(0018,9182)': { 'tag': '(0018,9182)', 'vr': 'FD', 'vm': '1', 'name': 'GradientOutput' },
+  '(0018,9183)': { 'tag': '(0018,9183)', 'vr': 'CS', 'vm': '1', 'name': 'FlowCompensationDirection' },
+  '(0018,9184)': { 'tag': '(0018,9184)', 'vr': 'FD', 'vm': '1', 'name': 'TaggingDelay' },
+  '(0018,9185)': { 'tag': '(0018,9185)', 'vr': 'ST', 'vm': '1', 'name': 'RespiratoryMotionCompensationTechniqueDescription' },
+  '(0018,9186)': { 'tag': '(0018,9186)', 'vr': 'SH', 'vm': '1', 'name': 'RespiratorySignalSourceID' },
+  '(0018,9195)': { 'tag': '(0018,9195)', 'vr': 'FD', 'vm': '1', 'name': 'ChemicalShiftMinimumIntegrationLimitInHz' },
+  '(0018,9196)': { 'tag': '(0018,9196)', 'vr': 'FD', 'vm': '1', 'name': 'ChemicalShiftMaximumIntegrationLimitInHz' },
+  '(0018,9197)': { 'tag': '(0018,9197)', 'vr': 'SQ', 'vm': '1', 'name': 'MRVelocityEncodingSequence' },
+  '(0018,9198)': { 'tag': '(0018,9198)', 'vr': 'CS', 'vm': '1', 'name': 'FirstOrderPhaseCorrection' },
+  '(0018,9199)': { 'tag': '(0018,9199)', 'vr': 'CS', 'vm': '1', 'name': 'WaterReferencedPhaseCorrection' },
+  '(0018,9200)': { 'tag': '(0018,9200)', 'vr': 'CS', 'vm': '1', 'name': 'MRSpectroscopyAcquisitionType' },
+  '(0018,9214)': { 'tag': '(0018,9214)', 'vr': 'CS', 'vm': '1', 'name': 'RespiratoryCyclePosition' },
+  '(0018,9217)': { 'tag': '(0018,9217)', 'vr': 'FD', 'vm': '1', 'name': 'VelocityEncodingMaximumValue' },
+  '(0018,9218)': { 'tag': '(0018,9218)', 'vr': 'FD', 'vm': '1', 'name': 'TagSpacingSecondDimension' },
+  '(0018,9219)': { 'tag': '(0018,9219)', 'vr': 'SS', 'vm': '1', 'name': 'TagAngleSecondAxis' },
+  '(0018,9220)': { 'tag': '(0018,9220)', 'vr': 'FD', 'vm': '1', 'name': 'FrameAcquisitionDuration' },
+  '(0018,9226)': { 'tag': '(0018,9226)', 'vr': 'SQ', 'vm': '1', 'name': 'MRImageFrameTypeSequence' },
+  '(0018,9227)': { 'tag': '(0018,9227)', 'vr': 'SQ', 'vm': '1', 'name': 'MRSpectroscopyFrameTypeSequence' },
+  '(0018,9231)': { 'tag': '(0018,9231)', 'vr': 'US', 'vm': '1', 'name': 'MRAcquisitionPhaseEncodingStepsInPlane' },
+  '(0018,9232)': { 'tag': '(0018,9232)', 'vr': 'US', 'vm': '1', 'name': 'MRAcquisitionPhaseEncodingStepsOutOfPlane' },
+  '(0018,9234)': { 'tag': '(0018,9234)', 'vr': 'UL', 'vm': '1', 'name': 'SpectroscopyAcquisitionPhaseColumns' },
+  '(0018,9236)': { 'tag': '(0018,9236)', 'vr': 'CS', 'vm': '1', 'name': 'CardiacCyclePosition' },
+  '(0018,9239)': { 'tag': '(0018,9239)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecificAbsorptionRateSequence' },
+  '(0018,9240)': { 'tag': '(0018,9240)', 'vr': 'US', 'vm': '1', 'name': 'RFEchoTrainLength' },
+  '(0018,9241)': { 'tag': '(0018,9241)', 'vr': 'US', 'vm': '1', 'name': 'GradientEchoTrainLength' },
+  '(0018,9250)': { 'tag': '(0018,9250)', 'vr': 'CS', 'vm': '1', 'name': 'ArterialSpinLabelingContrast' },
+  '(0018,9251)': { 'tag': '(0018,9251)', 'vr': 'SQ', 'vm': '1', 'name': 'MRArterialSpinLabelingSequence' },
+  '(0018,9252)': { 'tag': '(0018,9252)', 'vr': 'LO', 'vm': '1', 'name': 'ASLTechniqueDescription' },
+  '(0018,9253)': { 'tag': '(0018,9253)', 'vr': 'US', 'vm': '1', 'name': 'ASLSlabNumber' },
+  '(0018,9254)': { 'tag': '(0018,9254)', 'vr': 'FD', 'vm': '1 ', 'name': 'ASLSlabThickness' },
+  '(0018,9255)': { 'tag': '(0018,9255)', 'vr': 'FD', 'vm': '3 ', 'name': 'ASLSlabOrientation' },
+  '(0018,9256)': { 'tag': '(0018,9256)', 'vr': 'FD', 'vm': '3', 'name': 'ASLMidSlabPosition' },
+  '(0018,9257)': { 'tag': '(0018,9257)', 'vr': 'CS', 'vm': '1 ', 'name': 'ASLContext' },
+  '(0018,9258)': { 'tag': '(0018,9258)', 'vr': 'UL', 'vm': '1', 'name': 'ASLPulseTrainDuration' },
+  '(0018,9259)': { 'tag': '(0018,9259)', 'vr': 'CS', 'vm': '1 ', 'name': 'ASLCrusherFlag' },
+  '(0018,925A)': { 'tag': '(0018,925A)', 'vr': 'FD', 'vm': '1', 'name': 'ASLCrusherFlow' },
+  '(0018,925B)': { 'tag': '(0018,925B)', 'vr': 'LO', 'vm': '1', 'name': 'ASLCrusherDescription' },
+  '(0018,925C)': { 'tag': '(0018,925C)', 'vr': 'CS', 'vm': '1 ', 'name': 'ASLBolusCutoffFlag' },
+  '(0018,925D)': { 'tag': '(0018,925D)', 'vr': 'SQ', 'vm': '1', 'name': 'ASLBolusCutoffTimingSequence' },
+  '(0018,925E)': { 'tag': '(0018,925E)', 'vr': 'LO', 'vm': '1', 'name': 'ASLBolusCutoffTechnique' },
+  '(0018,925F)': { 'tag': '(0018,925F)', 'vr': 'UL', 'vm': '1', 'name': 'ASLBolusCutoffDelayTime' },
+  '(0018,9260)': { 'tag': '(0018,9260)', 'vr': 'SQ', 'vm': '1', 'name': 'ASLSlabSequence' },
+  '(0018,9295)': { 'tag': '(0018,9295)', 'vr': 'FD', 'vm': '1', 'name': 'ChemicalShiftMinimumIntegrationLimitInppm' },
+  '(0018,9296)': { 'tag': '(0018,9296)', 'vr': 'FD', 'vm': '1', 'name': 'ChemicalShiftMaximumIntegrationLimitInppm' },
+  '(0018,9301)': { 'tag': '(0018,9301)', 'vr': 'SQ', 'vm': '1', 'name': 'CTAcquisitionTypeSequence' },
+  '(0018,9302)': { 'tag': '(0018,9302)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionType' },
+  '(0018,9303)': { 'tag': '(0018,9303)', 'vr': 'FD', 'vm': '1', 'name': 'TubeAngle' },
+  '(0018,9304)': { 'tag': '(0018,9304)', 'vr': 'SQ', 'vm': '1', 'name': 'CTAcquisitionDetailsSequence' },
+  '(0018,9305)': { 'tag': '(0018,9305)', 'vr': 'FD', 'vm': '1', 'name': 'RevolutionTime' },
+  '(0018,9306)': { 'tag': '(0018,9306)', 'vr': 'FD', 'vm': '1', 'name': 'SingleCollimationWidth' },
+  '(0018,9307)': { 'tag': '(0018,9307)', 'vr': 'FD', 'vm': '1', 'name': 'TotalCollimationWidth' },
+  '(0018,9308)': { 'tag': '(0018,9308)', 'vr': 'SQ', 'vm': '1', 'name': 'CTTableDynamicsSequence' },
+  '(0018,9309)': { 'tag': '(0018,9309)', 'vr': 'FD', 'vm': '1', 'name': 'TableSpeed' },
+  '(0018,9310)': { 'tag': '(0018,9310)', 'vr': 'FD', 'vm': '1', 'name': 'TableFeedPerRotation' },
+  '(0018,9311)': { 'tag': '(0018,9311)', 'vr': 'FD', 'vm': '1', 'name': 'SpiralPitchFactor' },
+  '(0018,9312)': { 'tag': '(0018,9312)', 'vr': 'SQ', 'vm': '1', 'name': 'CTGeometrySequence' },
+  '(0018,9313)': { 'tag': '(0018,9313)', 'vr': 'FD', 'vm': '3', 'name': 'DataCollectionCenterPatient' },
+  '(0018,9314)': { 'tag': '(0018,9314)', 'vr': 'SQ', 'vm': '1', 'name': 'CTReconstructionSequence' },
+  '(0018,9315)': { 'tag': '(0018,9315)', 'vr': 'CS', 'vm': '1', 'name': 'ReconstructionAlgorithm' },
+  '(0018,9316)': { 'tag': '(0018,9316)', 'vr': 'CS', 'vm': '1', 'name': 'ConvolutionKernelGroup' },
+  '(0018,9317)': { 'tag': '(0018,9317)', 'vr': 'FD', 'vm': '2', 'name': 'ReconstructionFieldOfView' },
+  '(0018,9318)': { 'tag': '(0018,9318)', 'vr': 'FD', 'vm': '3', 'name': 'ReconstructionTargetCenterPatient' },
+  '(0018,9319)': { 'tag': '(0018,9319)', 'vr': 'FD', 'vm': '1', 'name': 'ReconstructionAngle' },
+  '(0018,9320)': { 'tag': '(0018,9320)', 'vr': 'SH', 'vm': '1', 'name': 'ImageFilter' },
+  '(0018,9321)': { 'tag': '(0018,9321)', 'vr': 'SQ', 'vm': '1', 'name': 'CTExposureSequence' },
+  '(0018,9322)': { 'tag': '(0018,9322)', 'vr': 'FD', 'vm': '2', 'name': 'ReconstructionPixelSpacing' },
+  '(0018,9323)': { 'tag': '(0018,9323)', 'vr': 'CS', 'vm': '1', 'name': 'ExposureModulationType' },
+  '(0018,9324)': { 'tag': '(0018,9324)', 'vr': 'FD', 'vm': '1', 'name': 'EstimatedDoseSaving' },
+  '(0018,9325)': { 'tag': '(0018,9325)', 'vr': 'SQ', 'vm': '1', 'name': 'CTXRayDetailsSequence' },
+  '(0018,9326)': { 'tag': '(0018,9326)', 'vr': 'SQ', 'vm': '1', 'name': 'CTPositionSequence' },
+  '(0018,9327)': { 'tag': '(0018,9327)', 'vr': 'FD', 'vm': '1', 'name': 'TablePosition' },
+  '(0018,9328)': { 'tag': '(0018,9328)', 'vr': 'FD', 'vm': '1', 'name': 'ExposureTimeInms' },
+  '(0018,9329)': { 'tag': '(0018,9329)', 'vr': 'SQ', 'vm': '1', 'name': 'CTImageFrameTypeSequence' },
+  '(0018,9330)': { 'tag': '(0018,9330)', 'vr': 'FD', 'vm': '1', 'name': 'XRayTubeCurrentInmA' },
+  '(0018,9332)': { 'tag': '(0018,9332)', 'vr': 'FD', 'vm': '1', 'name': 'ExposureInmAs' },
+  '(0018,9333)': { 'tag': '(0018,9333)', 'vr': 'CS', 'vm': '1', 'name': 'ConstantVolumeFlag' },
+  '(0018,9334)': { 'tag': '(0018,9334)', 'vr': 'CS', 'vm': '1', 'name': 'FluoroscopyFlag' },
+  '(0018,9335)': { 'tag': '(0018,9335)', 'vr': 'FD', 'vm': '1', 'name': 'DistanceSourceToDataCollectionCenter' },
+  '(0018,9337)': { 'tag': '(0018,9337)', 'vr': 'US', 'vm': '1', 'name': 'ContrastBolusAgentNumber' },
+  '(0018,9338)': { 'tag': '(0018,9338)', 'vr': 'SQ', 'vm': '1', 'name': 'ContrastBolusIngredientCodeSequence' },
+  '(0018,9340)': { 'tag': '(0018,9340)', 'vr': 'SQ', 'vm': '1', 'name': 'ContrastAdministrationProfileSequence' },
+  '(0018,9341)': { 'tag': '(0018,9341)', 'vr': 'SQ', 'vm': '1', 'name': 'ContrastBolusUsageSequence' },
+  '(0018,9342)': { 'tag': '(0018,9342)', 'vr': 'CS', 'vm': '1', 'name': 'ContrastBolusAgentAdministered' },
+  '(0018,9343)': { 'tag': '(0018,9343)', 'vr': 'CS', 'vm': '1', 'name': 'ContrastBolusAgentDetected' },
+  '(0018,9344)': { 'tag': '(0018,9344)', 'vr': 'CS', 'vm': '1', 'name': 'ContrastBolusAgentPhase' },
+  '(0018,9345)': { 'tag': '(0018,9345)', 'vr': 'FD', 'vm': '1', 'name': 'CTDIvol' },
+  '(0018,9346)': { 'tag': '(0018,9346)', 'vr': 'SQ', 'vm': '1', 'name': 'CTDIPhantomTypeCodeSequence' },
+  '(0018,9351)': { 'tag': '(0018,9351)', 'vr': 'FL', 'vm': '1', 'name': 'CalciumScoringMassFactorPatient' },
+  '(0018,9352)': { 'tag': '(0018,9352)', 'vr': 'FL', 'vm': '3', 'name': 'CalciumScoringMassFactorDevice' },
+  '(0018,9353)': { 'tag': '(0018,9353)', 'vr': 'FL', 'vm': '1', 'name': 'EnergyWeightingFactor' },
+  '(0018,9360)': { 'tag': '(0018,9360)', 'vr': 'SQ', 'vm': '1', 'name': 'CTAdditionalXRaySourceSequence' },
+  '(0018,9401)': { 'tag': '(0018,9401)', 'vr': 'SQ', 'vm': '1', 'name': 'ProjectionPixelCalibrationSequence' },
+  '(0018,9402)': { 'tag': '(0018,9402)', 'vr': 'FL', 'vm': '1', 'name': 'DistanceSourceToIsocenter' },
+  '(0018,9403)': { 'tag': '(0018,9403)', 'vr': 'FL', 'vm': '1', 'name': 'DistanceObjectToTableTop' },
+  '(0018,9404)': { 'tag': '(0018,9404)', 'vr': 'FL', 'vm': '2', 'name': 'ObjectPixelSpacingInCenterOfBeam' },
+  '(0018,9405)': { 'tag': '(0018,9405)', 'vr': 'SQ', 'vm': '1', 'name': 'PositionerPositionSequence' },
+  '(0018,9406)': { 'tag': '(0018,9406)', 'vr': 'SQ', 'vm': '1', 'name': 'TablePositionSequence' },
+  '(0018,9407)': { 'tag': '(0018,9407)', 'vr': 'SQ', 'vm': '1', 'name': 'CollimatorShapeSequence' },
+  '(0018,9410)': { 'tag': '(0018,9410)', 'vr': 'CS', 'vm': '1', 'name': 'PlanesInAcquisition' },
+  '(0018,9412)': { 'tag': '(0018,9412)', 'vr': 'SQ', 'vm': '1', 'name': 'XAXRFFrameCharacteristicsSequence' },
+  '(0018,9417)': { 'tag': '(0018,9417)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameAcquisitionSequence' },
+  '(0018,9420)': { 'tag': '(0018,9420)', 'vr': 'CS', 'vm': '1', 'name': 'XRayReceptorType' },
+  '(0018,9423)': { 'tag': '(0018,9423)', 'vr': 'LO', 'vm': '1', 'name': 'AcquisitionProtocolName' },
+  '(0018,9424)': { 'tag': '(0018,9424)', 'vr': 'LT', 'vm': '1', 'name': 'AcquisitionProtocolDescription' },
+  '(0018,9425)': { 'tag': '(0018,9425)', 'vr': 'CS', 'vm': '1', 'name': 'ContrastBolusIngredientOpaque' },
+  '(0018,9426)': { 'tag': '(0018,9426)', 'vr': 'FL', 'vm': '1', 'name': 'DistanceReceptorPlaneToDetectorHousing' },
+  '(0018,9427)': { 'tag': '(0018,9427)', 'vr': 'CS', 'vm': '1', 'name': 'IntensifierActiveShape' },
+  '(0018,9428)': { 'tag': '(0018,9428)', 'vr': 'FL', 'vm': '1-2', 'name': 'IntensifierActiveDimensions' },
+  '(0018,9429)': { 'tag': '(0018,9429)', 'vr': 'FL', 'vm': '2', 'name': 'PhysicalDetectorSize' },
+  '(0018,9430)': { 'tag': '(0018,9430)', 'vr': 'FL', 'vm': '2', 'name': 'PositionOfIsocenterProjection' },
+  '(0018,9432)': { 'tag': '(0018,9432)', 'vr': 'SQ', 'vm': '1', 'name': 'FieldOfViewSequence' },
+  '(0018,9433)': { 'tag': '(0018,9433)', 'vr': 'LO', 'vm': '1', 'name': 'FieldOfViewDescription' },
+  '(0018,9434)': { 'tag': '(0018,9434)', 'vr': 'SQ', 'vm': '1', 'name': 'ExposureControlSensingRegionsSequence' },
+  '(0018,9435)': { 'tag': '(0018,9435)', 'vr': 'CS', 'vm': '1', 'name': 'ExposureControlSensingRegionShape' },
+  '(0018,9436)': { 'tag': '(0018,9436)', 'vr': 'SS', 'vm': '1', 'name': 'ExposureControlSensingRegionLeftVerticalEdge' },
+  '(0018,9437)': { 'tag': '(0018,9437)', 'vr': 'SS', 'vm': '1', 'name': 'ExposureControlSensingRegionRightVerticalEdge' },
+  '(0018,9438)': { 'tag': '(0018,9438)', 'vr': 'SS', 'vm': '1', 'name': 'ExposureControlSensingRegionUpperHorizontalEdge' },
+  '(0018,9439)': { 'tag': '(0018,9439)', 'vr': 'SS', 'vm': '1', 'name': 'ExposureControlSensingRegionLowerHorizontalEdge' },
+  '(0018,9440)': { 'tag': '(0018,9440)', 'vr': 'SS', 'vm': '2', 'name': 'CenterOfCircularExposureControlSensingRegion' },
+  '(0018,9441)': { 'tag': '(0018,9441)', 'vr': 'US', 'vm': '1', 'name': 'RadiusOfCircularExposureControlSensingRegion' },
+  '(0018,9442)': { 'tag': '(0018,9442)', 'vr': 'SS', 'vm': '2-n', 'name': 'VerticesOfThePolygonalExposureControlSensingRegion' },
+  '(0018,9447)': { 'tag': '(0018,9447)', 'vr': 'FL', 'vm': '1', 'name': 'ColumnAngulationPatient' },
+  '(0018,9449)': { 'tag': '(0018,9449)', 'vr': 'FL', 'vm': '1', 'name': 'BeamAngle' },
+  '(0018,9451)': { 'tag': '(0018,9451)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameDetectorParametersSequence' },
+  '(0018,9452)': { 'tag': '(0018,9452)', 'vr': 'FL', 'vm': '1', 'name': 'CalculatedAnatomyThickness' },
+  '(0018,9455)': { 'tag': '(0018,9455)', 'vr': 'SQ', 'vm': '1', 'name': 'CalibrationSequence' },
+  '(0018,9456)': { 'tag': '(0018,9456)', 'vr': 'SQ', 'vm': '1', 'name': 'ObjectThicknessSequence' },
+  '(0018,9457)': { 'tag': '(0018,9457)', 'vr': 'CS', 'vm': '1', 'name': 'PlaneIdentification' },
+  '(0018,9461)': { 'tag': '(0018,9461)', 'vr': 'FL', 'vm': '1-2', 'name': 'FieldOfViewDimensionsInFloat' },
+  '(0018,9462)': { 'tag': '(0018,9462)', 'vr': 'SQ', 'vm': '1', 'name': 'IsocenterReferenceSystemSequence' },
+  '(0018,9463)': { 'tag': '(0018,9463)', 'vr': 'FL', 'vm': '1', 'name': 'PositionerIsocenterPrimaryAngle' },
+  '(0018,9464)': { 'tag': '(0018,9464)', 'vr': 'FL', 'vm': '1', 'name': 'PositionerIsocenterSecondaryAngle' },
+  '(0018,9465)': { 'tag': '(0018,9465)', 'vr': 'FL', 'vm': '1', 'name': 'PositionerIsocenterDetectorRotationAngle' },
+  '(0018,9466)': { 'tag': '(0018,9466)', 'vr': 'FL', 'vm': '1', 'name': 'TableXPositionToIsocenter' },
+  '(0018,9467)': { 'tag': '(0018,9467)', 'vr': 'FL', 'vm': '1', 'name': 'TableYPositionToIsocenter' },
+  '(0018,9468)': { 'tag': '(0018,9468)', 'vr': 'FL', 'vm': '1', 'name': 'TableZPositionToIsocenter' },
+  '(0018,9469)': { 'tag': '(0018,9469)', 'vr': 'FL', 'vm': '1', 'name': 'TableHorizontalRotationAngle' },
+  '(0018,9470)': { 'tag': '(0018,9470)', 'vr': 'FL', 'vm': '1', 'name': 'TableHeadTiltAngle' },
+  '(0018,9471)': { 'tag': '(0018,9471)', 'vr': 'FL', 'vm': '1', 'name': 'TableCradleTiltAngle' },
+  '(0018,9472)': { 'tag': '(0018,9472)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameDisplayShutterSequence' },
+  '(0018,9473)': { 'tag': '(0018,9473)', 'vr': 'FL', 'vm': '1', 'name': 'AcquiredImageAreaDoseProduct' },
+  '(0018,9474)': { 'tag': '(0018,9474)', 'vr': 'CS', 'vm': '1', 'name': 'CArmPositionerTabletopRelationship' },
+  '(0018,9476)': { 'tag': '(0018,9476)', 'vr': 'SQ', 'vm': '1', 'name': 'XRayGeometrySequence' },
+  '(0018,9477)': { 'tag': '(0018,9477)', 'vr': 'SQ', 'vm': '1', 'name': 'IrradiationEventIdentificationSequence' },
+  '(0018,9504)': { 'tag': '(0018,9504)', 'vr': 'SQ', 'vm': '1', 'name': 'XRay3DFrameTypeSequence' },
+  '(0018,9506)': { 'tag': '(0018,9506)', 'vr': 'SQ', 'vm': '1', 'name': 'ContributingSourcesSequence' },
+  '(0018,9507)': { 'tag': '(0018,9507)', 'vr': 'SQ', 'vm': '1', 'name': 'XRay3DAcquisitionSequence' },
+  '(0018,9508)': { 'tag': '(0018,9508)', 'vr': 'FL', 'vm': '1', 'name': 'PrimaryPositionerScanArc' },
+  '(0018,9509)': { 'tag': '(0018,9509)', 'vr': 'FL', 'vm': '1', 'name': 'SecondaryPositionerScanArc' },
+  '(0018,9510)': { 'tag': '(0018,9510)', 'vr': 'FL', 'vm': '1', 'name': 'PrimaryPositionerScanStartAngle' },
+  '(0018,9511)': { 'tag': '(0018,9511)', 'vr': 'FL', 'vm': '1', 'name': 'SecondaryPositionerScanStartAngle' },
+  '(0018,9514)': { 'tag': '(0018,9514)', 'vr': 'FL', 'vm': '1', 'name': 'PrimaryPositionerIncrement' },
+  '(0018,9515)': { 'tag': '(0018,9515)', 'vr': 'FL', 'vm': '1', 'name': 'SecondaryPositionerIncrement' },
+  '(0018,9516)': { 'tag': '(0018,9516)', 'vr': 'DT', 'vm': '1', 'name': 'StartAcquisitionDateTime' },
+  '(0018,9517)': { 'tag': '(0018,9517)', 'vr': 'DT', 'vm': '1', 'name': 'EndAcquisitionDateTime' },
+  '(0018,9524)': { 'tag': '(0018,9524)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicationName' },
+  '(0018,9525)': { 'tag': '(0018,9525)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicationVersion' },
+  '(0018,9526)': { 'tag': '(0018,9526)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicationManufacturer' },
+  '(0018,9527)': { 'tag': '(0018,9527)', 'vr': 'CS', 'vm': '1', 'name': 'AlgorithmType' },
+  '(0018,9528)': { 'tag': '(0018,9528)', 'vr': 'LO', 'vm': '1', 'name': 'AlgorithmDescription' },
+  '(0018,9530)': { 'tag': '(0018,9530)', 'vr': 'SQ', 'vm': '1', 'name': 'XRay3DReconstructionSequence' },
+  '(0018,9531)': { 'tag': '(0018,9531)', 'vr': 'LO', 'vm': '1', 'name': 'ReconstructionDescription' },
+  '(0018,9538)': { 'tag': '(0018,9538)', 'vr': 'SQ', 'vm': '1', 'name': 'PerProjectionAcquisitionSequence' },
+  '(0018,9601)': { 'tag': '(0018,9601)', 'vr': 'SQ', 'vm': '1', 'name': 'DiffusionBMatrixSequence' },
+  '(0018,9602)': { 'tag': '(0018,9602)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueXX' },
+  '(0018,9603)': { 'tag': '(0018,9603)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueXY' },
+  '(0018,9604)': { 'tag': '(0018,9604)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueXZ' },
+  '(0018,9605)': { 'tag': '(0018,9605)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueYY' },
+  '(0018,9606)': { 'tag': '(0018,9606)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueYZ' },
+  '(0018,9607)': { 'tag': '(0018,9607)', 'vr': 'FD', 'vm': '1', 'name': 'DiffusionBValueZZ' },
+  '(0018,9701)': { 'tag': '(0018,9701)', 'vr': 'DT', 'vm': '1', 'name': 'DecayCorrectionDateTime' },
+  '(0018,9715)': { 'tag': '(0018,9715)', 'vr': 'FD', 'vm': '1', 'name': 'StartDensityThreshold' },
+  '(0018,9716)': { 'tag': '(0018,9716)', 'vr': 'FD', 'vm': '1', 'name': 'StartRelativeDensityDifferenceThreshold' },
+  '(0018,9717)': { 'tag': '(0018,9717)', 'vr': 'FD', 'vm': '1', 'name': 'StartCardiacTriggerCountThreshold' },
+  '(0018,9718)': { 'tag': '(0018,9718)', 'vr': 'FD', 'vm': '1', 'name': 'StartRespiratoryTriggerCountThreshold' },
+  '(0018,9719)': { 'tag': '(0018,9719)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationCountsThreshold' },
+  '(0018,9720)': { 'tag': '(0018,9720)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationDensityThreshold' },
+  '(0018,9721)': { 'tag': '(0018,9721)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationRelativeDensityThreshold' },
+  '(0018,9722)': { 'tag': '(0018,9722)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationTimeThreshold' },
+  '(0018,9723)': { 'tag': '(0018,9723)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationCardiacTriggerCountThreshold' },
+  '(0018,9724)': { 'tag': '(0018,9724)', 'vr': 'FD', 'vm': '1', 'name': 'TerminationRespiratoryTriggerCountThreshold' },
+  '(0018,9725)': { 'tag': '(0018,9725)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorGeometry' },
+  '(0018,9726)': { 'tag': '(0018,9726)', 'vr': 'FD', 'vm': '1', 'name': 'TransverseDetectorSeparation' },
+  '(0018,9727)': { 'tag': '(0018,9727)', 'vr': 'FD', 'vm': '1', 'name': 'AxialDetectorDimension' },
+  '(0018,9729)': { 'tag': '(0018,9729)', 'vr': 'US', 'vm': '1', 'name': 'RadiopharmaceuticalAgentNumber' },
+  '(0018,9732)': { 'tag': '(0018,9732)', 'vr': 'SQ', 'vm': '1', 'name': 'PETFrameAcquisitionSequence' },
+  '(0018,9733)': { 'tag': '(0018,9733)', 'vr': 'SQ', 'vm': '1', 'name': 'PETDetectorMotionDetailsSequence' },
+  '(0018,9734)': { 'tag': '(0018,9734)', 'vr': 'SQ', 'vm': '1', 'name': 'PETTableDynamicsSequence' },
+  '(0018,9735)': { 'tag': '(0018,9735)', 'vr': 'SQ', 'vm': '1', 'name': 'PETPositionSequence' },
+  '(0018,9736)': { 'tag': '(0018,9736)', 'vr': 'SQ', 'vm': '1', 'name': 'PETFrameCorrectionFactorsSequence' },
+  '(0018,9737)': { 'tag': '(0018,9737)', 'vr': 'SQ', 'vm': '1', 'name': 'RadiopharmaceuticalUsageSequence' },
+  '(0018,9738)': { 'tag': '(0018,9738)', 'vr': 'CS', 'vm': '1', 'name': 'AttenuationCorrectionSource' },
+  '(0018,9739)': { 'tag': '(0018,9739)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfIterations' },
+  '(0018,9740)': { 'tag': '(0018,9740)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfSubsets' },
+  '(0018,9749)': { 'tag': '(0018,9749)', 'vr': 'SQ', 'vm': '1', 'name': 'PETReconstructionSequence' },
+  '(0018,9751)': { 'tag': '(0018,9751)', 'vr': 'SQ', 'vm': '1', 'name': 'PETFrameTypeSequence' },
+  '(0018,9755)': { 'tag': '(0018,9755)', 'vr': 'CS', 'vm': '1', 'name': 'TimeOfFlightInformationUsed' },
+  '(0018,9756)': { 'tag': '(0018,9756)', 'vr': 'CS', 'vm': '1', 'name': 'ReconstructionType' },
+  '(0018,9758)': { 'tag': '(0018,9758)', 'vr': 'CS', 'vm': '1', 'name': 'DecayCorrected' },
+  '(0018,9759)': { 'tag': '(0018,9759)', 'vr': 'CS', 'vm': '1', 'name': 'AttenuationCorrected' },
+  '(0018,9760)': { 'tag': '(0018,9760)', 'vr': 'CS', 'vm': '1', 'name': 'ScatterCorrected' },
+  '(0018,9761)': { 'tag': '(0018,9761)', 'vr': 'CS', 'vm': '1', 'name': 'DeadTimeCorrected' },
+  '(0018,9762)': { 'tag': '(0018,9762)', 'vr': 'CS', 'vm': '1', 'name': 'GantryMotionCorrected' },
+  '(0018,9763)': { 'tag': '(0018,9763)', 'vr': 'CS', 'vm': '1', 'name': 'PatientMotionCorrected' },
+  '(0018,9764)': { 'tag': '(0018,9764)', 'vr': 'CS', 'vm': '1', 'name': 'CountLossNormalizationCorrected' },
+  '(0018,9765)': { 'tag': '(0018,9765)', 'vr': 'CS', 'vm': '1', 'name': 'RandomsCorrected' },
+  '(0018,9766)': { 'tag': '(0018,9766)', 'vr': 'CS', 'vm': '1', 'name': 'NonUniformRadialSamplingCorrected' },
+  '(0018,9767)': { 'tag': '(0018,9767)', 'vr': 'CS', 'vm': '1', 'name': 'SensitivityCalibrated' },
+  '(0018,9768)': { 'tag': '(0018,9768)', 'vr': 'CS', 'vm': '1', 'name': 'DetectorNormalizationCorrection' },
+  '(0018,9769)': { 'tag': '(0018,9769)', 'vr': 'CS', 'vm': '1', 'name': 'IterativeReconstructionMethod' },
+  '(0018,9770)': { 'tag': '(0018,9770)', 'vr': 'CS', 'vm': '1', 'name': 'AttenuationCorrectionTemporalRelationship' },
+  '(0018,9771)': { 'tag': '(0018,9771)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientPhysiologicalStateSequence' },
+  '(0018,9772)': { 'tag': '(0018,9772)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientPhysiologicalStateCodeSequence' },
+  '(0018,9801)': { 'tag': '(0018,9801)', 'vr': 'FD', 'vm': '1-n', 'name': 'DepthsOfFocus' },
+  '(0018,9803)': { 'tag': '(0018,9803)', 'vr': 'SQ', 'vm': '1', 'name': 'ExcludedIntervalsSequence' },
+  '(0018,9804)': { 'tag': '(0018,9804)', 'vr': 'DT', 'vm': '1', 'name': 'ExclusionStartDatetime' },
+  '(0018,9805)': { 'tag': '(0018,9805)', 'vr': 'FD', 'vm': '1', 'name': 'ExclusionDuration' },
+  '(0018,9806)': { 'tag': '(0018,9806)', 'vr': 'SQ', 'vm': '1', 'name': 'USImageDescriptionSequence' },
+  '(0018,9807)': { 'tag': '(0018,9807)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageDataTypeSequence' },
+  '(0018,9808)': { 'tag': '(0018,9808)', 'vr': 'CS', 'vm': '1', 'name': 'DataType' },
+  '(0018,9809)': { 'tag': '(0018,9809)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerScanPatternCodeSequence' },
+  '(0018,980B)': { 'tag': '(0018,980B)', 'vr': 'CS', 'vm': '1', 'name': 'AliasedDataType' },
+  '(0018,980C)': { 'tag': '(0018,980C)', 'vr': 'CS', 'vm': '1', 'name': 'PositionMeasuringDeviceUsed' },
+  '(0018,980D)': { 'tag': '(0018,980D)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerGeometryCodeSequence' },
+  '(0018,980E)': { 'tag': '(0018,980E)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerBeamSteeringCodeSequence' },
+  '(0018,980F)': { 'tag': '(0018,980F)', 'vr': 'SQ', 'vm': '1', 'name': 'TransducerApplicationCodeSequence' },
+  '(0018,A001)': { 'tag': '(0018,A001)', 'vr': 'SQ', 'vm': '1', 'name': 'ContributingEquipmentSequence' },
+  '(0018,A002)': { 'tag': '(0018,A002)', 'vr': 'DT', 'vm': '1', 'name': 'ContributionDateTime' },
+  '(0018,A003)': { 'tag': '(0018,A003)', 'vr': 'ST', 'vm': '1', 'name': 'ContributionDescription' },
+  '(0020,000D)': { 'tag': '(0020,000D)', 'vr': 'UI', 'vm': '1', 'name': 'StudyInstanceUID' },
+  '(0020,000E)': { 'tag': '(0020,000E)', 'vr': 'UI', 'vm': '1', 'name': 'SeriesInstanceUID' },
+  '(0020,0010)': { 'tag': '(0020,0010)', 'vr': 'SH', 'vm': '1', 'name': 'StudyID' },
+  '(0020,0011)': { 'tag': '(0020,0011)', 'vr': 'IS', 'vm': '1', 'name': 'SeriesNumber' },
+  '(0020,0012)': { 'tag': '(0020,0012)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionNumber' },
+  '(0020,0013)': { 'tag': '(0020,0013)', 'vr': 'IS', 'vm': '1', 'name': 'InstanceNumber' },
+  '(0020,0014)': { 'tag': '(0020,0014)', 'vr': 'IS', 'vm': '1', 'name': 'IsotopeNumber' },
+  '(0020,0015)': { 'tag': '(0020,0015)', 'vr': 'IS', 'vm': '1', 'name': 'PhaseNumber' },
+  '(0020,0016)': { 'tag': '(0020,0016)', 'vr': 'IS', 'vm': '1', 'name': 'IntervalNumber' },
+  '(0020,0017)': { 'tag': '(0020,0017)', 'vr': 'IS', 'vm': '1', 'name': 'TimeSlotNumber' },
+  '(0020,0018)': { 'tag': '(0020,0018)', 'vr': 'IS', 'vm': '1', 'name': 'AngleNumber' },
+  '(0020,0019)': { 'tag': '(0020,0019)', 'vr': 'IS', 'vm': '1', 'name': 'ItemNumber' },
+  '(0020,0020)': { 'tag': '(0020,0020)', 'vr': 'CS', 'vm': '2', 'name': 'PatientOrientation' },
+  '(0020,0022)': { 'tag': '(0020,0022)', 'vr': 'IS', 'vm': '1', 'name': 'OverlayNumber' },
+  '(0020,0024)': { 'tag': '(0020,0024)', 'vr': 'IS', 'vm': '1', 'name': 'CurveNumber' },
+  '(0020,0026)': { 'tag': '(0020,0026)', 'vr': 'IS', 'vm': '1', 'name': 'LUTNumber' },
+  '(0020,0030)': { 'tag': '(0020,0030)', 'vr': 'DS', 'vm': '3', 'name': 'ImagePosition' },
+  '(0020,0032)': { 'tag': '(0020,0032)', 'vr': 'DS', 'vm': '3', 'name': 'ImagePositionPatient' },
+  '(0020,0035)': { 'tag': '(0020,0035)', 'vr': 'DS', 'vm': '6', 'name': 'ImageOrientation' },
+  '(0020,0037)': { 'tag': '(0020,0037)', 'vr': 'DS', 'vm': '6', 'name': 'ImageOrientationPatient' },
+  '(0020,0050)': { 'tag': '(0020,0050)', 'vr': 'DS', 'vm': '1', 'name': 'Location' },
+  '(0020,0052)': { 'tag': '(0020,0052)', 'vr': 'UI', 'vm': '1', 'name': 'FrameOfReferenceUID' },
+  '(0020,0060)': { 'tag': '(0020,0060)', 'vr': 'CS', 'vm': '1', 'name': 'Laterality' },
+  '(0020,0062)': { 'tag': '(0020,0062)', 'vr': 'CS', 'vm': '1', 'name': 'ImageLaterality' },
+  '(0020,0070)': { 'tag': '(0020,0070)', 'vr': 'LO', 'vm': '1', 'name': 'ImageGeometryType' },
+  '(0020,0080)': { 'tag': '(0020,0080)', 'vr': 'CS', 'vm': '1-n', 'name': 'MaskingImage' },
+  '(0020,00AA)': { 'tag': '(0020,00AA)', 'vr': 'IS', 'vm': '1', 'name': 'ReportNumber' },
+  '(0020,0100)': { 'tag': '(0020,0100)', 'vr': 'IS', 'vm': '1', 'name': 'TemporalPositionIdentifier' },
+  '(0020,0105)': { 'tag': '(0020,0105)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfTemporalPositions' },
+  '(0020,0110)': { 'tag': '(0020,0110)', 'vr': 'DS', 'vm': '1', 'name': 'TemporalResolution' },
+  '(0020,0200)': { 'tag': '(0020,0200)', 'vr': 'UI', 'vm': '1', 'name': 'SynchronizationFrameOfReferenceUID' },
+  '(0020,0242)': { 'tag': '(0020,0242)', 'vr': 'UI', 'vm': '1', 'name': 'SOPInstanceUIDOfConcatenationSource' },
+  '(0020,1000)': { 'tag': '(0020,1000)', 'vr': 'IS', 'vm': '1', 'name': 'SeriesInStudy' },
+  '(0020,1001)': { 'tag': '(0020,1001)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionsInSeries' },
+  '(0020,1002)': { 'tag': '(0020,1002)', 'vr': 'IS', 'vm': '1', 'name': 'ImagesInAcquisition' },
+  '(0020,1003)': { 'tag': '(0020,1003)', 'vr': 'IS', 'vm': '1', 'name': 'ImagesInSeries' },
+  '(0020,1004)': { 'tag': '(0020,1004)', 'vr': 'IS', 'vm': '1', 'name': 'AcquisitionsInStudy' },
+  '(0020,1005)': { 'tag': '(0020,1005)', 'vr': 'IS', 'vm': '1', 'name': 'ImagesInStudy' },
+  '(0020,1020)': { 'tag': '(0020,1020)', 'vr': 'LO', 'vm': '1-n', 'name': 'Reference' },
+  '(0020,1040)': { 'tag': '(0020,1040)', 'vr': 'LO', 'vm': '1', 'name': 'PositionReferenceIndicator' },
+  '(0020,1041)': { 'tag': '(0020,1041)', 'vr': 'DS', 'vm': '1', 'name': 'SliceLocation' },
+  '(0020,1070)': { 'tag': '(0020,1070)', 'vr': 'IS', 'vm': '1-n', 'name': 'OtherStudyNumbers' },
+  '(0020,1200)': { 'tag': '(0020,1200)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPatientRelatedStudies' },
+  '(0020,1202)': { 'tag': '(0020,1202)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPatientRelatedSeries' },
+  '(0020,1204)': { 'tag': '(0020,1204)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPatientRelatedInstances' },
+  '(0020,1206)': { 'tag': '(0020,1206)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfStudyRelatedSeries' },
+  '(0020,1208)': { 'tag': '(0020,1208)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfStudyRelatedInstances' },
+  '(0020,1209)': { 'tag': '(0020,1209)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfSeriesRelatedInstances' },
+  '(0020,31xx)': { 'tag': '(0020,31xx)', 'vr': 'CS', 'vm': '1-n', 'name': 'SourceImageIDs' },
+  '(0020,3401)': { 'tag': '(0020,3401)', 'vr': 'CS', 'vm': '1', 'name': 'ModifyingDeviceID' },
+  '(0020,3402)': { 'tag': '(0020,3402)', 'vr': 'CS', 'vm': '1', 'name': 'ModifiedImageID' },
+  '(0020,3403)': { 'tag': '(0020,3403)', 'vr': 'DA', 'vm': '1', 'name': 'ModifiedImageDate' },
+  '(0020,3404)': { 'tag': '(0020,3404)', 'vr': 'LO', 'vm': '1', 'name': 'ModifyingDeviceManufacturer' },
+  '(0020,3405)': { 'tag': '(0020,3405)', 'vr': 'TM', 'vm': '1', 'name': 'ModifiedImageTime' },
+  '(0020,3406)': { 'tag': '(0020,3406)', 'vr': 'LO', 'vm': '1', 'name': 'ModifiedImageDescription' },
+  '(0020,4000)': { 'tag': '(0020,4000)', 'vr': 'LT', 'vm': '1', 'name': 'ImageComments' },
+  '(0020,5000)': { 'tag': '(0020,5000)', 'vr': 'AT', 'vm': '1-n', 'name': 'OriginalImageIdentification' },
+  '(0020,5002)': { 'tag': '(0020,5002)', 'vr': 'LO', 'vm': '1-n', 'name': 'OriginalImageIdentificationNomenclature' },
+  '(0020,9056)': { 'tag': '(0020,9056)', 'vr': 'SH', 'vm': '1', 'name': 'StackID' },
+  '(0020,9057)': { 'tag': '(0020,9057)', 'vr': 'UL', 'vm': '1', 'name': 'InStackPositionNumber' },
+  '(0020,9071)': { 'tag': '(0020,9071)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameAnatomySequence' },
+  '(0020,9072)': { 'tag': '(0020,9072)', 'vr': 'CS', 'vm': '1', 'name': 'FrameLaterality' },
+  '(0020,9111)': { 'tag': '(0020,9111)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameContentSequence' },
+  '(0020,9113)': { 'tag': '(0020,9113)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanePositionSequence' },
+  '(0020,9116)': { 'tag': '(0020,9116)', 'vr': 'SQ', 'vm': '1', 'name': 'PlaneOrientationSequence' },
+  '(0020,9128)': { 'tag': '(0020,9128)', 'vr': 'UL', 'vm': '1', 'name': 'TemporalPositionIndex' },
+  '(0020,9153)': { 'tag': '(0020,9153)', 'vr': 'FD', 'vm': '1', 'name': 'NominalCardiacTriggerDelayTime' },
+  '(0020,9154)': { 'tag': '(0020,9154)', 'vr': 'FL', 'vm': '1', 'name': 'NominalCardiacTriggerTimePriorToRPeak' },
+  '(0020,9155)': { 'tag': '(0020,9155)', 'vr': 'FL', 'vm': '1', 'name': 'ActualCardiacTriggerTimePriorToRPeak' },
+  '(0020,9156)': { 'tag': '(0020,9156)', 'vr': 'US', 'vm': '1', 'name': 'FrameAcquisitionNumber' },
+  '(0020,9157)': { 'tag': '(0020,9157)', 'vr': 'UL', 'vm': '1-n', 'name': 'DimensionIndexValues' },
+  '(0020,9158)': { 'tag': '(0020,9158)', 'vr': 'LT', 'vm': '1', 'name': 'FrameComments' },
+  '(0020,9161)': { 'tag': '(0020,9161)', 'vr': 'UI', 'vm': '1', 'name': 'ConcatenationUID' },
+  '(0020,9162)': { 'tag': '(0020,9162)', 'vr': 'US', 'vm': '1', 'name': 'InConcatenationNumber' },
+  '(0020,9163)': { 'tag': '(0020,9163)', 'vr': 'US', 'vm': '1', 'name': 'InConcatenationTotalNumber' },
+  '(0020,9164)': { 'tag': '(0020,9164)', 'vr': 'UI', 'vm': '1', 'name': 'DimensionOrganizationUID' },
+  '(0020,9165)': { 'tag': '(0020,9165)', 'vr': 'AT', 'vm': '1', 'name': 'DimensionIndexPointer' },
+  '(0020,9167)': { 'tag': '(0020,9167)', 'vr': 'AT', 'vm': '1', 'name': 'FunctionalGroupPointer' },
+  '(0020,9213)': { 'tag': '(0020,9213)', 'vr': 'LO', 'vm': '1', 'name': 'DimensionIndexPrivateCreator' },
+  '(0020,9221)': { 'tag': '(0020,9221)', 'vr': 'SQ', 'vm': '1', 'name': 'DimensionOrganizationSequence' },
+  '(0020,9222)': { 'tag': '(0020,9222)', 'vr': 'SQ', 'vm': '1', 'name': 'DimensionIndexSequence' },
+  '(0020,9228)': { 'tag': '(0020,9228)', 'vr': 'UL', 'vm': '1', 'name': 'ConcatenationFrameOffsetNumber' },
+  '(0020,9238)': { 'tag': '(0020,9238)', 'vr': 'LO', 'vm': '1', 'name': 'FunctionalGroupPrivateCreator' },
+  '(0020,9241)': { 'tag': '(0020,9241)', 'vr': 'FL', 'vm': '1', 'name': 'NominalPercentageOfCardiacPhase' },
+  '(0020,9245)': { 'tag': '(0020,9245)', 'vr': 'FL', 'vm': '1', 'name': 'NominalPercentageOfRespiratoryPhase' },
+  '(0020,9246)': { 'tag': '(0020,9246)', 'vr': 'FL', 'vm': '1', 'name': 'StartingRespiratoryAmplitude' },
+  '(0020,9247)': { 'tag': '(0020,9247)', 'vr': 'CS', 'vm': '1', 'name': 'StartingRespiratoryPhase' },
+  '(0020,9248)': { 'tag': '(0020,9248)', 'vr': 'FL', 'vm': '1', 'name': 'EndingRespiratoryAmplitude' },
+  '(0020,9249)': { 'tag': '(0020,9249)', 'vr': 'CS', 'vm': '1', 'name': 'EndingRespiratoryPhase' },
+  '(0020,9250)': { 'tag': '(0020,9250)', 'vr': 'CS', 'vm': '1', 'name': 'RespiratoryTriggerType' },
+  '(0020,9251)': { 'tag': '(0020,9251)', 'vr': 'FD', 'vm': '1', 'name': 'RRIntervalTimeNominal' },
+  '(0020,9252)': { 'tag': '(0020,9252)', 'vr': 'FD', 'vm': '1', 'name': 'ActualCardiacTriggerDelayTime' },
+  '(0020,9253)': { 'tag': '(0020,9253)', 'vr': 'SQ', 'vm': '1', 'name': 'RespiratorySynchronizationSequence' },
+  '(0020,9254)': { 'tag': '(0020,9254)', 'vr': 'FD', 'vm': '1', 'name': 'RespiratoryIntervalTime' },
+  '(0020,9255)': { 'tag': '(0020,9255)', 'vr': 'FD', 'vm': '1', 'name': 'NominalRespiratoryTriggerDelayTime' },
+  '(0020,9256)': { 'tag': '(0020,9256)', 'vr': 'FD', 'vm': '1', 'name': 'RespiratoryTriggerDelayThreshold' },
+  '(0020,9257)': { 'tag': '(0020,9257)', 'vr': 'FD', 'vm': '1', 'name': 'ActualRespiratoryTriggerDelayTime' },
+  '(0020,9301)': { 'tag': '(0020,9301)', 'vr': 'FD', 'vm': '3', 'name': 'ImagePositionVolume' },
+  '(0020,9302)': { 'tag': '(0020,9302)', 'vr': 'FD', 'vm': '6', 'name': 'ImageOrientationVolume' },
+  '(0020,9307)': { 'tag': '(0020,9307)', 'vr': 'CS', 'vm': '1', 'name': 'UltrasoundAcquisitionGeometry' },
+  '(0020,9308)': { 'tag': '(0020,9308)', 'vr': 'FD', 'vm': '3', 'name': 'ApexPosition' },
+  '(0020,9309)': { 'tag': '(0020,9309)', 'vr': 'FD', 'vm': '16', 'name': 'VolumeToTransducerMappingMatrix' },
+  '(0020,930A)': { 'tag': '(0020,930A)', 'vr': 'FD', 'vm': '16', 'name': 'VolumeToTableMappingMatrix' },
+  '(0020,930C)': { 'tag': '(0020,930C)', 'vr': 'CS', 'vm': '1', 'name': 'PatientFrameOfReferenceSource' },
+  '(0020,930D)': { 'tag': '(0020,930D)', 'vr': 'FD', 'vm': '1', 'name': 'TemporalPositionTimeOffset' },
+  '(0020,930E)': { 'tag': '(0020,930E)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanePositionVolumeSequence' },
+  '(0020,930F)': { 'tag': '(0020,930F)', 'vr': 'SQ', 'vm': '1', 'name': 'PlaneOrientationVolumeSequence' },
+  '(0020,9310)': { 'tag': '(0020,9310)', 'vr': 'SQ', 'vm': '1', 'name': 'TemporalPositionSequence' },
+  '(0020,9311)': { 'tag': '(0020,9311)', 'vr': 'CS', 'vm': '1', 'name': 'DimensionOrganizationType' },
+  '(0020,9312)': { 'tag': '(0020,9312)', 'vr': 'UI', 'vm': '1', 'name': 'VolumeFrameOfReferenceUID' },
+  '(0020,9313)': { 'tag': '(0020,9313)', 'vr': 'UI', 'vm': '1', 'name': 'TableFrameOfReferenceUID' },
+  '(0020,9421)': { 'tag': '(0020,9421)', 'vr': 'LO', 'vm': '1', 'name': 'DimensionDescriptionLabel' },
+  '(0020,9450)': { 'tag': '(0020,9450)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientOrientationInFrameSequence' },
+  '(0020,9453)': { 'tag': '(0020,9453)', 'vr': 'LO', 'vm': '1', 'name': 'FrameLabel' },
+  '(0020,9518)': { 'tag': '(0020,9518)', 'vr': 'US', 'vm': '1-n', 'name': 'AcquisitionIndex' },
+  '(0020,9529)': { 'tag': '(0020,9529)', 'vr': 'SQ', 'vm': '1', 'name': 'ContributingSOPInstancesReferenceSequence' },
+  '(0020,9536)': { 'tag': '(0020,9536)', 'vr': 'US', 'vm': '1', 'name': 'ReconstructionIndex' },
+  '(0022,0001)': { 'tag': '(0022,0001)', 'vr': 'US', 'vm': '1', 'name': 'LightPathFilterPassThroughWavelength' },
+  '(0022,0002)': { 'tag': '(0022,0002)', 'vr': 'US', 'vm': '2', 'name': 'LightPathFilterPassBand' },
+  '(0022,0003)': { 'tag': '(0022,0003)', 'vr': 'US', 'vm': '1', 'name': 'ImagePathFilterPassThroughWavelength' },
+  '(0022,0004)': { 'tag': '(0022,0004)', 'vr': 'US', 'vm': '2', 'name': 'ImagePathFilterPassBand' },
+  '(0022,0005)': { 'tag': '(0022,0005)', 'vr': 'CS', 'vm': '1', 'name': 'PatientEyeMovementCommanded' },
+  '(0022,0006)': { 'tag': '(0022,0006)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientEyeMovementCommandCodeSequence' },
+  '(0022,0007)': { 'tag': '(0022,0007)', 'vr': 'FL', 'vm': '1', 'name': 'SphericalLensPower' },
+  '(0022,0008)': { 'tag': '(0022,0008)', 'vr': 'FL', 'vm': '1', 'name': 'CylinderLensPower' },
+  '(0022,0009)': { 'tag': '(0022,0009)', 'vr': 'FL', 'vm': '1', 'name': 'CylinderAxis' },
+  '(0022,000A)': { 'tag': '(0022,000A)', 'vr': 'FL', 'vm': '1', 'name': 'EmmetropicMagnification' },
+  '(0022,000B)': { 'tag': '(0022,000B)', 'vr': 'FL', 'vm': '1', 'name': 'IntraOcularPressure' },
+  '(0022,000C)': { 'tag': '(0022,000C)', 'vr': 'FL', 'vm': '1', 'name': 'HorizontalFieldOfView' },
+  '(0022,000D)': { 'tag': '(0022,000D)', 'vr': 'CS', 'vm': '1', 'name': 'PupilDilated' },
+  '(0022,000E)': { 'tag': '(0022,000E)', 'vr': 'FL', 'vm': '1', 'name': 'DegreeOfDilation' },
+  '(0022,0010)': { 'tag': '(0022,0010)', 'vr': 'FL', 'vm': '1', 'name': 'StereoBaselineAngle' },
+  '(0022,0011)': { 'tag': '(0022,0011)', 'vr': 'FL', 'vm': '1', 'name': 'StereoBaselineDisplacement' },
+  '(0022,0012)': { 'tag': '(0022,0012)', 'vr': 'FL', 'vm': '1', 'name': 'StereoHorizontalPixelOffset' },
+  '(0022,0013)': { 'tag': '(0022,0013)', 'vr': 'FL', 'vm': '1', 'name': 'StereoVerticalPixelOffset' },
+  '(0022,0014)': { 'tag': '(0022,0014)', 'vr': 'FL', 'vm': '1', 'name': 'StereoRotation' },
+  '(0022,0015)': { 'tag': '(0022,0015)', 'vr': 'SQ', 'vm': '1', 'name': 'AcquisitionDeviceTypeCodeSequence' },
+  '(0022,0016)': { 'tag': '(0022,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'IlluminationTypeCodeSequence' },
+  '(0022,0017)': { 'tag': '(0022,0017)', 'vr': 'SQ', 'vm': '1', 'name': 'LightPathFilterTypeStackCodeSequence' },
+  '(0022,0018)': { 'tag': '(0022,0018)', 'vr': 'SQ', 'vm': '1', 'name': 'ImagePathFilterTypeStackCodeSequence' },
+  '(0022,0019)': { 'tag': '(0022,0019)', 'vr': 'SQ', 'vm': '1', 'name': 'LensesCodeSequence' },
+  '(0022,001A)': { 'tag': '(0022,001A)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelDescriptionCodeSequence' },
+  '(0022,001B)': { 'tag': '(0022,001B)', 'vr': 'SQ', 'vm': '1', 'name': 'RefractiveStateSequence' },
+  '(0022,001C)': { 'tag': '(0022,001C)', 'vr': 'SQ', 'vm': '1', 'name': 'MydriaticAgentCodeSequence' },
+  '(0022,001D)': { 'tag': '(0022,001D)', 'vr': 'SQ', 'vm': '1', 'name': 'RelativeImagePositionCodeSequence' },
+  '(0022,001E)': { 'tag': '(0022,001E)', 'vr': 'FL', 'vm': '1', 'name': 'CameraAngleOfView' },
+  '(0022,0020)': { 'tag': '(0022,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'StereoPairsSequence' },
+  '(0022,0021)': { 'tag': '(0022,0021)', 'vr': 'SQ', 'vm': '1', 'name': 'LeftImageSequence' },
+  '(0022,0022)': { 'tag': '(0022,0022)', 'vr': 'SQ', 'vm': '1', 'name': 'RightImageSequence' },
+  '(0022,0030)': { 'tag': '(0022,0030)', 'vr': 'FL', 'vm': '1', 'name': 'AxialLengthOfTheEye' },
+  '(0022,0031)': { 'tag': '(0022,0031)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicFrameLocationSequence' },
+  '(0022,0032)': { 'tag': '(0022,0032)', 'vr': 'FL', 'vm': '2-2n', 'name': 'ReferenceCoordinates' },
+  '(0022,0035)': { 'tag': '(0022,0035)', 'vr': 'FL', 'vm': '1', 'name': 'DepthSpatialResolution' },
+  '(0022,0036)': { 'tag': '(0022,0036)', 'vr': 'FL', 'vm': '1', 'name': 'MaximumDepthDistortion' },
+  '(0022,0037)': { 'tag': '(0022,0037)', 'vr': 'FL', 'vm': '1', 'name': 'AlongScanSpatialResolution' },
+  '(0022,0038)': { 'tag': '(0022,0038)', 'vr': 'FL', 'vm': '1', 'name': 'MaximumAlongScanDistortion' },
+  '(0022,0039)': { 'tag': '(0022,0039)', 'vr': 'CS', 'vm': '1', 'name': 'OphthalmicImageOrientation' },
+  '(0022,0041)': { 'tag': '(0022,0041)', 'vr': 'FL', 'vm': '1', 'name': 'DepthOfTransverseImage' },
+  '(0022,0042)': { 'tag': '(0022,0042)', 'vr': 'SQ', 'vm': '1', 'name': 'MydriaticAgentConcentrationUnitsSequence' },
+  '(0022,0048)': { 'tag': '(0022,0048)', 'vr': 'FL', 'vm': '1', 'name': 'AcrossScanSpatialResolution' },
+  '(0022,0049)': { 'tag': '(0022,0049)', 'vr': 'FL', 'vm': '1', 'name': 'MaximumAcrossScanDistortion' },
+  '(0022,004E)': { 'tag': '(0022,004E)', 'vr': 'DS', 'vm': '1', 'name': 'MydriaticAgentConcentration' },
+  '(0022,0055)': { 'tag': '(0022,0055)', 'vr': 'FL', 'vm': '1', 'name': 'IlluminationWaveLength' },
+  '(0022,0056)': { 'tag': '(0022,0056)', 'vr': 'FL', 'vm': '1', 'name': 'IlluminationPower' },
+  '(0022,0057)': { 'tag': '(0022,0057)', 'vr': 'FL', 'vm': '1', 'name': 'IlluminationBandwidth' },
+  '(0022,0058)': { 'tag': '(0022,0058)', 'vr': 'SQ', 'vm': '1', 'name': 'MydriaticAgentSequence' },
+  '(0022,1007)': { 'tag': '(0022,1007)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialMeasurementsRightEyeSequence' },
+  '(0022,1008)': { 'tag': '(0022,1008)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialMeasurementsLeftEyeSequence' },
+  '(0022,1010)': { 'tag': '(0022,1010)', 'vr': 'CS', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsType' },
+  '(0022,1019)': { 'tag': '(0022,1019)', 'vr': 'FL', 'vm': '1', 'name': 'OphthalmicAxialLength' },
+  '(0022,1024)': { 'tag': '(0022,1024)', 'vr': 'SQ', 'vm': '1', 'name': 'LensStatusCodeSequence' },
+  '(0022,1025)': { 'tag': '(0022,1025)', 'vr': 'SQ', 'vm': '1', 'name': 'VitreousStatusCodeSequence' },
+  '(0022,1028)': { 'tag': '(0022,1028)', 'vr': 'SQ', 'vm': '1', 'name': 'IOLFormulaCodeSequence' },
+  '(0022,1029)': { 'tag': '(0022,1029)', 'vr': 'LO', 'vm': '1', 'name': 'IOLFormulaDetail' },
+  '(0022,1033)': { 'tag': '(0022,1033)', 'vr': 'FL', 'vm': '1', 'name': 'KeratometerIndex' },
+  '(0022,1035)': { 'tag': '(0022,1035)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceOfOphthalmicAxialLengthCodeSequence' },
+  '(0022,1037)': { 'tag': '(0022,1037)', 'vr': 'FL', 'vm': '1', 'name': 'TargetRefraction' },
+  '(0022,1039)': { 'tag': '(0022,1039)', 'vr': 'CS', 'vm': '1', 'name': 'RefractiveProcedureOccurred' },
+  '(0022,1040)': { 'tag': '(0022,1040)', 'vr': 'SQ', 'vm': '1', 'name': 'RefractiveSurgeryTypeCodeSequence' },
+  '(0022,1044)': { 'tag': '(0022,1044)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicUltrasoundAxialMeasurementsTypeCodeSequence' },
+  '(0022,1050)': { 'tag': '(0022,1050)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsSequence' },
+  '(0022,1053)': { 'tag': '(0022,1053)', 'vr': 'FL', 'vm': '1', 'name': 'IOLPower' },
+  '(0022,1054)': { 'tag': '(0022,1054)', 'vr': 'FL', 'vm': '1', 'name': 'PredictedRefractiveError' },
+  '(0022,1059)': { 'tag': '(0022,1059)', 'vr': 'FL', 'vm': '1', 'name': 'OphthalmicAxialLengthVelocity' },
+  '(0022,1065)': { 'tag': '(0022,1065)', 'vr': 'LO', 'vm': '1', 'name': 'LensStatusDescription' },
+  '(0022,1066)': { 'tag': '(0022,1066)', 'vr': 'LO', 'vm': '1', 'name': 'VitreousStatusDescription' },
+  '(0022,1090)': { 'tag': '(0022,1090)', 'vr': 'SQ', 'vm': '1', 'name': 'IOLPowerSequence' },
+  '(0022,1092)': { 'tag': '(0022,1092)', 'vr': 'SQ', 'vm': '1', 'name': 'LensConstantSequence' },
+  '(0022,1093)': { 'tag': '(0022,1093)', 'vr': 'LO', 'vm': '1', 'name': 'IOLManufacturer' },
+  '(0022,1094)': { 'tag': '(0022,1094)', 'vr': 'LO', 'vm': '1', 'name': 'LensConstantDescription' },
+  '(0022,1096)': { 'tag': '(0022,1096)', 'vr': 'SQ', 'vm': '1', 'name': 'KeratometryMeasurementTypeCodeSequence' },
+  '(0022,1100)': { 'tag': '(0022,1100)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedOphthalmicAxialMeasurementsSequence' },
+  '(0022,1101)': { 'tag': '(0022,1101)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsSegmentNameCodeSequence' },
+  '(0022,1103)': { 'tag': '(0022,1103)', 'vr': 'SQ', 'vm': '1', 'name': 'RefractiveErrorBeforeRefractiveSurgeryCodeSequence' },
+  '(0022,1121)': { 'tag': '(0022,1121)', 'vr': 'FL', 'vm': '1', 'name': 'IOLPowerForExactEmmetropia' },
+  '(0022,1122)': { 'tag': '(0022,1122)', 'vr': 'FL', 'vm': '1', 'name': 'IOLPowerForExactTargetRefraction' },
+  '(0022,1125)': { 'tag': '(0022,1125)', 'vr': 'SQ', 'vm': '1', 'name': 'AnteriorChamberDepthDefinitionCodeSequence' },
+  '(0022,1130)': { 'tag': '(0022,1130)', 'vr': 'FL', 'vm': '1', 'name': 'LensThickness' },
+  '(0022,1131)': { 'tag': '(0022,1131)', 'vr': 'FL', 'vm': '1', 'name': 'AnteriorChamberDepth' },
+  '(0022,1132)': { 'tag': '(0022,1132)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceOfLensThicknessDataCodeSequence' },
+  '(0022,1133)': { 'tag': '(0022,1133)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceOfAnteriorChamberDepthDataCodeSequence' },
+  '(0022,1135)': { 'tag': '(0022,1135)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceOfRefractiveErrorDataCodeSequence' },
+  '(0022,1140)': { 'tag': '(0022,1140)', 'vr': 'CS', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementModified' },
+  '(0022,1150)': { 'tag': '(0022,1150)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthDataSourceCodeSequence' },
+  '(0022,1153)': { 'tag': '(0022,1153)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthAcquisitionMethodCodeSequence' },
+  '(0022,1155)': { 'tag': '(0022,1155)', 'vr': 'FL', 'vm': '1', 'name': 'SignalToNoiseRatio' },
+  '(0022,1159)': { 'tag': '(0022,1159)', 'vr': 'LO', 'vm': '1', 'name': 'OphthalmicAxialLengthDataSourceDescription' },
+  '(0022,1210)': { 'tag': '(0022,1210)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsTotalLengthSequence' },
+  '(0022,1211)': { 'tag': '(0022,1211)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsSegmentalLengthSequence' },
+  '(0022,1212)': { 'tag': '(0022,1212)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthMeasurementsLengthSummationSequence' },
+  '(0022,1220)': { 'tag': '(0022,1220)', 'vr': 'SQ', 'vm': '1', 'name': 'UltrasoundOphthalmicAxialLengthMeasurementsSequence' },
+  '(0022,1225)': { 'tag': '(0022,1225)', 'vr': 'SQ', 'vm': '1', 'name': 'OpticalOphthalmicAxialLengthMeasurementsSequence' },
+  '(0022,1230)': { 'tag': '(0022,1230)', 'vr': 'SQ', 'vm': '1', 'name': 'UltrasoundSelectedOphthalmicAxialLengthSequence' },
+  '(0022,1250)': { 'tag': '(0022,1250)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthSelectionMethodCodeSequence' },
+  '(0022,1255)': { 'tag': '(0022,1255)', 'vr': 'SQ', 'vm': '1', 'name': 'OpticalSelectedOphthalmicAxialLengthSequence' },
+  '(0022,1257)': { 'tag': '(0022,1257)', 'vr': 'SQ', 'vm': '1', 'name': 'SelectedSegmentalOphthalmicAxialLengthSequence' },
+  '(0022,1260)': { 'tag': '(0022,1260)', 'vr': 'SQ', 'vm': '1', 'name': 'SelectedTotalOphthalmicAxialLengthSequence' },
+  '(0022,1262)': { 'tag': '(0022,1262)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicAxialLengthQualityMetricSequence' },
+  '(0022,1273)': { 'tag': '(0022,1273)', 'vr': 'LO', 'vm': '1', 'name': 'OphthalmicAxialLengthQualityMetricTypeDescription' },
+  '(0022,1300)': { 'tag': '(0022,1300)', 'vr': 'SQ', 'vm': '1', 'name': 'IntraocularLensCalculationsRightEyeSequence' },
+  '(0022,1310)': { 'tag': '(0022,1310)', 'vr': 'SQ', 'vm': '1', 'name': 'IntraocularLensCalculationsLeftEyeSequence' },
+  '(0022,1330)': { 'tag': '(0022,1330)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedOphthalmicAxialLengthMeasurementQCImageSequence' },
+  '(0024,0010)': { 'tag': '(0024,0010)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldHorizontalExtent' },
+  '(0024,0011)': { 'tag': '(0024,0011)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldVerticalExtent' },
+  '(0024,0012)': { 'tag': '(0024,0012)', 'vr': 'CS', 'vm': '1', 'name': 'VisualFieldShape' },
+  '(0024,0016)': { 'tag': '(0024,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'ScreeningTestModeCodeSequence' },
+  '(0024,0018)': { 'tag': '(0024,0018)', 'vr': 'FL', 'vm': '1', 'name': 'MaximumStimulusLuminance' },
+  '(0024,0020)': { 'tag': '(0024,0020)', 'vr': 'FL', 'vm': '1', 'name': 'BackgroundLuminance' },
+  '(0024,0021)': { 'tag': '(0024,0021)', 'vr': 'SQ', 'vm': '1', 'name': 'StimulusColorCodeSequence' },
+  '(0024,0024)': { 'tag': '(0024,0024)', 'vr': 'SQ', 'vm': '1', 'name': 'BackgroundIlluminationColorCodeSequence' },
+  '(0024,0025)': { 'tag': '(0024,0025)', 'vr': 'FL', 'vm': '1', 'name': 'StimulusArea' },
+  '(0024,0028)': { 'tag': '(0024,0028)', 'vr': 'FL', 'vm': '1', 'name': 'StimulusPresentationTime' },
+  '(0024,0032)': { 'tag': '(0024,0032)', 'vr': 'SQ', 'vm': '1', 'name': 'FixationSequence' },
+  '(0024,0033)': { 'tag': '(0024,0033)', 'vr': 'SQ', 'vm': '1', 'name': 'FixationMonitoringCodeSequence' },
+  '(0024,0034)': { 'tag': '(0024,0034)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualFieldCatchTrialSequence' },
+  '(0024,0035)': { 'tag': '(0024,0035)', 'vr': 'US', 'vm': '1', 'name': 'FixationCheckedQuantity' },
+  '(0024,0036)': { 'tag': '(0024,0036)', 'vr': 'US', 'vm': '1', 'name': 'PatientNotProperlyFixatedQuantity' },
+  '(0024,0037)': { 'tag': '(0024,0037)', 'vr': 'CS', 'vm': '1', 'name': 'PresentedVisualStimuliDataFlag' },
+  '(0024,0038)': { 'tag': '(0024,0038)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfVisualStimuli' },
+  '(0024,0039)': { 'tag': '(0024,0039)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFixationLossesDataFlag' },
+  '(0024,0040)': { 'tag': '(0024,0040)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFixationLosses' },
+  '(0024,0042)': { 'tag': '(0024,0042)', 'vr': 'US', 'vm': '1', 'name': 'StimuliRetestingQuantity' },
+  '(0024,0044)': { 'tag': '(0024,0044)', 'vr': 'LT', 'vm': '1', 'name': 'CommentsOnPatientPerformanceOfVisualField' },
+  '(0024,0045)': { 'tag': '(0024,0045)', 'vr': 'CS', 'vm': '1', 'name': 'FalseNegativesEstimateFlag' },
+  '(0024,0046)': { 'tag': '(0024,0046)', 'vr': 'FL', 'vm': '1', 'name': 'FalseNegativesEstimate' },
+  '(0024,0048)': { 'tag': '(0024,0048)', 'vr': 'US', 'vm': '1', 'name': 'NegativeCatchTrialsQuantity' },
+  '(0024,0050)': { 'tag': '(0024,0050)', 'vr': 'US', 'vm': '1', 'name': 'FalseNegativesQuantity' },
+  '(0024,0051)': { 'tag': '(0024,0051)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFalseNegativesDataFlag' },
+  '(0024,0052)': { 'tag': '(0024,0052)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFalseNegatives' },
+  '(0024,0053)': { 'tag': '(0024,0053)', 'vr': 'CS', 'vm': '1', 'name': 'FalsePositivesEstimateFlag' },
+  '(0024,0054)': { 'tag': '(0024,0054)', 'vr': 'FL', 'vm': '1', 'name': 'FalsePositivesEstimate' },
+  '(0024,0055)': { 'tag': '(0024,0055)', 'vr': 'CS', 'vm': '1', 'name': 'CatchTrialsDataFlag' },
+  '(0024,0056)': { 'tag': '(0024,0056)', 'vr': 'US', 'vm': '1', 'name': 'PositiveCatchTrialsQuantity' },
+  '(0024,0057)': { 'tag': '(0024,0057)', 'vr': 'CS', 'vm': '1', 'name': 'TestPointNormalsDataFlag' },
+  '(0024,0058)': { 'tag': '(0024,0058)', 'vr': 'SQ', 'vm': '1', 'name': 'TestPointNormalsSequence' },
+  '(0024,0059)': { 'tag': '(0024,0059)', 'vr': 'CS', 'vm': '1', 'name': 'GlobalDeviationProbabilityNormalsFlag' },
+  '(0024,0060)': { 'tag': '(0024,0060)', 'vr': 'US', 'vm': '1', 'name': 'FalsePositivesQuantity' },
+  '(0024,0061)': { 'tag': '(0024,0061)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFalsePositivesDataFlag' },
+  '(0024,0062)': { 'tag': '(0024,0062)', 'vr': 'CS', 'vm': '1', 'name': 'ExcessiveFalsePositives' },
+  '(0024,0063)': { 'tag': '(0024,0063)', 'vr': 'CS', 'vm': '1', 'name': 'VisualFieldTestNormalsFlag' },
+  '(0024,0064)': { 'tag': '(0024,0064)', 'vr': 'SQ', 'vm': '1', 'name': 'ResultsNormalsSequence' },
+  '(0024,0065)': { 'tag': '(0024,0065)', 'vr': 'SQ', 'vm': '1', 'name': 'AgeCorrectedSensitivityDeviationAlgorithmSequence' },
+  '(0024,0066)': { 'tag': '(0024,0066)', 'vr': 'FL', 'vm': '1', 'name': 'GlobalDeviationFromNormal' },
+  '(0024,0067)': { 'tag': '(0024,0067)', 'vr': 'SQ', 'vm': '1', 'name': 'GeneralizedDefectSensitivityDeviationAlgorithmSequence' },
+  '(0024,0068)': { 'tag': '(0024,0068)', 'vr': 'FL', 'vm': '1', 'name': 'LocalizedDeviationfromNormal' },
+  '(0024,0069)': { 'tag': '(0024,0069)', 'vr': 'LO', 'vm': '1', 'name': 'PatientReliabilityIndicator' },
+  '(0024,0070)': { 'tag': '(0024,0070)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldMeanSensitivity' },
+  '(0024,0071)': { 'tag': '(0024,0071)', 'vr': 'FL', 'vm': '1', 'name': 'GlobalDeviationProbability' },
+  '(0024,0072)': { 'tag': '(0024,0072)', 'vr': 'CS', 'vm': '1', 'name': 'LocalDeviationProbabilityNormalsFlag' },
+  '(0024,0073)': { 'tag': '(0024,0073)', 'vr': 'FL', 'vm': '1', 'name': 'LocalizedDeviationProbability' },
+  '(0024,0074)': { 'tag': '(0024,0074)', 'vr': 'CS', 'vm': '1', 'name': 'ShortTermFluctuationCalculated' },
+  '(0024,0075)': { 'tag': '(0024,0075)', 'vr': 'FL', 'vm': '1', 'name': 'ShortTermFluctuation' },
+  '(0024,0076)': { 'tag': '(0024,0076)', 'vr': 'CS', 'vm': '1', 'name': 'ShortTermFluctuationProbabilityCalculated' },
+  '(0024,0077)': { 'tag': '(0024,0077)', 'vr': 'FL', 'vm': '1', 'name': 'ShortTermFluctuationProbability' },
+  '(0024,0078)': { 'tag': '(0024,0078)', 'vr': 'CS', 'vm': '1', 'name': 'CorrectedLocalizedDeviationFromNormalCalculated' },
+  '(0024,0079)': { 'tag': '(0024,0079)', 'vr': 'FL', 'vm': '1', 'name': 'CorrectedLocalizedDeviationFromNormal' },
+  '(0024,0080)': { 'tag': '(0024,0080)', 'vr': 'CS', 'vm': '1', 'name': 'CorrectedLocalizedDeviationFromNormalProbabilityCalculated' },
+  '(0024,0081)': { 'tag': '(0024,0081)', 'vr': 'FL', 'vm': '1', 'name': 'CorrectedLocalizedDeviationFromNormalProbability' },
+  '(0024,0083)': { 'tag': '(0024,0083)', 'vr': 'SQ', 'vm': '1', 'name': 'GlobalDeviationProbabilitySequence' },
+  '(0024,0085)': { 'tag': '(0024,0085)', 'vr': 'SQ', 'vm': '1', 'name': 'LocalizedDeviationProbabilitySequence' },
+  '(0024,0086)': { 'tag': '(0024,0086)', 'vr': 'CS', 'vm': '1', 'name': 'FovealSensitivityMeasured' },
+  '(0024,0087)': { 'tag': '(0024,0087)', 'vr': 'FL', 'vm': '1', 'name': 'FovealSensitivity' },
+  '(0024,0088)': { 'tag': '(0024,0088)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldTestDuration' },
+  '(0024,0089)': { 'tag': '(0024,0089)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualFieldTestPointSequence' },
+  '(0024,0090)': { 'tag': '(0024,0090)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldTestPointXCoordinate' },
+  '(0024,0091)': { 'tag': '(0024,0091)', 'vr': 'FL', 'vm': '1', 'name': 'VisualFieldTestPointYCoordinate' },
+  '(0024,0092)': { 'tag': '(0024,0092)', 'vr': 'FL', 'vm': '1', 'name': 'AgeCorrectedSensitivityDeviationValue' },
+  '(0024,0093)': { 'tag': '(0024,0093)', 'vr': 'CS', 'vm': '1', 'name': 'StimulusResults' },
+  '(0024,0094)': { 'tag': '(0024,0094)', 'vr': 'FL', 'vm': '1', 'name': 'SensitivityValue' },
+  '(0024,0095)': { 'tag': '(0024,0095)', 'vr': 'CS', 'vm': '1', 'name': 'RetestStimulusSeen' },
+  '(0024,0096)': { 'tag': '(0024,0096)', 'vr': 'FL', 'vm': '1', 'name': 'RetestSensitivityValue' },
+  '(0024,0097)': { 'tag': '(0024,0097)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualFieldTestPointNormalsSequence' },
+  '(0024,0098)': { 'tag': '(0024,0098)', 'vr': 'FL', 'vm': '1', 'name': 'QuantifiedDefect' },
+  '(0024,0100)': { 'tag': '(0024,0100)', 'vr': 'FL', 'vm': '1', 'name': 'AgeCorrectedSensitivityDeviationProbabilityValue' },
+  '(0024,0102)': { 'tag': '(0024,0102)', 'vr': 'CS', 'vm': '1', 'name': 'GeneralizedDefectCorrectedSensitivityDeviationFlag ' },
+  '(0024,0103)': { 'tag': '(0024,0103)', 'vr': 'FL', 'vm': '1', 'name': 'GeneralizedDefectCorrectedSensitivityDeviationValue ' },
+  '(0024,0104)': { 'tag': '(0024,0104)', 'vr': 'FL', 'vm': '1', 'name': 'GeneralizedDefectCorrectedSensitivityDeviationProbabilityValue' },
+  '(0024,0105)': { 'tag': '(0024,0105)', 'vr': 'FL', 'vm': '1', 'name': 'MinimumSensitivityValue' },
+  '(0024,0106)': { 'tag': '(0024,0106)', 'vr': 'CS', 'vm': '1', 'name': 'BlindSpotLocalized' },
+  '(0024,0107)': { 'tag': '(0024,0107)', 'vr': 'FL', 'vm': '1', 'name': 'BlindSpotXCoordinate' },
+  '(0024,0108)': { 'tag': '(0024,0108)', 'vr': 'FL', 'vm': '1', 'name': 'BlindSpotYCoordinate ' },
+  '(0024,0110)': { 'tag': '(0024,0110)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualAcuityMeasurementSequence' },
+  '(0024,0112)': { 'tag': '(0024,0112)', 'vr': 'SQ', 'vm': '1', 'name': 'RefractiveParametersUsedOnPatientSequence' },
+  '(0024,0113)': { 'tag': '(0024,0113)', 'vr': 'CS', 'vm': '1', 'name': 'MeasurementLaterality' },
+  '(0024,0114)': { 'tag': '(0024,0114)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicPatientClinicalInformationLeftEyeSequence' },
+  '(0024,0115)': { 'tag': '(0024,0115)', 'vr': 'SQ', 'vm': '1', 'name': 'OphthalmicPatientClinicalInformationRightEyeSequence' },
+  '(0024,0117)': { 'tag': '(0024,0117)', 'vr': 'CS', 'vm': '1', 'name': 'FovealPointNormativeDataFlag' },
+  '(0024,0118)': { 'tag': '(0024,0118)', 'vr': 'FL', 'vm': '1', 'name': 'FovealPointProbabilityValue' },
+  '(0024,0120)': { 'tag': '(0024,0120)', 'vr': 'CS', 'vm': '1', 'name': 'ScreeningBaselineMeasured' },
+  '(0024,0122)': { 'tag': '(0024,0122)', 'vr': 'SQ', 'vm': '1', 'name': 'ScreeningBaselineMeasuredSequence' },
+  '(0024,0124)': { 'tag': '(0024,0124)', 'vr': 'CS', 'vm': '1', 'name': 'ScreeningBaselineType' },
+  '(0024,0126)': { 'tag': '(0024,0126)', 'vr': 'FL', 'vm': '1', 'name': 'ScreeningBaselineValue' },
+  '(0024,0202)': { 'tag': '(0024,0202)', 'vr': 'LO', 'vm': '1', 'name': 'AlgorithmSource' },
+  '(0024,0306)': { 'tag': '(0024,0306)', 'vr': 'LO', 'vm': '1', 'name': 'DataSetName' },
+  '(0024,0307)': { 'tag': '(0024,0307)', 'vr': 'LO', 'vm': '1', 'name': 'DataSetVersion' },
+  '(0024,0308)': { 'tag': '(0024,0308)', 'vr': 'LO', 'vm': '1', 'name': 'DataSetSource' },
+  '(0024,0309)': { 'tag': '(0024,0309)', 'vr': 'LO', 'vm': '1', 'name': 'DataSetDescription' },
+  '(0024,0317)': { 'tag': '(0024,0317)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualFieldTestReliabilityGlobalIndexSequence' },
+  '(0024,0320)': { 'tag': '(0024,0320)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualFieldGlobalResultsIndexSequence' },
+  '(0024,0325)': { 'tag': '(0024,0325)', 'vr': 'SQ', 'vm': '1', 'name': 'DataObservationSequence' },
+  '(0024,0338)': { 'tag': '(0024,0338)', 'vr': 'CS', 'vm': '1', 'name': 'IndexNormalsFlag' },
+  '(0024,0341)': { 'tag': '(0024,0341)', 'vr': 'FL', 'vm': '1', 'name': 'IndexProbability' },
+  '(0024,0344)': { 'tag': '(0024,0344)', 'vr': 'SQ', 'vm': '1', 'name': 'IndexProbabilitySequence' },
+  '(0028,0002)': { 'tag': '(0028,0002)', 'vr': 'US', 'vm': '1', 'name': 'SamplesPerPixel' },
+  '(0028,0003)': { 'tag': '(0028,0003)', 'vr': 'US', 'vm': '1', 'name': 'SamplesPerPixelUsed' },
+  '(0028,0004)': { 'tag': '(0028,0004)', 'vr': 'CS', 'vm': '1', 'name': 'PhotometricInterpretation' },
+  '(0028,0005)': { 'tag': '(0028,0005)', 'vr': 'US', 'vm': '1', 'name': 'ImageDimensions' },
+  '(0028,0006)': { 'tag': '(0028,0006)', 'vr': 'US', 'vm': '1', 'name': 'PlanarConfiguration' },
+  '(0028,0008)': { 'tag': '(0028,0008)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFrames' },
+  '(0028,0009)': { 'tag': '(0028,0009)', 'vr': 'AT', 'vm': '1-n', 'name': 'FrameIncrementPointer' },
+  '(0028,000A)': { 'tag': '(0028,000A)', 'vr': 'AT', 'vm': '1-n', 'name': 'FrameDimensionPointer' },
+  '(0028,0010)': { 'tag': '(0028,0010)', 'vr': 'US', 'vm': '1', 'name': 'Rows' },
+  '(0028,0011)': { 'tag': '(0028,0011)', 'vr': 'US', 'vm': '1', 'name': 'Columns' },
+  '(0028,0012)': { 'tag': '(0028,0012)', 'vr': 'US', 'vm': '1', 'name': 'Planes' },
+  '(0028,0014)': { 'tag': '(0028,0014)', 'vr': 'US', 'vm': '1', 'name': 'UltrasoundColorDataPresent' },
+  '(0028,0030)': { 'tag': '(0028,0030)', 'vr': 'DS', 'vm': '2', 'name': 'PixelSpacing' },
+  '(0028,0031)': { 'tag': '(0028,0031)', 'vr': 'DS', 'vm': '2', 'name': 'ZoomFactor' },
+  '(0028,0032)': { 'tag': '(0028,0032)', 'vr': 'DS', 'vm': '2', 'name': 'ZoomCenter' },
+  '(0028,0034)': { 'tag': '(0028,0034)', 'vr': 'IS', 'vm': '2', 'name': 'PixelAspectRatio' },
+  '(0028,0040)': { 'tag': '(0028,0040)', 'vr': 'CS', 'vm': '1', 'name': 'ImageFormat' },
+  '(0028,0050)': { 'tag': '(0028,0050)', 'vr': 'LO', 'vm': '1-n', 'name': 'ManipulatedImage' },
+  '(0028,0051)': { 'tag': '(0028,0051)', 'vr': 'CS', 'vm': '1-n', 'name': 'CorrectedImage' },
+  '(0028,005F)': { 'tag': '(0028,005F)', 'vr': 'LO', 'vm': '1', 'name': 'CompressionRecognitionCode' },
+  '(0028,0060)': { 'tag': '(0028,0060)', 'vr': 'CS', 'vm': '1', 'name': 'CompressionCode' },
+  '(0028,0061)': { 'tag': '(0028,0061)', 'vr': 'SH', 'vm': '1', 'name': 'CompressionOriginator' },
+  '(0028,0062)': { 'tag': '(0028,0062)', 'vr': 'LO', 'vm': '1', 'name': 'CompressionLabel' },
+  '(0028,0063)': { 'tag': '(0028,0063)', 'vr': 'SH', 'vm': '1', 'name': 'CompressionDescription' },
+  '(0028,0065)': { 'tag': '(0028,0065)', 'vr': 'CS', 'vm': '1-n', 'name': 'CompressionSequence' },
+  '(0028,0066)': { 'tag': '(0028,0066)', 'vr': 'AT', 'vm': '1-n', 'name': 'CompressionStepPointers' },
+  '(0028,0068)': { 'tag': '(0028,0068)', 'vr': 'US', 'vm': '1', 'name': 'RepeatInterval' },
+  '(0028,0069)': { 'tag': '(0028,0069)', 'vr': 'US', 'vm': '1', 'name': 'BitsGrouped' },
+  '(0028,0070)': { 'tag': '(0028,0070)', 'vr': 'US', 'vm': '1-n', 'name': 'PerimeterTable' },
+  '(0028,0071)': { 'tag': '(0028,0071)', 'vr': 'US|SS', 'vm': '1', 'name': 'PerimeterValue' },
+  '(0028,0080)': { 'tag': '(0028,0080)', 'vr': 'US', 'vm': '1', 'name': 'PredictorRows' },
+  '(0028,0081)': { 'tag': '(0028,0081)', 'vr': 'US', 'vm': '1', 'name': 'PredictorColumns' },
+  '(0028,0082)': { 'tag': '(0028,0082)', 'vr': 'US', 'vm': '1-n', 'name': 'PredictorConstants' },
+  '(0028,0090)': { 'tag': '(0028,0090)', 'vr': 'CS', 'vm': '1', 'name': 'BlockedPixels' },
+  '(0028,0091)': { 'tag': '(0028,0091)', 'vr': 'US', 'vm': '1', 'name': 'BlockRows' },
+  '(0028,0092)': { 'tag': '(0028,0092)', 'vr': 'US', 'vm': '1', 'name': 'BlockColumns' },
+  '(0028,0093)': { 'tag': '(0028,0093)', 'vr': 'US', 'vm': '1', 'name': 'RowOverlap' },
+  '(0028,0094)': { 'tag': '(0028,0094)', 'vr': 'US', 'vm': '1', 'name': 'ColumnOverlap' },
+  '(0028,0100)': { 'tag': '(0028,0100)', 'vr': 'US', 'vm': '1', 'name': 'BitsAllocated' },
+  '(0028,0101)': { 'tag': '(0028,0101)', 'vr': 'US', 'vm': '1', 'name': 'BitsStored' },
+  '(0028,0102)': { 'tag': '(0028,0102)', 'vr': 'US', 'vm': '1', 'name': 'HighBit' },
+  '(0028,0103)': { 'tag': '(0028,0103)', 'vr': 'US', 'vm': '1', 'name': 'PixelRepresentation' },
+  '(0028,0104)': { 'tag': '(0028,0104)', 'vr': 'US|SS', 'vm': '1', 'name': 'SmallestValidPixelValue' },
+  '(0028,0105)': { 'tag': '(0028,0105)', 'vr': 'US|SS', 'vm': '1', 'name': 'LargestValidPixelValue' },
+  '(0028,0106)': { 'tag': '(0028,0106)', 'vr': 'US|SS', 'vm': '1', 'name': 'SmallestImagePixelValue' },
+  '(0028,0107)': { 'tag': '(0028,0107)', 'vr': 'US|SS', 'vm': '1', 'name': 'LargestImagePixelValue' },
+  '(0028,0108)': { 'tag': '(0028,0108)', 'vr': 'US|SS', 'vm': '1', 'name': 'SmallestPixelValueInSeries' },
+  '(0028,0109)': { 'tag': '(0028,0109)', 'vr': 'US|SS', 'vm': '1', 'name': 'LargestPixelValueInSeries' },
+  '(0028,0110)': { 'tag': '(0028,0110)', 'vr': 'US|SS', 'vm': '1', 'name': 'SmallestImagePixelValueInPlane' },
+  '(0028,0111)': { 'tag': '(0028,0111)', 'vr': 'US|SS', 'vm': '1', 'name': 'LargestImagePixelValueInPlane' },
+  '(0028,0120)': { 'tag': '(0028,0120)', 'vr': 'US|SS', 'vm': '1', 'name': 'PixelPaddingValue' },
+  '(0028,0121)': { 'tag': '(0028,0121)', 'vr': 'US|SS', 'vm': '1', 'name': 'PixelPaddingRangeLimit' },
+  '(0028,0200)': { 'tag': '(0028,0200)', 'vr': 'US', 'vm': '1', 'name': 'ImageLocation' },
+  '(0028,0300)': { 'tag': '(0028,0300)', 'vr': 'CS', 'vm': '1', 'name': 'QualityControlImage' },
+  '(0028,0301)': { 'tag': '(0028,0301)', 'vr': 'CS', 'vm': '1', 'name': 'BurnedInAnnotation' },
+  '(0028,0302)': { 'tag': '(0028,0302)', 'vr': 'CS', 'vm': '1', 'name': 'RecognizableVisualFeatures' },
+  '(0028,0303)': { 'tag': '(0028,0303)', 'vr': 'CS', 'vm': '1', 'name': 'LongitudinalTemporalInformationModified' },
+  '(0028,0400)': { 'tag': '(0028,0400)', 'vr': 'LO', 'vm': '1', 'name': 'TransformLabel' },
+  '(0028,0401)': { 'tag': '(0028,0401)', 'vr': 'LO', 'vm': '1', 'name': 'TransformVersionNumber' },
+  '(0028,0402)': { 'tag': '(0028,0402)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTransformSteps' },
+  '(0028,0403)': { 'tag': '(0028,0403)', 'vr': 'LO', 'vm': '1-n', 'name': 'SequenceOfCompressedData' },
+  '(0028,0404)': { 'tag': '(0028,0404)', 'vr': 'AT', 'vm': '1-n', 'name': 'DetailsOfCoefficients' },
+  '(0028,04x0)': { 'tag': '(0028,04x0)', 'vr': 'US', 'vm': '1', 'name': 'RowsForNthOrderCoefficients' },
+  '(0028,04x1)': { 'tag': '(0028,04x1)', 'vr': 'US', 'vm': '1', 'name': 'ColumnsForNthOrderCoefficients' },
+  '(0028,04x2)': { 'tag': '(0028,04x2)', 'vr': 'LO', 'vm': '1-n', 'name': 'CoefficientCoding' },
+  '(0028,04x3)': { 'tag': '(0028,04x3)', 'vr': 'AT', 'vm': '1-n', 'name': 'CoefficientCodingPointers' },
+  '(0028,0700)': { 'tag': '(0028,0700)', 'vr': 'LO', 'vm': '1', 'name': 'DCTLabel' },
+  '(0028,0701)': { 'tag': '(0028,0701)', 'vr': 'CS', 'vm': '1-n', 'name': 'DataBlockDescription' },
+  '(0028,0702)': { 'tag': '(0028,0702)', 'vr': 'AT', 'vm': '1-n', 'name': 'DataBlock' },
+  '(0028,0710)': { 'tag': '(0028,0710)', 'vr': 'US', 'vm': '1', 'name': 'NormalizationFactorFormat' },
+  '(0028,0720)': { 'tag': '(0028,0720)', 'vr': 'US', 'vm': '1', 'name': 'ZonalMapNumberFormat' },
+  '(0028,0721)': { 'tag': '(0028,0721)', 'vr': 'AT', 'vm': '1-n', 'name': 'ZonalMapLocation' },
+  '(0028,0722)': { 'tag': '(0028,0722)', 'vr': 'US', 'vm': '1', 'name': 'ZonalMapFormat' },
+  '(0028,0730)': { 'tag': '(0028,0730)', 'vr': 'US', 'vm': '1', 'name': 'AdaptiveMapFormat' },
+  '(0028,0740)': { 'tag': '(0028,0740)', 'vr': 'US', 'vm': '1', 'name': 'CodeNumberFormat' },
+  '(0028,08x0)': { 'tag': '(0028,08x0)', 'vr': 'CS', 'vm': '1-n', 'name': 'CodeLabel' },
+  '(0028,08x2)': { 'tag': '(0028,08x2)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTables' },
+  '(0028,08x3)': { 'tag': '(0028,08x3)', 'vr': 'AT', 'vm': '1-n', 'name': 'CodeTableLocation' },
+  '(0028,08x4)': { 'tag': '(0028,08x4)', 'vr': 'US', 'vm': '1', 'name': 'BitsForCodeWord' },
+  '(0028,08x8)': { 'tag': '(0028,08x8)', 'vr': 'AT', 'vm': '1-n', 'name': 'ImageDataLocation' },
+  '(0028,0A02)': { 'tag': '(0028,0A02)', 'vr': 'CS', 'vm': '1', 'name': 'PixelSpacingCalibrationType' },
+  '(0028,0A04)': { 'tag': '(0028,0A04)', 'vr': 'LO', 'vm': '1', 'name': 'PixelSpacingCalibrationDescription' },
+  '(0028,1040)': { 'tag': '(0028,1040)', 'vr': 'CS', 'vm': '1', 'name': 'PixelIntensityRelationship' },
+  '(0028,1041)': { 'tag': '(0028,1041)', 'vr': 'SS', 'vm': '1', 'name': 'PixelIntensityRelationshipSign' },
+  '(0028,1050)': { 'tag': '(0028,1050)', 'vr': 'DS', 'vm': '1-n', 'name': 'WindowCenter' },
+  '(0028,1051)': { 'tag': '(0028,1051)', 'vr': 'DS', 'vm': '1-n', 'name': 'WindowWidth' },
+  '(0028,1052)': { 'tag': '(0028,1052)', 'vr': 'DS', 'vm': '1', 'name': 'RescaleIntercept' },
+  '(0028,1053)': { 'tag': '(0028,1053)', 'vr': 'DS', 'vm': '1', 'name': 'RescaleSlope' },
+  '(0028,1054)': { 'tag': '(0028,1054)', 'vr': 'LO', 'vm': '1', 'name': 'RescaleType' },
+  '(0028,1055)': { 'tag': '(0028,1055)', 'vr': 'LO', 'vm': '1-n', 'name': 'WindowCenterWidthExplanation' },
+  '(0028,1056)': { 'tag': '(0028,1056)', 'vr': 'CS', 'vm': '1', 'name': 'VOILUTFunction' },
+  '(0028,1080)': { 'tag': '(0028,1080)', 'vr': 'CS', 'vm': '1', 'name': 'GrayScale' },
+  '(0028,1090)': { 'tag': '(0028,1090)', 'vr': 'CS', 'vm': '1', 'name': 'RecommendedViewingMode' },
+  '(0028,1100)': { 'tag': '(0028,1100)', 'vr': 'US|SS', 'vm': '3', 'name': 'GrayLookupTableDescriptor' },
+  '(0028,1101)': { 'tag': '(0028,1101)', 'vr': 'US|SS', 'vm': '3', 'name': 'RedPaletteColorLookupTableDescriptor' },
+  '(0028,1102)': { 'tag': '(0028,1102)', 'vr': 'US|SS', 'vm': '3', 'name': 'GreenPaletteColorLookupTableDescriptor' },
+  '(0028,1103)': { 'tag': '(0028,1103)', 'vr': 'US|SS', 'vm': '3', 'name': 'BluePaletteColorLookupTableDescriptor' },
+  '(0028,1104)': { 'tag': '(0028,1104)', 'vr': 'US', 'vm': '3', 'name': 'AlphaPaletteColorLookupTableDescriptor' },
+  '(0028,1111)': { 'tag': '(0028,1111)', 'vr': 'US|SS', 'vm': '4', 'name': 'LargeRedPaletteColorLookupTableDescriptor' },
+  '(0028,1112)': { 'tag': '(0028,1112)', 'vr': 'US|SS', 'vm': '4', 'name': 'LargeGreenPaletteColorLookupTableDescriptor' },
+  '(0028,1113)': { 'tag': '(0028,1113)', 'vr': 'US|SS', 'vm': '4', 'name': 'LargeBluePaletteColorLookupTableDescriptor' },
+  '(0028,1199)': { 'tag': '(0028,1199)', 'vr': 'UI', 'vm': '1', 'name': 'PaletteColorLookupTableUID' },
+  '(0028,1200)': { 'tag': '(0028,1200)', 'vr': 'US|SS|OW', 'vm': '1-n1', 'name': 'GrayLookupTableData' },
+  '(0028,1201)': { 'tag': '(0028,1201)', 'vr': 'OW', 'vm': '1', 'name': 'RedPaletteColorLookupTableData' },
+  '(0028,1202)': { 'tag': '(0028,1202)', 'vr': 'OW', 'vm': '1', 'name': 'GreenPaletteColorLookupTableData' },
+  '(0028,1203)': { 'tag': '(0028,1203)', 'vr': 'OW', 'vm': '1', 'name': 'BluePaletteColorLookupTableData' },
+  '(0028,1204)': { 'tag': '(0028,1204)', 'vr': 'OW', 'vm': '1', 'name': 'AlphaPaletteColorLookupTableData' },
+  '(0028,1211)': { 'tag': '(0028,1211)', 'vr': 'OW', 'vm': '1', 'name': 'LargeRedPaletteColorLookupTableData' },
+  '(0028,1212)': { 'tag': '(0028,1212)', 'vr': 'OW', 'vm': '1', 'name': 'LargeGreenPaletteColorLookupTableData' },
+  '(0028,1213)': { 'tag': '(0028,1213)', 'vr': 'OW', 'vm': '1', 'name': 'LargeBluePaletteColorLookupTableData' },
+  '(0028,1214)': { 'tag': '(0028,1214)', 'vr': 'UI', 'vm': '1', 'name': 'LargePaletteColorLookupTableUID' },
+  '(0028,1221)': { 'tag': '(0028,1221)', 'vr': 'OW', 'vm': '1', 'name': 'SegmentedRedPaletteColorLookupTableData' },
+  '(0028,1222)': { 'tag': '(0028,1222)', 'vr': 'OW', 'vm': '1', 'name': 'SegmentedGreenPaletteColorLookupTableData' },
+  '(0028,1223)': { 'tag': '(0028,1223)', 'vr': 'OW', 'vm': '1', 'name': 'SegmentedBluePaletteColorLookupTableData' },
+  '(0028,1300)': { 'tag': '(0028,1300)', 'vr': 'CS', 'vm': '1', 'name': 'BreastImplantPresent' },
+  '(0028,1350)': { 'tag': '(0028,1350)', 'vr': 'CS', 'vm': '1', 'name': 'PartialView' },
+  '(0028,1351)': { 'tag': '(0028,1351)', 'vr': 'ST', 'vm': '1', 'name': 'PartialViewDescription' },
+  '(0028,1352)': { 'tag': '(0028,1352)', 'vr': 'SQ', 'vm': '1', 'name': 'PartialViewCodeSequence' },
+  '(0028,135A)': { 'tag': '(0028,135A)', 'vr': 'CS', 'vm': '1', 'name': 'SpatialLocationsPreserved' },
+  '(0028,1401)': { 'tag': '(0028,1401)', 'vr': 'SQ', 'vm': '1', 'name': 'DataFrameAssignmentSequence' },
+  '(0028,1402)': { 'tag': '(0028,1402)', 'vr': 'CS', 'vm': '1', 'name': 'DataPathAssignment' },
+  '(0028,1403)': { 'tag': '(0028,1403)', 'vr': 'US', 'vm': '1', 'name': 'BitsMappedToColorLookupTable' },
+  '(0028,1404)': { 'tag': '(0028,1404)', 'vr': 'SQ', 'vm': '1', 'name': 'BlendingLUT1Sequence' },
+  '(0028,1405)': { 'tag': '(0028,1405)', 'vr': 'CS', 'vm': '1', 'name': 'BlendingLUT1TransferFunction' },
+  '(0028,1406)': { 'tag': '(0028,1406)', 'vr': 'FD', 'vm': '1', 'name': 'BlendingWeightConstant' },
+  '(0028,1407)': { 'tag': '(0028,1407)', 'vr': 'US', 'vm': '3', 'name': 'BlendingLookupTableDescriptor' },
+  '(0028,1408)': { 'tag': '(0028,1408)', 'vr': 'OW', 'vm': '1', 'name': 'BlendingLookupTableData' },
+  '(0028,140B)': { 'tag': '(0028,140B)', 'vr': 'SQ', 'vm': '1', 'name': 'EnhancedPaletteColorLookupTableSequence' },
+  '(0028,140C)': { 'tag': '(0028,140C)', 'vr': 'SQ', 'vm': '1', 'name': 'BlendingLUT2Sequence' },
+  '(0028,140D)': { 'tag': '(0028,140D)', 'vr': 'CS', 'vm': '1', 'name': 'BlendingLUT2TransferFunction' },
+  '(0028,140E)': { 'tag': '(0028,140E)', 'vr': 'CS', 'vm': '1', 'name': 'DataPathID' },
+  '(0028,140F)': { 'tag': '(0028,140F)', 'vr': 'CS', 'vm': '1', 'name': 'RGBLUTTransferFunction' },
+  '(0028,1410)': { 'tag': '(0028,1410)', 'vr': 'CS', 'vm': '1', 'name': 'AlphaLUTTransferFunction' },
+  '(0028,2000)': { 'tag': '(0028,2000)', 'vr': 'OB', 'vm': '1', 'name': 'ICCProfile' },
+  '(0028,2110)': { 'tag': '(0028,2110)', 'vr': 'CS', 'vm': '1', 'name': 'LossyImageCompression' },
+  '(0028,2112)': { 'tag': '(0028,2112)', 'vr': 'DS', 'vm': '1-n', 'name': 'LossyImageCompressionRatio' },
+  '(0028,2114)': { 'tag': '(0028,2114)', 'vr': 'CS', 'vm': '1-n', 'name': 'LossyImageCompressionMethod' },
+  '(0028,3000)': { 'tag': '(0028,3000)', 'vr': 'SQ', 'vm': '1', 'name': 'ModalityLUTSequence' },
+  '(0028,3002)': { 'tag': '(0028,3002)', 'vr': 'US|SS', 'vm': '3', 'name': 'LUTDescriptor' },
+  '(0028,3003)': { 'tag': '(0028,3003)', 'vr': 'LO', 'vm': '1', 'name': 'LUTExplanation' },
+  '(0028,3004)': { 'tag': '(0028,3004)', 'vr': 'LO', 'vm': '1', 'name': 'ModalityLUTType' },
+  '(0028,3006)': { 'tag': '(0028,3006)', 'vr': 'US|OW', 'vm': '1-n1', 'name': 'LUTData' },
+  '(0028,3010)': { 'tag': '(0028,3010)', 'vr': 'SQ', 'vm': '1', 'name': 'VOILUTSequence' },
+  '(0028,3110)': { 'tag': '(0028,3110)', 'vr': 'SQ', 'vm': '1', 'name': 'SoftcopyVOILUTSequence' },
+  '(0028,4000)': { 'tag': '(0028,4000)', 'vr': 'LT', 'vm': '1', 'name': 'ImagePresentationComments' },
+  '(0028,5000)': { 'tag': '(0028,5000)', 'vr': 'SQ', 'vm': '1', 'name': 'BiPlaneAcquisitionSequence' },
+  '(0028,6010)': { 'tag': '(0028,6010)', 'vr': 'US', 'vm': '1', 'name': 'RepresentativeFrameNumber' },
+  '(0028,6020)': { 'tag': '(0028,6020)', 'vr': 'US', 'vm': '1-n', 'name': 'FrameNumbersOfInterest' },
+  '(0028,6022)': { 'tag': '(0028,6022)', 'vr': 'LO', 'vm': '1-n', 'name': 'FrameOfInterestDescription' },
+  '(0028,6023)': { 'tag': '(0028,6023)', 'vr': 'CS', 'vm': '1-n', 'name': 'FrameOfInterestType' },
+  '(0028,6030)': { 'tag': '(0028,6030)', 'vr': 'US', 'vm': '1-n', 'name': 'MaskPointers' },
+  '(0028,6040)': { 'tag': '(0028,6040)', 'vr': 'US', 'vm': '1-n', 'name': 'RWavePointer' },
+  '(0028,6100)': { 'tag': '(0028,6100)', 'vr': 'SQ', 'vm': '1', 'name': 'MaskSubtractionSequence' },
+  '(0028,6101)': { 'tag': '(0028,6101)', 'vr': 'CS', 'vm': '1', 'name': 'MaskOperation' },
+  '(0028,6102)': { 'tag': '(0028,6102)', 'vr': 'US', 'vm': '2-2n', 'name': 'ApplicableFrameRange' },
+  '(0028,6110)': { 'tag': '(0028,6110)', 'vr': 'US', 'vm': '1-n', 'name': 'MaskFrameNumbers' },
+  '(0028,6112)': { 'tag': '(0028,6112)', 'vr': 'US', 'vm': '1', 'name': 'ContrastFrameAveraging' },
+  '(0028,6114)': { 'tag': '(0028,6114)', 'vr': 'FL', 'vm': '2', 'name': 'MaskSubPixelShift' },
+  '(0028,6120)': { 'tag': '(0028,6120)', 'vr': 'SS', 'vm': '1', 'name': 'TIDOffset' },
+  '(0028,6190)': { 'tag': '(0028,6190)', 'vr': 'ST', 'vm': '1', 'name': 'MaskOperationExplanation' },
+  '(0028,7FE0)': { 'tag': '(0028,7FE0)', 'vr': 'UT', 'vm': '1', 'name': 'PixelDataProviderURL' },
+  '(0028,9001)': { 'tag': '(0028,9001)', 'vr': 'UL', 'vm': '1', 'name': 'DataPointRows' },
+  '(0028,9002)': { 'tag': '(0028,9002)', 'vr': 'UL', 'vm': '1', 'name': 'DataPointColumns' },
+  '(0028,9003)': { 'tag': '(0028,9003)', 'vr': 'CS', 'vm': '1', 'name': 'SignalDomainColumns' },
+  '(0028,9099)': { 'tag': '(0028,9099)', 'vr': 'US', 'vm': '1', 'name': 'LargestMonochromePixelValue' },
+  '(0028,9108)': { 'tag': '(0028,9108)', 'vr': 'CS', 'vm': '1', 'name': 'DataRepresentation' },
+  '(0028,9110)': { 'tag': '(0028,9110)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelMeasuresSequence' },
+  '(0028,9132)': { 'tag': '(0028,9132)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameVOILUTSequence' },
+  '(0028,9145)': { 'tag': '(0028,9145)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelValueTransformationSequence' },
+  '(0028,9235)': { 'tag': '(0028,9235)', 'vr': 'CS', 'vm': '1', 'name': 'SignalDomainRows' },
+  '(0028,9411)': { 'tag': '(0028,9411)', 'vr': 'FL', 'vm': '1', 'name': 'DisplayFilterPercentage' },
+  '(0028,9415)': { 'tag': '(0028,9415)', 'vr': 'SQ', 'vm': '1', 'name': 'FramePixelShiftSequence' },
+  '(0028,9416)': { 'tag': '(0028,9416)', 'vr': 'US', 'vm': '1', 'name': 'SubtractionItemID' },
+  '(0028,9422)': { 'tag': '(0028,9422)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelIntensityRelationshipLUTSequence' },
+  '(0028,9443)': { 'tag': '(0028,9443)', 'vr': 'SQ', 'vm': '1', 'name': 'FramePixelDataPropertiesSequence' },
+  '(0028,9444)': { 'tag': '(0028,9444)', 'vr': 'CS', 'vm': '1', 'name': 'GeometricalProperties' },
+  '(0028,9445)': { 'tag': '(0028,9445)', 'vr': 'FL', 'vm': '1', 'name': 'GeometricMaximumDistortion' },
+  '(0028,9446)': { 'tag': '(0028,9446)', 'vr': 'CS', 'vm': '1-n', 'name': 'ImageProcessingApplied' },
+  '(0028,9454)': { 'tag': '(0028,9454)', 'vr': 'CS', 'vm': '1', 'name': 'MaskSelectionMode' },
+  '(0028,9474)': { 'tag': '(0028,9474)', 'vr': 'CS', 'vm': '1', 'name': 'LUTFunction' },
+  '(0028,9478)': { 'tag': '(0028,9478)', 'vr': 'FL', 'vm': '1', 'name': 'MaskVisibilityPercentage' },
+  '(0028,9501)': { 'tag': '(0028,9501)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelShiftSequence' },
+  '(0028,9502)': { 'tag': '(0028,9502)', 'vr': 'SQ', 'vm': '1', 'name': 'RegionPixelShiftSequence' },
+  '(0028,9503)': { 'tag': '(0028,9503)', 'vr': 'SS', 'vm': '2-2n', 'name': 'VerticesOfTheRegion' },
+  '(0028,9505)': { 'tag': '(0028,9505)', 'vr': 'SQ', 'vm': '1', 'name': 'MultiFramePresentationSequence' },
+  '(0028,9506)': { 'tag': '(0028,9506)', 'vr': 'US', 'vm': '2-2n', 'name': 'PixelShiftFrameRange' },
+  '(0028,9507)': { 'tag': '(0028,9507)', 'vr': 'US', 'vm': '2-2n', 'name': 'LUTFrameRange' },
+  '(0028,9520)': { 'tag': '(0028,9520)', 'vr': 'DS', 'vm': '16', 'name': 'ImageToEquipmentMappingMatrix' },
+  '(0028,9537)': { 'tag': '(0028,9537)', 'vr': 'CS', 'vm': '1', 'name': 'EquipmentCoordinateSystemIdentification' },
+  '(0032,000A)': { 'tag': '(0032,000A)', 'vr': 'CS', 'vm': '1', 'name': 'StudyStatusID' },
+  '(0032,000C)': { 'tag': '(0032,000C)', 'vr': 'CS', 'vm': '1', 'name': 'StudyPriorityID' },
+  '(0032,0012)': { 'tag': '(0032,0012)', 'vr': 'LO', 'vm': '1', 'name': 'StudyIDIssuer' },
+  '(0032,0032)': { 'tag': '(0032,0032)', 'vr': 'DA', 'vm': '1', 'name': 'StudyVerifiedDate' },
+  '(0032,0033)': { 'tag': '(0032,0033)', 'vr': 'TM', 'vm': '1', 'name': 'StudyVerifiedTime' },
+  '(0032,0034)': { 'tag': '(0032,0034)', 'vr': 'DA', 'vm': '1', 'name': 'StudyReadDate' },
+  '(0032,0035)': { 'tag': '(0032,0035)', 'vr': 'TM', 'vm': '1', 'name': 'StudyReadTime' },
+  '(0032,1000)': { 'tag': '(0032,1000)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledStudyStartDate' },
+  '(0032,1001)': { 'tag': '(0032,1001)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledStudyStartTime' },
+  '(0032,1010)': { 'tag': '(0032,1010)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledStudyStopDate' },
+  '(0032,1011)': { 'tag': '(0032,1011)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledStudyStopTime' },
+  '(0032,1020)': { 'tag': '(0032,1020)', 'vr': 'LO', 'vm': '1', 'name': 'ScheduledStudyLocation' },
+  '(0032,1021)': { 'tag': '(0032,1021)', 'vr': 'AE', 'vm': '1-n', 'name': 'ScheduledStudyLocationAETitle' },
+  '(0032,1030)': { 'tag': '(0032,1030)', 'vr': 'LO', 'vm': '1', 'name': 'ReasonForStudy' },
+  '(0032,1031)': { 'tag': '(0032,1031)', 'vr': 'SQ', 'vm': '1', 'name': 'RequestingPhysicianIdentificationSequence' },
+  '(0032,1032)': { 'tag': '(0032,1032)', 'vr': 'PN', 'vm': '1', 'name': 'RequestingPhysician' },
+  '(0032,1033)': { 'tag': '(0032,1033)', 'vr': 'LO', 'vm': '1', 'name': 'RequestingService' },
+  '(0032,1034)': { 'tag': '(0032,1034)', 'vr': 'SQ', 'vm': '1', 'name': 'RequestingServiceCodeSequence' },
+  '(0032,1040)': { 'tag': '(0032,1040)', 'vr': 'DA', 'vm': '1', 'name': 'StudyArrivalDate' },
+  '(0032,1041)': { 'tag': '(0032,1041)', 'vr': 'TM', 'vm': '1', 'name': 'StudyArrivalTime' },
+  '(0032,1050)': { 'tag': '(0032,1050)', 'vr': 'DA', 'vm': '1', 'name': 'StudyCompletionDate' },
+  '(0032,1051)': { 'tag': '(0032,1051)', 'vr': 'TM', 'vm': '1', 'name': 'StudyCompletionTime' },
+  '(0032,1055)': { 'tag': '(0032,1055)', 'vr': 'CS', 'vm': '1', 'name': 'StudyComponentStatusID' },
+  '(0032,1060)': { 'tag': '(0032,1060)', 'vr': 'LO', 'vm': '1', 'name': 'RequestedProcedureDescription' },
+  '(0032,1064)': { 'tag': '(0032,1064)', 'vr': 'SQ', 'vm': '1', 'name': 'RequestedProcedureCodeSequence' },
+  '(0032,1070)': { 'tag': '(0032,1070)', 'vr': 'LO', 'vm': '1', 'name': 'RequestedContrastAgent' },
+  '(0032,4000)': { 'tag': '(0032,4000)', 'vr': 'LT', 'vm': '1', 'name': 'StudyComments' },
+  '(0038,0004)': { 'tag': '(0038,0004)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPatientAliasSequence' },
+  '(0038,0008)': { 'tag': '(0038,0008)', 'vr': 'CS', 'vm': '1', 'name': 'VisitStatusID' },
+  '(0038,0010)': { 'tag': '(0038,0010)', 'vr': 'LO', 'vm': '1', 'name': 'AdmissionID' },
+  '(0038,0011)': { 'tag': '(0038,0011)', 'vr': 'LO', 'vm': '1', 'name': 'IssuerOfAdmissionID' },
+  '(0038,0014)': { 'tag': '(0038,0014)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfAdmissionIDSequence' },
+  '(0038,0016)': { 'tag': '(0038,0016)', 'vr': 'LO', 'vm': '1', 'name': 'RouteOfAdmissions' },
+  '(0038,001A)': { 'tag': '(0038,001A)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledAdmissionDate' },
+  '(0038,001B)': { 'tag': '(0038,001B)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledAdmissionTime' },
+  '(0038,001C)': { 'tag': '(0038,001C)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledDischargeDate' },
+  '(0038,001D)': { 'tag': '(0038,001D)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledDischargeTime' },
+  '(0038,001E)': { 'tag': '(0038,001E)', 'vr': 'LO', 'vm': '1', 'name': 'ScheduledPatientInstitutionResidence' },
+  '(0038,0020)': { 'tag': '(0038,0020)', 'vr': 'DA', 'vm': '1', 'name': 'AdmittingDate' },
+  '(0038,0021)': { 'tag': '(0038,0021)', 'vr': 'TM', 'vm': '1', 'name': 'AdmittingTime' },
+  '(0038,0030)': { 'tag': '(0038,0030)', 'vr': 'DA', 'vm': '1', 'name': 'DischargeDate' },
+  '(0038,0032)': { 'tag': '(0038,0032)', 'vr': 'TM', 'vm': '1', 'name': 'DischargeTime' },
+  '(0038,0040)': { 'tag': '(0038,0040)', 'vr': 'LO', 'vm': '1', 'name': 'DischargeDiagnosisDescription' },
+  '(0038,0044)': { 'tag': '(0038,0044)', 'vr': 'SQ', 'vm': '1', 'name': 'DischargeDiagnosisCodeSequence' },
+  '(0038,0050)': { 'tag': '(0038,0050)', 'vr': 'LO', 'vm': '1', 'name': 'SpecialNeeds' },
+  '(0038,0060)': { 'tag': '(0038,0060)', 'vr': 'LO', 'vm': '1', 'name': 'ServiceEpisodeID' },
+  '(0038,0061)': { 'tag': '(0038,0061)', 'vr': 'LO', 'vm': '1', 'name': 'IssuerOfServiceEpisodeID' },
+  '(0038,0062)': { 'tag': '(0038,0062)', 'vr': 'LO', 'vm': '1', 'name': 'ServiceEpisodeDescription' },
+  '(0038,0064)': { 'tag': '(0038,0064)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfServiceEpisodeIDSequence' },
+  '(0038,0100)': { 'tag': '(0038,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'PertinentDocumentsSequence' },
+  '(0038,0300)': { 'tag': '(0038,0300)', 'vr': 'LO', 'vm': '1', 'name': 'CurrentPatientLocation' },
+  '(0038,0400)': { 'tag': '(0038,0400)', 'vr': 'LO', 'vm': '1', 'name': 'PatientInstitutionResidence' },
+  '(0038,0500)': { 'tag': '(0038,0500)', 'vr': 'LO', 'vm': '1', 'name': 'PatientState' },
+  '(0038,0502)': { 'tag': '(0038,0502)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientClinicalTrialParticipationSequence' },
+  '(0038,4000)': { 'tag': '(0038,4000)', 'vr': 'LT', 'vm': '1', 'name': 'VisitComments' },
+  '(003A,0004)': { 'tag': '(003A,0004)', 'vr': 'CS', 'vm': '1', 'name': 'WaveformOriginality' },
+  '(003A,0005)': { 'tag': '(003A,0005)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfWaveformChannels' },
+  '(003A,0010)': { 'tag': '(003A,0010)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfWaveformSamples' },
+  '(003A,001A)': { 'tag': '(003A,001A)', 'vr': 'DS', 'vm': '1', 'name': 'SamplingFrequency' },
+  '(003A,0020)': { 'tag': '(003A,0020)', 'vr': 'SH', 'vm': '1', 'name': 'MultiplexGroupLabel' },
+  '(003A,0200)': { 'tag': '(003A,0200)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelDefinitionSequence' },
+  '(003A,0202)': { 'tag': '(003A,0202)', 'vr': 'IS', 'vm': '1', 'name': 'WaveformChannelNumber' },
+  '(003A,0203)': { 'tag': '(003A,0203)', 'vr': 'SH', 'vm': '1', 'name': 'ChannelLabel' },
+  '(003A,0205)': { 'tag': '(003A,0205)', 'vr': 'CS', 'vm': '1-n', 'name': 'ChannelStatus' },
+  '(003A,0208)': { 'tag': '(003A,0208)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelSourceSequence' },
+  '(003A,0209)': { 'tag': '(003A,0209)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelSourceModifiersSequence' },
+  '(003A,020A)': { 'tag': '(003A,020A)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceWaveformSequence' },
+  '(003A,020C)': { 'tag': '(003A,020C)', 'vr': 'LO', 'vm': '1', 'name': 'ChannelDerivationDescription' },
+  '(003A,0210)': { 'tag': '(003A,0210)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelSensitivity' },
+  '(003A,0211)': { 'tag': '(003A,0211)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelSensitivityUnitsSequence' },
+  '(003A,0212)': { 'tag': '(003A,0212)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelSensitivityCorrectionFactor' },
+  '(003A,0213)': { 'tag': '(003A,0213)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelBaseline' },
+  '(003A,0214)': { 'tag': '(003A,0214)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelTimeSkew' },
+  '(003A,0215)': { 'tag': '(003A,0215)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelSampleSkew' },
+  '(003A,0218)': { 'tag': '(003A,0218)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelOffset' },
+  '(003A,021A)': { 'tag': '(003A,021A)', 'vr': 'US', 'vm': '1', 'name': 'WaveformBitsStored' },
+  '(003A,0220)': { 'tag': '(003A,0220)', 'vr': 'DS', 'vm': '1', 'name': 'FilterLowFrequency' },
+  '(003A,0221)': { 'tag': '(003A,0221)', 'vr': 'DS', 'vm': '1', 'name': 'FilterHighFrequency' },
+  '(003A,0222)': { 'tag': '(003A,0222)', 'vr': 'DS', 'vm': '1', 'name': 'NotchFilterFrequency' },
+  '(003A,0223)': { 'tag': '(003A,0223)', 'vr': 'DS', 'vm': '1', 'name': 'NotchFilterBandwidth' },
+  '(003A,0230)': { 'tag': '(003A,0230)', 'vr': 'FL', 'vm': '1', 'name': 'WaveformDataDisplayScale' },
+  '(003A,0231)': { 'tag': '(003A,0231)', 'vr': 'US', 'vm': '3', 'name': 'WaveformDisplayBackgroundCIELabValue' },
+  '(003A,0240)': { 'tag': '(003A,0240)', 'vr': 'SQ', 'vm': '1', 'name': 'WaveformPresentationGroupSequence' },
+  '(003A,0241)': { 'tag': '(003A,0241)', 'vr': 'US', 'vm': '1', 'name': 'PresentationGroupNumber' },
+  '(003A,0242)': { 'tag': '(003A,0242)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelDisplaySequence' },
+  '(003A,0244)': { 'tag': '(003A,0244)', 'vr': 'US', 'vm': '3', 'name': 'ChannelRecommendedDisplayCIELabValue' },
+  '(003A,0245)': { 'tag': '(003A,0245)', 'vr': 'FL', 'vm': '1', 'name': 'ChannelPosition' },
+  '(003A,0246)': { 'tag': '(003A,0246)', 'vr': 'CS', 'vm': '1', 'name': 'DisplayShadingFlag' },
+  '(003A,0247)': { 'tag': '(003A,0247)', 'vr': 'FL', 'vm': '1', 'name': 'FractionalChannelDisplayScale' },
+  '(003A,0248)': { 'tag': '(003A,0248)', 'vr': 'FL', 'vm': '1', 'name': 'AbsoluteChannelDisplayScale' },
+  '(003A,0300)': { 'tag': '(003A,0300)', 'vr': 'SQ', 'vm': '1', 'name': 'MultiplexedAudioChannelsDescriptionCodeSequence' },
+  '(003A,0301)': { 'tag': '(003A,0301)', 'vr': 'IS', 'vm': '1', 'name': 'ChannelIdentificationCode' },
+  '(003A,0302)': { 'tag': '(003A,0302)', 'vr': 'CS', 'vm': '1', 'name': 'ChannelMode' },
+  '(0040,0001)': { 'tag': '(0040,0001)', 'vr': 'AE', 'vm': '1-n', 'name': 'ScheduledStationAETitle' },
+  '(0040,0002)': { 'tag': '(0040,0002)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledProcedureStepStartDate' },
+  '(0040,0003)': { 'tag': '(0040,0003)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledProcedureStepStartTime' },
+  '(0040,0004)': { 'tag': '(0040,0004)', 'vr': 'DA', 'vm': '1', 'name': 'ScheduledProcedureStepEndDate' },
+  '(0040,0005)': { 'tag': '(0040,0005)', 'vr': 'TM', 'vm': '1', 'name': 'ScheduledProcedureStepEndTime' },
+  '(0040,0006)': { 'tag': '(0040,0006)', 'vr': 'PN', 'vm': '1', 'name': 'ScheduledPerformingPhysicianName' },
+  '(0040,0007)': { 'tag': '(0040,0007)', 'vr': 'LO', 'vm': '1', 'name': 'ScheduledProcedureStepDescription' },
+  '(0040,0008)': { 'tag': '(0040,0008)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledProtocolCodeSequence' },
+  '(0040,0009)': { 'tag': '(0040,0009)', 'vr': 'SH', 'vm': '1', 'name': 'ScheduledProcedureStepID' },
+  '(0040,000A)': { 'tag': '(0040,000A)', 'vr': 'SQ', 'vm': '1', 'name': 'StageCodeSequence' },
+  '(0040,000B)': { 'tag': '(0040,000B)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledPerformingPhysicianIdentificationSequence' },
+  '(0040,0010)': { 'tag': '(0040,0010)', 'vr': 'SH', 'vm': '1-n', 'name': 'ScheduledStationName' },
+  '(0040,0011)': { 'tag': '(0040,0011)', 'vr': 'SH', 'vm': '1', 'name': 'ScheduledProcedureStepLocation' },
+  '(0040,0012)': { 'tag': '(0040,0012)', 'vr': 'LO', 'vm': '1', 'name': 'PreMedication' },
+  '(0040,0020)': { 'tag': '(0040,0020)', 'vr': 'CS', 'vm': '1', 'name': 'ScheduledProcedureStepStatus' },
+  '(0040,0026)': { 'tag': '(0040,0026)', 'vr': 'SQ', 'vm': '1', 'name': 'OrderPlacerIdentifierSequence' },
+  '(0040,0027)': { 'tag': '(0040,0027)', 'vr': 'SQ', 'vm': '1', 'name': 'OrderFillerIdentifierSequence' },
+  '(0040,0031)': { 'tag': '(0040,0031)', 'vr': 'UT', 'vm': '1', 'name': 'LocalNamespaceEntityID' },
+  '(0040,0032)': { 'tag': '(0040,0032)', 'vr': 'UT', 'vm': '1', 'name': 'UniversalEntityID' },
+  '(0040,0033)': { 'tag': '(0040,0033)', 'vr': 'CS', 'vm': '1', 'name': 'UniversalEntityIDType' },
+  '(0040,0035)': { 'tag': '(0040,0035)', 'vr': 'CS', 'vm': '1', 'name': 'IdentifierTypeCode' },
+  '(0040,0036)': { 'tag': '(0040,0036)', 'vr': 'SQ', 'vm': '1', 'name': 'AssigningFacilitySequence' },
+  '(0040,0039)': { 'tag': '(0040,0039)', 'vr': 'SQ', 'vm': '1', 'name': 'AssigningJurisdictionCodeSequence' },
+  '(0040,003A)': { 'tag': '(0040,003A)', 'vr': 'SQ', 'vm': '1', 'name': 'AssigningAgencyOrDepartmentCodeSequence' },
+  '(0040,0100)': { 'tag': '(0040,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledProcedureStepSequence' },
+  '(0040,0220)': { 'tag': '(0040,0220)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedNonImageCompositeSOPInstanceSequence' },
+  '(0040,0241)': { 'tag': '(0040,0241)', 'vr': 'AE', 'vm': '1', 'name': 'PerformedStationAETitle' },
+  '(0040,0242)': { 'tag': '(0040,0242)', 'vr': 'SH', 'vm': '1', 'name': 'PerformedStationName' },
+  '(0040,0243)': { 'tag': '(0040,0243)', 'vr': 'SH', 'vm': '1', 'name': 'PerformedLocation' },
+  '(0040,0244)': { 'tag': '(0040,0244)', 'vr': 'DA', 'vm': '1', 'name': 'PerformedProcedureStepStartDate' },
+  '(0040,0245)': { 'tag': '(0040,0245)', 'vr': 'TM', 'vm': '1', 'name': 'PerformedProcedureStepStartTime' },
+  '(0040,0250)': { 'tag': '(0040,0250)', 'vr': 'DA', 'vm': '1', 'name': 'PerformedProcedureStepEndDate' },
+  '(0040,0251)': { 'tag': '(0040,0251)', 'vr': 'TM', 'vm': '1', 'name': 'PerformedProcedureStepEndTime' },
+  '(0040,0252)': { 'tag': '(0040,0252)', 'vr': 'CS', 'vm': '1', 'name': 'PerformedProcedureStepStatus' },
+  '(0040,0253)': { 'tag': '(0040,0253)', 'vr': 'SH', 'vm': '1', 'name': 'PerformedProcedureStepID' },
+  '(0040,0254)': { 'tag': '(0040,0254)', 'vr': 'LO', 'vm': '1', 'name': 'PerformedProcedureStepDescription' },
+  '(0040,0255)': { 'tag': '(0040,0255)', 'vr': 'LO', 'vm': '1', 'name': 'PerformedProcedureTypeDescription' },
+  '(0040,0260)': { 'tag': '(0040,0260)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedProtocolCodeSequence' },
+  '(0040,0261)': { 'tag': '(0040,0261)', 'vr': 'CS', 'vm': '1', 'name': 'PerformedProtocolType' },
+  '(0040,0270)': { 'tag': '(0040,0270)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledStepAttributesSequence' },
+  '(0040,0275)': { 'tag': '(0040,0275)', 'vr': 'SQ', 'vm': '1', 'name': 'RequestAttributesSequence' },
+  '(0040,0280)': { 'tag': '(0040,0280)', 'vr': 'ST', 'vm': '1', 'name': 'CommentsOnThePerformedProcedureStep' },
+  '(0040,0281)': { 'tag': '(0040,0281)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedProcedureStepDiscontinuationReasonCodeSequence' },
+  '(0040,0293)': { 'tag': '(0040,0293)', 'vr': 'SQ', 'vm': '1', 'name': 'QuantitySequence' },
+  '(0040,0294)': { 'tag': '(0040,0294)', 'vr': 'DS', 'vm': '1', 'name': 'Quantity' },
+  '(0040,0295)': { 'tag': '(0040,0295)', 'vr': 'SQ', 'vm': '1', 'name': 'MeasuringUnitsSequence' },
+  '(0040,0296)': { 'tag': '(0040,0296)', 'vr': 'SQ', 'vm': '1', 'name': 'BillingItemSequence' },
+  '(0040,0300)': { 'tag': '(0040,0300)', 'vr': 'US', 'vm': '1', 'name': 'TotalTimeOfFluoroscopy' },
+  '(0040,0301)': { 'tag': '(0040,0301)', 'vr': 'US', 'vm': '1', 'name': 'TotalNumberOfExposures' },
+  '(0040,0302)': { 'tag': '(0040,0302)', 'vr': 'US', 'vm': '1', 'name': 'EntranceDose' },
+  '(0040,0303)': { 'tag': '(0040,0303)', 'vr': 'US', 'vm': '1-2', 'name': 'ExposedArea' },
+  '(0040,0306)': { 'tag': '(0040,0306)', 'vr': 'DS', 'vm': '1', 'name': 'DistanceSourceToEntrance' },
+  '(0040,0307)': { 'tag': '(0040,0307)', 'vr': 'DS', 'vm': '1', 'name': 'DistanceSourceToSupport' },
+  '(0040,030E)': { 'tag': '(0040,030E)', 'vr': 'SQ', 'vm': '1', 'name': 'ExposureDoseSequence' },
+  '(0040,0310)': { 'tag': '(0040,0310)', 'vr': 'ST', 'vm': '1', 'name': 'CommentsOnRadiationDose' },
+  '(0040,0312)': { 'tag': '(0040,0312)', 'vr': 'DS', 'vm': '1', 'name': 'XRayOutput' },
+  '(0040,0314)': { 'tag': '(0040,0314)', 'vr': 'DS', 'vm': '1', 'name': 'HalfValueLayer' },
+  '(0040,0316)': { 'tag': '(0040,0316)', 'vr': 'DS', 'vm': '1', 'name': 'OrganDose' },
+  '(0040,0318)': { 'tag': '(0040,0318)', 'vr': 'CS', 'vm': '1', 'name': 'OrganExposed' },
+  '(0040,0320)': { 'tag': '(0040,0320)', 'vr': 'SQ', 'vm': '1', 'name': 'BillingProcedureStepSequence' },
+  '(0040,0321)': { 'tag': '(0040,0321)', 'vr': 'SQ', 'vm': '1', 'name': 'FilmConsumptionSequence' },
+  '(0040,0324)': { 'tag': '(0040,0324)', 'vr': 'SQ', 'vm': '1', 'name': 'BillingSuppliesAndDevicesSequence' },
+  '(0040,0330)': { 'tag': '(0040,0330)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedProcedureStepSequence' },
+  '(0040,0340)': { 'tag': '(0040,0340)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedSeriesSequence' },
+  '(0040,0400)': { 'tag': '(0040,0400)', 'vr': 'LT', 'vm': '1', 'name': 'CommentsOnTheScheduledProcedureStep' },
+  '(0040,0440)': { 'tag': '(0040,0440)', 'vr': 'SQ', 'vm': '1', 'name': 'ProtocolContextSequence' },
+  '(0040,0441)': { 'tag': '(0040,0441)', 'vr': 'SQ', 'vm': '1', 'name': 'ContentItemModifierSequence' },
+  '(0040,0500)': { 'tag': '(0040,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledSpecimenSequence' },
+  '(0040,050A)': { 'tag': '(0040,050A)', 'vr': 'LO', 'vm': '1', 'name': 'SpecimenAccessionNumber' },
+  '(0040,0512)': { 'tag': '(0040,0512)', 'vr': 'LO', 'vm': '1', 'name': 'ContainerIdentifier' },
+  '(0040,0513)': { 'tag': '(0040,0513)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfTheContainerIdentifierSequence' },
+  '(0040,0515)': { 'tag': '(0040,0515)', 'vr': 'SQ', 'vm': '1', 'name': 'AlternateContainerIdentifierSequence' },
+  '(0040,0518)': { 'tag': '(0040,0518)', 'vr': 'SQ', 'vm': '1', 'name': 'ContainerTypeCodeSequence' },
+  '(0040,051A)': { 'tag': '(0040,051A)', 'vr': 'LO', 'vm': '1', 'name': 'ContainerDescription' },
+  '(0040,0520)': { 'tag': '(0040,0520)', 'vr': 'SQ', 'vm': '1', 'name': 'ContainerComponentSequence' },
+  '(0040,0550)': { 'tag': '(0040,0550)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenSequence' },
+  '(0040,0551)': { 'tag': '(0040,0551)', 'vr': 'LO', 'vm': '1', 'name': 'SpecimenIdentifier' },
+  '(0040,0552)': { 'tag': '(0040,0552)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenDescriptionSequenceTrial' },
+  '(0040,0553)': { 'tag': '(0040,0553)', 'vr': 'ST', 'vm': '1', 'name': 'SpecimenDescriptionTrial' },
+  '(0040,0554)': { 'tag': '(0040,0554)', 'vr': 'UI', 'vm': '1', 'name': 'SpecimenUID' },
+  '(0040,0555)': { 'tag': '(0040,0555)', 'vr': 'SQ', 'vm': '1', 'name': 'AcquisitionContextSequence' },
+  '(0040,0556)': { 'tag': '(0040,0556)', 'vr': 'ST', 'vm': '1', 'name': 'AcquisitionContextDescription' },
+  '(0040,0560)': { 'tag': '(0040,0560)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenDescriptionSequence' },
+  '(0040,0562)': { 'tag': '(0040,0562)', 'vr': 'SQ', 'vm': '1', 'name': 'IssuerOfTheSpecimenIdentifierSequence' },
+  '(0040,059A)': { 'tag': '(0040,059A)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenTypeCodeSequence' },
+  '(0040,0600)': { 'tag': '(0040,0600)', 'vr': 'LO', 'vm': '1', 'name': 'SpecimenShortDescription' },
+  '(0040,0602)': { 'tag': '(0040,0602)', 'vr': 'UT', 'vm': '1', 'name': 'SpecimenDetailedDescription' },
+  '(0040,0610)': { 'tag': '(0040,0610)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenPreparationSequence' },
+  '(0040,0612)': { 'tag': '(0040,0612)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenPreparationStepContentItemSequence' },
+  '(0040,0620)': { 'tag': '(0040,0620)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenLocalizationContentItemSequence' },
+  '(0040,06FA)': { 'tag': '(0040,06FA)', 'vr': 'LO', 'vm': '1', 'name': 'SlideIdentifier' },
+  '(0040,071A)': { 'tag': '(0040,071A)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageCenterPointCoordinatesSequence' },
+  '(0040,072A)': { 'tag': '(0040,072A)', 'vr': 'DS', 'vm': '1', 'name': 'XOffsetInSlideCoordinateSystem' },
+  '(0040,073A)': { 'tag': '(0040,073A)', 'vr': 'DS', 'vm': '1', 'name': 'YOffsetInSlideCoordinateSystem' },
+  '(0040,074A)': { 'tag': '(0040,074A)', 'vr': 'DS', 'vm': '1', 'name': 'ZOffsetInSlideCoordinateSystem' },
+  '(0040,08D8)': { 'tag': '(0040,08D8)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelSpacingSequence' },
+  '(0040,08DA)': { 'tag': '(0040,08DA)', 'vr': 'SQ', 'vm': '1', 'name': 'CoordinateSystemAxisCodeSequence' },
+  '(0040,08EA)': { 'tag': '(0040,08EA)', 'vr': 'SQ', 'vm': '1', 'name': 'MeasurementUnitsCodeSequence' },
+  '(0040,09F8)': { 'tag': '(0040,09F8)', 'vr': 'SQ', 'vm': '1', 'name': 'VitalStainCodeSequenceTrial' },
+  '(0040,1001)': { 'tag': '(0040,1001)', 'vr': 'SH', 'vm': '1', 'name': 'RequestedProcedureID' },
+  '(0040,1002)': { 'tag': '(0040,1002)', 'vr': 'LO', 'vm': '1', 'name': 'ReasonForTheRequestedProcedure' },
+  '(0040,1003)': { 'tag': '(0040,1003)', 'vr': 'SH', 'vm': '1', 'name': 'RequestedProcedurePriority' },
+  '(0040,1004)': { 'tag': '(0040,1004)', 'vr': 'LO', 'vm': '1', 'name': 'PatientTransportArrangements' },
+  '(0040,1005)': { 'tag': '(0040,1005)', 'vr': 'LO', 'vm': '1', 'name': 'RequestedProcedureLocation' },
+  '(0040,1006)': { 'tag': '(0040,1006)', 'vr': 'SH', 'vm': '1', 'name': 'PlacerOrderNumberProcedure' },
+  '(0040,1007)': { 'tag': '(0040,1007)', 'vr': 'SH', 'vm': '1', 'name': 'FillerOrderNumberProcedure' },
+  '(0040,1008)': { 'tag': '(0040,1008)', 'vr': 'LO', 'vm': '1', 'name': 'ConfidentialityCode' },
+  '(0040,1009)': { 'tag': '(0040,1009)', 'vr': 'SH', 'vm': '1', 'name': 'ReportingPriority' },
+  '(0040,100A)': { 'tag': '(0040,100A)', 'vr': 'SQ', 'vm': '1', 'name': 'ReasonForRequestedProcedureCodeSequence' },
+  '(0040,1010)': { 'tag': '(0040,1010)', 'vr': 'PN', 'vm': '1-n', 'name': 'NamesOfIntendedRecipientsOfResults' },
+  '(0040,1011)': { 'tag': '(0040,1011)', 'vr': 'SQ', 'vm': '1', 'name': 'IntendedRecipientsOfResultsIdentificationSequence' },
+  '(0040,1012)': { 'tag': '(0040,1012)', 'vr': 'SQ', 'vm': '1', 'name': 'ReasonForPerformedProcedureCodeSequence' },
+  '(0040,1060)': { 'tag': '(0040,1060)', 'vr': 'LO', 'vm': '1', 'name': 'RequestedProcedureDescriptionTrial' },
+  '(0040,1101)': { 'tag': '(0040,1101)', 'vr': 'SQ', 'vm': '1', 'name': 'PersonIdentificationCodeSequence' },
+  '(0040,1102)': { 'tag': '(0040,1102)', 'vr': 'ST', 'vm': '1', 'name': 'PersonAddress' },
+  '(0040,1103)': { 'tag': '(0040,1103)', 'vr': 'LO', 'vm': '1-n', 'name': 'PersonTelephoneNumbers' },
+  '(0040,1400)': { 'tag': '(0040,1400)', 'vr': 'LT', 'vm': '1', 'name': 'RequestedProcedureComments' },
+  '(0040,2001)': { 'tag': '(0040,2001)', 'vr': 'LO', 'vm': '1', 'name': 'ReasonForTheImagingServiceRequest' },
+  '(0040,2004)': { 'tag': '(0040,2004)', 'vr': 'DA', 'vm': '1', 'name': 'IssueDateOfImagingServiceRequest' },
+  '(0040,2005)': { 'tag': '(0040,2005)', 'vr': 'TM', 'vm': '1', 'name': 'IssueTimeOfImagingServiceRequest' },
+  '(0040,2006)': { 'tag': '(0040,2006)', 'vr': 'SH', 'vm': '1', 'name': 'PlacerOrderNumberImagingServiceRequestRetired' },
+  '(0040,2007)': { 'tag': '(0040,2007)', 'vr': 'SH', 'vm': '1', 'name': 'FillerOrderNumberImagingServiceRequestRetired' },
+  '(0040,2008)': { 'tag': '(0040,2008)', 'vr': 'PN', 'vm': '1', 'name': 'OrderEnteredBy' },
+  '(0040,2009)': { 'tag': '(0040,2009)', 'vr': 'SH', 'vm': '1', 'name': 'OrderEntererLocation' },
+  '(0040,2010)': { 'tag': '(0040,2010)', 'vr': 'SH', 'vm': '1', 'name': 'OrderCallbackPhoneNumber' },
+  '(0040,2016)': { 'tag': '(0040,2016)', 'vr': 'LO', 'vm': '1', 'name': 'PlacerOrderNumberImagingServiceRequest' },
+  '(0040,2017)': { 'tag': '(0040,2017)', 'vr': 'LO', 'vm': '1', 'name': 'FillerOrderNumberImagingServiceRequest' },
+  '(0040,2400)': { 'tag': '(0040,2400)', 'vr': 'LT', 'vm': '1', 'name': 'ImagingServiceRequestComments' },
+  '(0040,3001)': { 'tag': '(0040,3001)', 'vr': 'LO', 'vm': '1', 'name': 'ConfidentialityConstraintOnPatientDataDescription' },
+  '(0040,4001)': { 'tag': '(0040,4001)', 'vr': 'CS', 'vm': '1', 'name': 'GeneralPurposeScheduledProcedureStepStatus' },
+  '(0040,4002)': { 'tag': '(0040,4002)', 'vr': 'CS', 'vm': '1', 'name': 'GeneralPurposePerformedProcedureStepStatus' },
+  '(0040,4003)': { 'tag': '(0040,4003)', 'vr': 'CS', 'vm': '1', 'name': 'GeneralPurposeScheduledProcedureStepPriority' },
+  '(0040,4004)': { 'tag': '(0040,4004)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledProcessingApplicationsCodeSequence' },
+  '(0040,4005)': { 'tag': '(0040,4005)', 'vr': 'DT', 'vm': '1', 'name': 'ScheduledProcedureStepStartDateTime' },
+  '(0040,4006)': { 'tag': '(0040,4006)', 'vr': 'CS', 'vm': '1', 'name': 'MultipleCopiesFlag' },
+  '(0040,4007)': { 'tag': '(0040,4007)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedProcessingApplicationsCodeSequence' },
+  '(0040,4009)': { 'tag': '(0040,4009)', 'vr': 'SQ', 'vm': '1', 'name': 'HumanPerformerCodeSequence' },
+  '(0040,4010)': { 'tag': '(0040,4010)', 'vr': 'DT', 'vm': '1', 'name': 'ScheduledProcedureStepModificationDateTime' },
+  '(0040,4011)': { 'tag': '(0040,4011)', 'vr': 'DT', 'vm': '1', 'name': 'ExpectedCompletionDateTime' },
+  '(0040,4015)': { 'tag': '(0040,4015)', 'vr': 'SQ', 'vm': '1', 'name': 'ResultingGeneralPurposePerformedProcedureStepsSequence' },
+  '(0040,4016)': { 'tag': '(0040,4016)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedGeneralPurposeScheduledProcedureStepSequence' },
+  '(0040,4018)': { 'tag': '(0040,4018)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledWorkitemCodeSequence' },
+  '(0040,4019)': { 'tag': '(0040,4019)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedWorkitemCodeSequence' },
+  '(0040,4020)': { 'tag': '(0040,4020)', 'vr': 'CS', 'vm': '1', 'name': 'InputAvailabilityFlag' },
+  '(0040,4021)': { 'tag': '(0040,4021)', 'vr': 'SQ', 'vm': '1', 'name': 'InputInformationSequence' },
+  '(0040,4022)': { 'tag': '(0040,4022)', 'vr': 'SQ', 'vm': '1', 'name': 'RelevantInformationSequence' },
+  '(0040,4023)': { 'tag': '(0040,4023)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedGeneralPurposeScheduledProcedureStepTransactionUID' },
+  '(0040,4025)': { 'tag': '(0040,4025)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledStationNameCodeSequence' },
+  '(0040,4026)': { 'tag': '(0040,4026)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledStationClassCodeSequence' },
+  '(0040,4027)': { 'tag': '(0040,4027)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledStationGeographicLocationCodeSequence' },
+  '(0040,4028)': { 'tag': '(0040,4028)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedStationNameCodeSequence' },
+  '(0040,4029)': { 'tag': '(0040,4029)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedStationClassCodeSequence' },
+  '(0040,4030)': { 'tag': '(0040,4030)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedStationGeographicLocationCodeSequence' },
+  '(0040,4031)': { 'tag': '(0040,4031)', 'vr': 'SQ', 'vm': '1', 'name': 'RequestedSubsequentWorkitemCodeSequence' },
+  '(0040,4032)': { 'tag': '(0040,4032)', 'vr': 'SQ', 'vm': '1', 'name': 'NonDICOMOutputCodeSequence' },
+  '(0040,4033)': { 'tag': '(0040,4033)', 'vr': 'SQ', 'vm': '1', 'name': 'OutputInformationSequence' },
+  '(0040,4034)': { 'tag': '(0040,4034)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledHumanPerformersSequence' },
+  '(0040,4035)': { 'tag': '(0040,4035)', 'vr': 'SQ', 'vm': '1', 'name': 'ActualHumanPerformersSequence' },
+  '(0040,4036)': { 'tag': '(0040,4036)', 'vr': 'LO', 'vm': '1', 'name': 'HumanPerformerOrganization' },
+  '(0040,4037)': { 'tag': '(0040,4037)', 'vr': 'PN', 'vm': '1', 'name': 'HumanPerformerName' },
+  '(0040,4040)': { 'tag': '(0040,4040)', 'vr': 'CS', 'vm': '1', 'name': 'RawDataHandling' },
+  '(0040,4041)': { 'tag': '(0040,4041)', 'vr': 'CS', 'vm': '1', 'name': 'InputReadinessState' },
+  '(0040,4050)': { 'tag': '(0040,4050)', 'vr': 'DT', 'vm': '1', 'name': 'PerformedProcedureStepStartDateTime' },
+  '(0040,4051)': { 'tag': '(0040,4051)', 'vr': 'DT', 'vm': '1', 'name': 'PerformedProcedureStepEndDateTime' },
+  '(0040,4052)': { 'tag': '(0040,4052)', 'vr': 'DT', 'vm': '1', 'name': 'ProcedureStepCancellationDateTime' },
+  '(0040,8302)': { 'tag': '(0040,8302)', 'vr': 'DS', 'vm': '1', 'name': 'EntranceDoseInmGy' },
+  '(0040,9094)': { 'tag': '(0040,9094)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageRealWorldValueMappingSequence' },
+  '(0040,9096)': { 'tag': '(0040,9096)', 'vr': 'SQ', 'vm': '1', 'name': 'RealWorldValueMappingSequence' },
+  '(0040,9098)': { 'tag': '(0040,9098)', 'vr': 'SQ', 'vm': '1', 'name': 'PixelValueMappingCodeSequence' },
+  '(0040,9210)': { 'tag': '(0040,9210)', 'vr': 'SH', 'vm': '1', 'name': 'LUTLabel' },
+  '(0040,9211)': { 'tag': '(0040,9211)', 'vr': 'US|SS', 'vm': '1', 'name': 'RealWorldValueLastValueMapped' },
+  '(0040,9212)': { 'tag': '(0040,9212)', 'vr': 'FD', 'vm': '1-n', 'name': 'RealWorldValueLUTData' },
+  '(0040,9216)': { 'tag': '(0040,9216)', 'vr': 'US|SS', 'vm': '1', 'name': 'RealWorldValueFirstValueMapped' },
+  '(0040,9224)': { 'tag': '(0040,9224)', 'vr': 'FD', 'vm': '1', 'name': 'RealWorldValueIntercept' },
+  '(0040,9225)': { 'tag': '(0040,9225)', 'vr': 'FD', 'vm': '1', 'name': 'RealWorldValueSlope' },
+  '(0040,A007)': { 'tag': '(0040,A007)', 'vr': 'CS', 'vm': '1', 'name': 'FindingsFlagTrial' },
+  '(0040,A010)': { 'tag': '(0040,A010)', 'vr': 'CS', 'vm': '1', 'name': 'RelationshipType' },
+  '(0040,A020)': { 'tag': '(0040,A020)', 'vr': 'SQ', 'vm': '1', 'name': 'FindingsSequenceTrial' },
+  '(0040,A021)': { 'tag': '(0040,A021)', 'vr': 'UI', 'vm': '1', 'name': 'FindingsGroupUIDTrial' },
+  '(0040,A022)': { 'tag': '(0040,A022)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedFindingsGroupUIDTrial' },
+  '(0040,A023)': { 'tag': '(0040,A023)', 'vr': 'DA', 'vm': '1', 'name': 'FindingsGroupRecordingDateTrial' },
+  '(0040,A024)': { 'tag': '(0040,A024)', 'vr': 'TM', 'vm': '1', 'name': 'FindingsGroupRecordingTimeTrial' },
+  '(0040,A026)': { 'tag': '(0040,A026)', 'vr': 'SQ', 'vm': '1', 'name': 'FindingsSourceCategoryCodeSequenceTrial' },
+  '(0040,A027)': { 'tag': '(0040,A027)', 'vr': 'LO', 'vm': '1', 'name': 'VerifyingOrganization' },
+  '(0040,A028)': { 'tag': '(0040,A028)', 'vr': 'SQ', 'vm': '1', 'name': 'DocumentingOrganizationIdentifierCodeSequenceTrial' },
+  '(0040,A030)': { 'tag': '(0040,A030)', 'vr': 'DT', 'vm': '1', 'name': 'VerificationDateTime' },
+  '(0040,A032)': { 'tag': '(0040,A032)', 'vr': 'DT', 'vm': '1', 'name': 'ObservationDateTime' },
+  '(0040,A040)': { 'tag': '(0040,A040)', 'vr': 'CS', 'vm': '1', 'name': 'ValueType' },
+  '(0040,A043)': { 'tag': '(0040,A043)', 'vr': 'SQ', 'vm': '1', 'name': 'ConceptNameCodeSequence' },
+  '(0040,A047)': { 'tag': '(0040,A047)', 'vr': 'LO', 'vm': '1', 'name': 'MeasurementPrecisionDescriptionTrial' },
+  '(0040,A050)': { 'tag': '(0040,A050)', 'vr': 'CS', 'vm': '1', 'name': 'ContinuityOfContent' },
+  '(0040,A057)': { 'tag': '(0040,A057)', 'vr': 'CS', 'vm': '1-n', 'name': 'UrgencyOrPriorityAlertsTrial' },
+  '(0040,A060)': { 'tag': '(0040,A060)', 'vr': 'LO', 'vm': '1', 'name': 'SequencingIndicatorTrial' },
+  '(0040,A066)': { 'tag': '(0040,A066)', 'vr': 'SQ', 'vm': '1', 'name': 'DocumentIdentifierCodeSequenceTrial' },
+  '(0040,A067)': { 'tag': '(0040,A067)', 'vr': 'PN', 'vm': '1', 'name': 'DocumentAuthorTrial' },
+  '(0040,A068)': { 'tag': '(0040,A068)', 'vr': 'SQ', 'vm': '1', 'name': 'DocumentAuthorIdentifierCodeSequenceTrial' },
+  '(0040,A070)': { 'tag': '(0040,A070)', 'vr': 'SQ', 'vm': '1', 'name': 'IdentifierCodeSequenceTrial' },
+  '(0040,A073)': { 'tag': '(0040,A073)', 'vr': 'SQ', 'vm': '1', 'name': 'VerifyingObserverSequence' },
+  '(0040,A074)': { 'tag': '(0040,A074)', 'vr': 'OB', 'vm': '1', 'name': 'ObjectBinaryIdentifierTrial' },
+  '(0040,A075)': { 'tag': '(0040,A075)', 'vr': 'PN', 'vm': '1', 'name': 'VerifyingObserverName' },
+  '(0040,A076)': { 'tag': '(0040,A076)', 'vr': 'SQ', 'vm': '1', 'name': 'DocumentingObserverIdentifierCodeSequenceTrial' },
+  '(0040,A078)': { 'tag': '(0040,A078)', 'vr': 'SQ', 'vm': '1', 'name': 'AuthorObserverSequence' },
+  '(0040,A07A)': { 'tag': '(0040,A07A)', 'vr': 'SQ', 'vm': '1', 'name': 'ParticipantSequence' },
+  '(0040,A07C)': { 'tag': '(0040,A07C)', 'vr': 'SQ', 'vm': '1', 'name': 'CustodialOrganizationSequence' },
+  '(0040,A080)': { 'tag': '(0040,A080)', 'vr': 'CS', 'vm': '1', 'name': 'ParticipationType' },
+  '(0040,A082)': { 'tag': '(0040,A082)', 'vr': 'DT', 'vm': '1', 'name': 'ParticipationDateTime' },
+  '(0040,A084)': { 'tag': '(0040,A084)', 'vr': 'CS', 'vm': '1', 'name': 'ObserverType' },
+  '(0040,A085)': { 'tag': '(0040,A085)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureIdentifierCodeSequenceTrial' },
+  '(0040,A088)': { 'tag': '(0040,A088)', 'vr': 'SQ', 'vm': '1', 'name': 'VerifyingObserverIdentificationCodeSequence' },
+  '(0040,A089)': { 'tag': '(0040,A089)', 'vr': 'OB', 'vm': '1', 'name': 'ObjectDirectoryBinaryIdentifierTrial' },
+  '(0040,A090)': { 'tag': '(0040,A090)', 'vr': 'SQ', 'vm': '1', 'name': 'EquivalentCDADocumentSequence' },
+  '(0040,A0B0)': { 'tag': '(0040,A0B0)', 'vr': 'US', 'vm': '2-2n', 'name': 'ReferencedWaveformChannels' },
+  '(0040,A110)': { 'tag': '(0040,A110)', 'vr': 'DA', 'vm': '1', 'name': 'DateOfDocumentOrVerbalTransactionTrial' },
+  '(0040,A112)': { 'tag': '(0040,A112)', 'vr': 'TM', 'vm': '1', 'name': 'TimeOfDocumentCreationOrVerbalTransactionTrial' },
+  '(0040,A120)': { 'tag': '(0040,A120)', 'vr': 'DT', 'vm': '1', 'name': 'DateTime' },
+  '(0040,A121)': { 'tag': '(0040,A121)', 'vr': 'DA', 'vm': '1', 'name': 'Date' },
+  '(0040,A122)': { 'tag': '(0040,A122)', 'vr': 'TM', 'vm': '1', 'name': 'Time' },
+  '(0040,A123)': { 'tag': '(0040,A123)', 'vr': 'PN', 'vm': '1', 'name': 'PersonName' },
+  '(0040,A124)': { 'tag': '(0040,A124)', 'vr': 'UI', 'vm': '1', 'name': 'UID' },
+  '(0040,A125)': { 'tag': '(0040,A125)', 'vr': 'CS', 'vm': '2', 'name': 'ReportStatusIDTrial' },
+  '(0040,A130)': { 'tag': '(0040,A130)', 'vr': 'CS', 'vm': '1', 'name': 'TemporalRangeType' },
+  '(0040,A132)': { 'tag': '(0040,A132)', 'vr': 'UL', 'vm': '1-n', 'name': 'ReferencedSamplePositions' },
+  '(0040,A136)': { 'tag': '(0040,A136)', 'vr': 'US', 'vm': '1-n', 'name': 'ReferencedFrameNumbers' },
+  '(0040,A138)': { 'tag': '(0040,A138)', 'vr': 'DS', 'vm': '1-n', 'name': 'ReferencedTimeOffsets' },
+  '(0040,A13A)': { 'tag': '(0040,A13A)', 'vr': 'DT', 'vm': '1-n', 'name': 'ReferencedDateTime' },
+  '(0040,A160)': { 'tag': '(0040,A160)', 'vr': 'UT', 'vm': '1', 'name': 'TextValue' },
+  '(0040,A167)': { 'tag': '(0040,A167)', 'vr': 'SQ', 'vm': '1', 'name': 'ObservationCategoryCodeSequenceTrial' },
+  '(0040,A168)': { 'tag': '(0040,A168)', 'vr': 'SQ', 'vm': '1', 'name': 'ConceptCodeSequence' },
+  '(0040,A16A)': { 'tag': '(0040,A16A)', 'vr': 'ST', 'vm': '1', 'name': 'BibliographicCitationTrial' },
+  '(0040,A170)': { 'tag': '(0040,A170)', 'vr': 'SQ', 'vm': '1', 'name': 'PurposeOfReferenceCodeSequence' },
+  '(0040,A171)': { 'tag': '(0040,A171)', 'vr': 'UI', 'vm': '1', 'name': 'ObservationUIDTrial' },
+  '(0040,A172)': { 'tag': '(0040,A172)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedObservationUIDTrial' },
+  '(0040,A173)': { 'tag': '(0040,A173)', 'vr': 'CS', 'vm': '1', 'name': 'ReferencedObservationClassTrial' },
+  '(0040,A174)': { 'tag': '(0040,A174)', 'vr': 'CS', 'vm': '1', 'name': 'ReferencedObjectObservationClassTrial' },
+  '(0040,A180)': { 'tag': '(0040,A180)', 'vr': 'US', 'vm': '1', 'name': 'AnnotationGroupNumber' },
+  '(0040,A192)': { 'tag': '(0040,A192)', 'vr': 'DA', 'vm': '1', 'name': 'ObservationDateTrial' },
+  '(0040,A193)': { 'tag': '(0040,A193)', 'vr': 'TM', 'vm': '1', 'name': 'ObservationTimeTrial' },
+  '(0040,A194)': { 'tag': '(0040,A194)', 'vr': 'CS', 'vm': '1', 'name': 'MeasurementAutomationTrial' },
+  '(0040,A195)': { 'tag': '(0040,A195)', 'vr': 'SQ', 'vm': '1', 'name': 'ModifierCodeSequence' },
+  '(0040,A224)': { 'tag': '(0040,A224)', 'vr': 'ST', 'vm': '1', 'name': 'IdentificationDescriptionTrial' },
+  '(0040,A290)': { 'tag': '(0040,A290)', 'vr': 'CS', 'vm': '1', 'name': 'CoordinatesSetGeometricTypeTrial' },
+  '(0040,A296)': { 'tag': '(0040,A296)', 'vr': 'SQ', 'vm': '1', 'name': 'AlgorithmCodeSequenceTrial' },
+  '(0040,A297)': { 'tag': '(0040,A297)', 'vr': 'ST', 'vm': '1', 'name': 'AlgorithmDescriptionTrial' },
+  '(0040,A29A)': { 'tag': '(0040,A29A)', 'vr': 'SL', 'vm': '2-2n', 'name': 'PixelCoordinatesSetTrial' },
+  '(0040,A300)': { 'tag': '(0040,A300)', 'vr': 'SQ', 'vm': '1', 'name': 'MeasuredValueSequence' },
+  '(0040,A301)': { 'tag': '(0040,A301)', 'vr': 'SQ', 'vm': '1', 'name': 'NumericValueQualifierCodeSequence' },
+  '(0040,A307)': { 'tag': '(0040,A307)', 'vr': 'PN', 'vm': '1', 'name': 'CurrentObserverTrial' },
+  '(0040,A30A)': { 'tag': '(0040,A30A)', 'vr': 'DS', 'vm': '1-n', 'name': 'NumericValue' },
+  '(0040,A313)': { 'tag': '(0040,A313)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedAccessionSequenceTrial' },
+  '(0040,A33A)': { 'tag': '(0040,A33A)', 'vr': 'ST', 'vm': '1', 'name': 'ReportStatusCommentTrial' },
+  '(0040,A340)': { 'tag': '(0040,A340)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureContextSequenceTrial' },
+  '(0040,A352)': { 'tag': '(0040,A352)', 'vr': 'PN', 'vm': '1', 'name': 'VerbalSourceTrial' },
+  '(0040,A353)': { 'tag': '(0040,A353)', 'vr': 'ST', 'vm': '1', 'name': 'AddressTrial' },
+  '(0040,A354)': { 'tag': '(0040,A354)', 'vr': 'LO', 'vm': '1', 'name': 'TelephoneNumberTrial' },
+  '(0040,A358)': { 'tag': '(0040,A358)', 'vr': 'SQ', 'vm': '1', 'name': 'VerbalSourceIdentifierCodeSequenceTrial' },
+  '(0040,A360)': { 'tag': '(0040,A360)', 'vr': 'SQ', 'vm': '1', 'name': 'PredecessorDocumentsSequence' },
+  '(0040,A370)': { 'tag': '(0040,A370)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedRequestSequence' },
+  '(0040,A372)': { 'tag': '(0040,A372)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedProcedureCodeSequence' },
+  '(0040,A375)': { 'tag': '(0040,A375)', 'vr': 'SQ', 'vm': '1', 'name': 'CurrentRequestedProcedureEvidenceSequence' },
+  '(0040,A380)': { 'tag': '(0040,A380)', 'vr': 'SQ', 'vm': '1', 'name': 'ReportDetailSequenceTrial' },
+  '(0040,A385)': { 'tag': '(0040,A385)', 'vr': 'SQ', 'vm': '1', 'name': 'PertinentOtherEvidenceSequence' },
+  '(0040,A390)': { 'tag': '(0040,A390)', 'vr': 'SQ', 'vm': '1', 'name': 'HL7StructuredDocumentReferenceSequence' },
+  '(0040,A402)': { 'tag': '(0040,A402)', 'vr': 'UI', 'vm': '1', 'name': 'ObservationSubjectUIDTrial' },
+  '(0040,A403)': { 'tag': '(0040,A403)', 'vr': 'CS', 'vm': '1', 'name': 'ObservationSubjectClassTrial' },
+  '(0040,A404)': { 'tag': '(0040,A404)', 'vr': 'SQ', 'vm': '1', 'name': 'ObservationSubjectTypeCodeSequenceTrial' },
+  '(0040,A491)': { 'tag': '(0040,A491)', 'vr': 'CS', 'vm': '1', 'name': 'CompletionFlag' },
+  '(0040,A492)': { 'tag': '(0040,A492)', 'vr': 'LO', 'vm': '1', 'name': 'CompletionFlagDescription' },
+  '(0040,A493)': { 'tag': '(0040,A493)', 'vr': 'CS', 'vm': '1', 'name': 'VerificationFlag' },
+  '(0040,A494)': { 'tag': '(0040,A494)', 'vr': 'CS', 'vm': '1', 'name': 'ArchiveRequested' },
+  '(0040,A496)': { 'tag': '(0040,A496)', 'vr': 'CS', 'vm': '1', 'name': 'PreliminaryFlag' },
+  '(0040,A504)': { 'tag': '(0040,A504)', 'vr': 'SQ', 'vm': '1', 'name': 'ContentTemplateSequence' },
+  '(0040,A525)': { 'tag': '(0040,A525)', 'vr': 'SQ', 'vm': '1', 'name': 'IdenticalDocumentsSequence' },
+  '(0040,A600)': { 'tag': '(0040,A600)', 'vr': 'CS', 'vm': '1', 'name': 'ObservationSubjectContextFlagTrial' },
+  '(0040,A601)': { 'tag': '(0040,A601)', 'vr': 'CS', 'vm': '1', 'name': 'ObserverContextFlagTrial' },
+  '(0040,A603)': { 'tag': '(0040,A603)', 'vr': 'CS', 'vm': '1', 'name': 'ProcedureContextFlagTrial' },
+  '(0040,A730)': { 'tag': '(0040,A730)', 'vr': 'SQ', 'vm': '1', 'name': 'ContentSequence' },
+  '(0040,A731)': { 'tag': '(0040,A731)', 'vr': 'SQ', 'vm': '1', 'name': 'RelationshipSequenceTrial' },
+  '(0040,A732)': { 'tag': '(0040,A732)', 'vr': 'SQ', 'vm': '1', 'name': 'RelationshipTypeCodeSequenceTrial' },
+  '(0040,A744)': { 'tag': '(0040,A744)', 'vr': 'SQ', 'vm': '1', 'name': 'LanguageCodeSequenceTrial' },
+  '(0040,A992)': { 'tag': '(0040,A992)', 'vr': 'ST', 'vm': '1', 'name': 'UniformResourceLocatorTrial' },
+  '(0040,B020)': { 'tag': '(0040,B020)', 'vr': 'SQ', 'vm': '1', 'name': 'WaveformAnnotationSequence' },
+  '(0040,DB00)': { 'tag': '(0040,DB00)', 'vr': 'CS', 'vm': '1', 'name': 'TemplateIdentifier' },
+  '(0040,DB06)': { 'tag': '(0040,DB06)', 'vr': 'DT', 'vm': '1', 'name': 'TemplateVersion' },
+  '(0040,DB07)': { 'tag': '(0040,DB07)', 'vr': 'DT', 'vm': '1', 'name': 'TemplateLocalVersion' },
+  '(0040,DB0B)': { 'tag': '(0040,DB0B)', 'vr': 'CS', 'vm': '1', 'name': 'TemplateExtensionFlag' },
+  '(0040,DB0C)': { 'tag': '(0040,DB0C)', 'vr': 'UI', 'vm': '1', 'name': 'TemplateExtensionOrganizationUID' },
+  '(0040,DB0D)': { 'tag': '(0040,DB0D)', 'vr': 'UI', 'vm': '1', 'name': 'TemplateExtensionCreatorUID' },
+  '(0040,DB73)': { 'tag': '(0040,DB73)', 'vr': 'UL', 'vm': '1-n', 'name': 'ReferencedContentItemIdentifier' },
+  '(0040,E001)': { 'tag': '(0040,E001)', 'vr': 'ST', 'vm': '1', 'name': 'HL7InstanceIdentifier' },
+  '(0040,E004)': { 'tag': '(0040,E004)', 'vr': 'DT', 'vm': '1', 'name': 'HL7DocumentEffectiveTime' },
+  '(0040,E006)': { 'tag': '(0040,E006)', 'vr': 'SQ', 'vm': '1', 'name': 'HL7DocumentTypeCodeSequence' },
+  '(0040,E008)': { 'tag': '(0040,E008)', 'vr': 'SQ', 'vm': '1', 'name': 'DocumentClassCodeSequence' },
+  '(0040,E010)': { 'tag': '(0040,E010)', 'vr': 'UT', 'vm': '1', 'name': 'RetrieveURI' },
+  '(0040,E011)': { 'tag': '(0040,E011)', 'vr': 'UI', 'vm': '1', 'name': 'RetrieveLocationUID' },
+  '(0040,E020)': { 'tag': '(0040,E020)', 'vr': 'CS', 'vm': '1', 'name': 'TypeOfInstances' },
+  '(0040,E021)': { 'tag': '(0040,E021)', 'vr': 'SQ', 'vm': '1', 'name': 'DICOMRetrievalSequence' },
+  '(0040,E022)': { 'tag': '(0040,E022)', 'vr': 'SQ', 'vm': '1', 'name': 'DICOMMediaRetrievalSequence' },
+  '(0040,E023)': { 'tag': '(0040,E023)', 'vr': 'SQ', 'vm': '1', 'name': 'WADORetrievalSequence' },
+  '(0040,E024)': { 'tag': '(0040,E024)', 'vr': 'SQ', 'vm': '1', 'name': 'XDSRetrievalSequence' },
+  '(0040,E030)': { 'tag': '(0040,E030)', 'vr': 'UI', 'vm': '1', 'name': 'RepositoryUniqueID' },
+  '(0040,E031)': { 'tag': '(0040,E031)', 'vr': 'UI', 'vm': '1', 'name': 'HomeCommunityID' },
+  '(0042,0010)': { 'tag': '(0042,0010)', 'vr': 'ST', 'vm': '1', 'name': 'DocumentTitle' },
+  '(0042,0011)': { 'tag': '(0042,0011)', 'vr': 'OB', 'vm': '1', 'name': 'EncapsulatedDocument' },
+  '(0042,0012)': { 'tag': '(0042,0012)', 'vr': 'LO', 'vm': '1', 'name': 'MIMETypeOfEncapsulatedDocument' },
+  '(0042,0013)': { 'tag': '(0042,0013)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceInstanceSequence' },
+  '(0042,0014)': { 'tag': '(0042,0014)', 'vr': 'LO', 'vm': '1-n', 'name': 'ListOfMIMETypes' },
+  '(0044,0001)': { 'tag': '(0044,0001)', 'vr': 'ST', 'vm': '1', 'name': 'ProductPackageIdentifier' },
+  '(0044,0002)': { 'tag': '(0044,0002)', 'vr': 'CS', 'vm': '1', 'name': 'SubstanceAdministrationApproval' },
+  '(0044,0003)': { 'tag': '(0044,0003)', 'vr': 'LT', 'vm': '1', 'name': 'ApprovalStatusFurtherDescription' },
+  '(0044,0004)': { 'tag': '(0044,0004)', 'vr': 'DT', 'vm': '1', 'name': 'ApprovalStatusDateTime' },
+  '(0044,0007)': { 'tag': '(0044,0007)', 'vr': 'SQ', 'vm': '1', 'name': 'ProductTypeCodeSequence' },
+  '(0044,0008)': { 'tag': '(0044,0008)', 'vr': 'LO', 'vm': '1-n', 'name': 'ProductName' },
+  '(0044,0009)': { 'tag': '(0044,0009)', 'vr': 'LT', 'vm': '1', 'name': 'ProductDescription' },
+  '(0044,000A)': { 'tag': '(0044,000A)', 'vr': 'LO', 'vm': '1', 'name': 'ProductLotIdentifier' },
+  '(0044,000B)': { 'tag': '(0044,000B)', 'vr': 'DT', 'vm': '1', 'name': 'ProductExpirationDateTime' },
+  '(0044,0010)': { 'tag': '(0044,0010)', 'vr': 'DT', 'vm': '1', 'name': 'SubstanceAdministrationDateTime' },
+  '(0044,0011)': { 'tag': '(0044,0011)', 'vr': 'LO', 'vm': '1', 'name': 'SubstanceAdministrationNotes' },
+  '(0044,0012)': { 'tag': '(0044,0012)', 'vr': 'LO', 'vm': '1', 'name': 'SubstanceAdministrationDeviceID' },
+  '(0044,0013)': { 'tag': '(0044,0013)', 'vr': 'SQ', 'vm': '1', 'name': 'ProductParameterSequence' },
+  '(0044,0019)': { 'tag': '(0044,0019)', 'vr': 'SQ', 'vm': '1', 'name': 'SubstanceAdministrationParameterSequence' },
+  '(0046,0012)': { 'tag': '(0046,0012)', 'vr': 'LO', 'vm': '1', 'name': 'LensDescription' },
+  '(0046,0014)': { 'tag': '(0046,0014)', 'vr': 'SQ', 'vm': '1', 'name': 'RightLensSequence' },
+  '(0046,0015)': { 'tag': '(0046,0015)', 'vr': 'SQ', 'vm': '1', 'name': 'LeftLensSequence' },
+  '(0046,0016)': { 'tag': '(0046,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'UnspecifiedLateralityLensSequence' },
+  '(0046,0018)': { 'tag': '(0046,0018)', 'vr': 'SQ', 'vm': '1', 'name': 'CylinderSequence' },
+  '(0046,0028)': { 'tag': '(0046,0028)', 'vr': 'SQ', 'vm': '1', 'name': 'PrismSequence' },
+  '(0046,0030)': { 'tag': '(0046,0030)', 'vr': 'FD', 'vm': '1', 'name': 'HorizontalPrismPower' },
+  '(0046,0032)': { 'tag': '(0046,0032)', 'vr': 'CS', 'vm': '1', 'name': 'HorizontalPrismBase' },
+  '(0046,0034)': { 'tag': '(0046,0034)', 'vr': 'FD', 'vm': '1', 'name': 'VerticalPrismPower' },
+  '(0046,0036)': { 'tag': '(0046,0036)', 'vr': 'CS', 'vm': '1', 'name': 'VerticalPrismBase' },
+  '(0046,0038)': { 'tag': '(0046,0038)', 'vr': 'CS', 'vm': '1', 'name': 'LensSegmentType' },
+  '(0046,0040)': { 'tag': '(0046,0040)', 'vr': 'FD', 'vm': '1', 'name': 'OpticalTransmittance' },
+  '(0046,0042)': { 'tag': '(0046,0042)', 'vr': 'FD', 'vm': '1', 'name': 'ChannelWidth' },
+  '(0046,0044)': { 'tag': '(0046,0044)', 'vr': 'FD', 'vm': '1', 'name': 'PupilSize' },
+  '(0046,0046)': { 'tag': '(0046,0046)', 'vr': 'FD', 'vm': '1', 'name': 'CornealSize' },
+  '(0046,0050)': { 'tag': '(0046,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'AutorefractionRightEyeSequence' },
+  '(0046,0052)': { 'tag': '(0046,0052)', 'vr': 'SQ', 'vm': '1', 'name': 'AutorefractionLeftEyeSequence' },
+  '(0046,0060)': { 'tag': '(0046,0060)', 'vr': 'FD', 'vm': '1', 'name': 'DistancePupillaryDistance' },
+  '(0046,0062)': { 'tag': '(0046,0062)', 'vr': 'FD', 'vm': '1', 'name': 'NearPupillaryDistance' },
+  '(0046,0063)': { 'tag': '(0046,0063)', 'vr': 'FD', 'vm': '1', 'name': 'IntermediatePupillaryDistance' },
+  '(0046,0064)': { 'tag': '(0046,0064)', 'vr': 'FD', 'vm': '1', 'name': 'OtherPupillaryDistance' },
+  '(0046,0070)': { 'tag': '(0046,0070)', 'vr': 'SQ', 'vm': '1', 'name': 'KeratometryRightEyeSequence' },
+  '(0046,0071)': { 'tag': '(0046,0071)', 'vr': 'SQ', 'vm': '1', 'name': 'KeratometryLeftEyeSequence' },
+  '(0046,0074)': { 'tag': '(0046,0074)', 'vr': 'SQ', 'vm': '1', 'name': 'SteepKeratometricAxisSequence' },
+  '(0046,0075)': { 'tag': '(0046,0075)', 'vr': 'FD', 'vm': '1', 'name': 'RadiusOfCurvature' },
+  '(0046,0076)': { 'tag': '(0046,0076)', 'vr': 'FD', 'vm': '1', 'name': 'KeratometricPower' },
+  '(0046,0077)': { 'tag': '(0046,0077)', 'vr': 'FD', 'vm': '1', 'name': 'KeratometricAxis' },
+  '(0046,0080)': { 'tag': '(0046,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'FlatKeratometricAxisSequence' },
+  '(0046,0092)': { 'tag': '(0046,0092)', 'vr': 'CS', 'vm': '1', 'name': 'BackgroundColor' },
+  '(0046,0094)': { 'tag': '(0046,0094)', 'vr': 'CS', 'vm': '1', 'name': 'Optotype' },
+  '(0046,0095)': { 'tag': '(0046,0095)', 'vr': 'CS', 'vm': '1', 'name': 'OptotypePresentation' },
+  '(0046,0097)': { 'tag': '(0046,0097)', 'vr': 'SQ', 'vm': '1', 'name': 'SubjectiveRefractionRightEyeSequence' },
+  '(0046,0098)': { 'tag': '(0046,0098)', 'vr': 'SQ', 'vm': '1', 'name': 'SubjectiveRefractionLeftEyeSequence' },
+  '(0046,0100)': { 'tag': '(0046,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'AddNearSequence' },
+  '(0046,0101)': { 'tag': '(0046,0101)', 'vr': 'SQ', 'vm': '1', 'name': 'AddIntermediateSequence' },
+  '(0046,0102)': { 'tag': '(0046,0102)', 'vr': 'SQ', 'vm': '1', 'name': 'AddOtherSequence' },
+  '(0046,0104)': { 'tag': '(0046,0104)', 'vr': 'FD', 'vm': '1', 'name': 'AddPower' },
+  '(0046,0106)': { 'tag': '(0046,0106)', 'vr': 'FD', 'vm': '1', 'name': 'ViewingDistance' },
+  '(0046,0121)': { 'tag': '(0046,0121)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualAcuityTypeCodeSequence' },
+  '(0046,0122)': { 'tag': '(0046,0122)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualAcuityRightEyeSequence' },
+  '(0046,0123)': { 'tag': '(0046,0123)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualAcuityLeftEyeSequence' },
+  '(0046,0124)': { 'tag': '(0046,0124)', 'vr': 'SQ', 'vm': '1', 'name': 'VisualAcuityBothEyesOpenSequence' },
+  '(0046,0125)': { 'tag': '(0046,0125)', 'vr': 'CS', 'vm': '1', 'name': 'ViewingDistanceType' },
+  '(0046,0135)': { 'tag': '(0046,0135)', 'vr': 'SS', 'vm': '2', 'name': 'VisualAcuityModifiers' },
+  '(0046,0137)': { 'tag': '(0046,0137)', 'vr': 'FD', 'vm': '1', 'name': 'DecimalVisualAcuity' },
+  '(0046,0139)': { 'tag': '(0046,0139)', 'vr': 'LO', 'vm': '1', 'name': 'OptotypeDetailedDefinition' },
+  '(0046,0145)': { 'tag': '(0046,0145)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedRefractiveMeasurementsSequence' },
+  '(0046,0146)': { 'tag': '(0046,0146)', 'vr': 'FD', 'vm': '1', 'name': 'SpherePower' },
+  '(0046,0147)': { 'tag': '(0046,0147)', 'vr': 'FD', 'vm': '1', 'name': 'CylinderPower' },
+  '(0048,0001)': { 'tag': '(0048,0001)', 'vr': 'FL', 'vm': '1', 'name': 'ImagedVolumeWidth' },
+  '(0048,0002)': { 'tag': '(0048,0002)', 'vr': 'FL', 'vm': '1', 'name': 'ImagedVolumeHeight' },
+  '(0048,0003)': { 'tag': '(0048,0003)', 'vr': 'FL', 'vm': '1', 'name': 'ImagedVolumeDepth' },
+  '(0048,0006)': { 'tag': '(0048,0006)', 'vr': 'UL', 'vm': '1', 'name': 'TotalPixelMatrixColumns' },
+  '(0048,0007)': { 'tag': '(0048,0007)', 'vr': 'UL', 'vm': '1', 'name': 'TotalPixelMatrixRows' },
+  '(0048,0008)': { 'tag': '(0048,0008)', 'vr': 'SQ', 'vm': '1', 'name': 'TotalPixelMatrixOriginSequence' },
+  '(0048,0010)': { 'tag': '(0048,0010)', 'vr': 'CS', 'vm': '1', 'name': 'SpecimenLabelInImage' },
+  '(0048,0011)': { 'tag': '(0048,0011)', 'vr': 'CS', 'vm': '1', 'name': 'FocusMethod' },
+  '(0048,0012)': { 'tag': '(0048,0012)', 'vr': 'CS', 'vm': '1', 'name': 'ExtendedDepthOfField' },
+  '(0048,0013)': { 'tag': '(0048,0013)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfFocalPlanes' },
+  '(0048,0014)': { 'tag': '(0048,0014)', 'vr': 'FL', 'vm': '1', 'name': 'DistanceBetweenFocalPlanes' },
+  '(0048,0015)': { 'tag': '(0048,0015)', 'vr': 'US', 'vm': '3', 'name': 'RecommendedAbsentPixelCIELabValue' },
+  '(0048,0100)': { 'tag': '(0048,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'IlluminatorTypeCodeSequence' },
+  '(0048,0102)': { 'tag': '(0048,0102)', 'vr': 'DS', 'vm': '6', 'name': 'ImageOrientationSlide' },
+  '(0048,0105)': { 'tag': '(0048,0105)', 'vr': 'SQ', 'vm': '1', 'name': 'OpticalPathSequence' },
+  '(0048,0106)': { 'tag': '(0048,0106)', 'vr': 'SH', 'vm': '1', 'name': 'OpticalPathIdentifier' },
+  '(0048,0107)': { 'tag': '(0048,0107)', 'vr': 'ST', 'vm': '1', 'name': 'OpticalPathDescription' },
+  '(0048,0108)': { 'tag': '(0048,0108)', 'vr': 'SQ', 'vm': '1', 'name': 'IlluminationColorCodeSequence' },
+  '(0048,0110)': { 'tag': '(0048,0110)', 'vr': 'SQ', 'vm': '1', 'name': 'SpecimenReferenceSequence' },
+  '(0048,0111)': { 'tag': '(0048,0111)', 'vr': 'DS', 'vm': '1', 'name': 'CondenserLensPower' },
+  '(0048,0112)': { 'tag': '(0048,0112)', 'vr': 'DS', 'vm': '1', 'name': 'ObjectiveLensPower' },
+  '(0048,0113)': { 'tag': '(0048,0113)', 'vr': 'DS', 'vm': '1', 'name': 'ObjectiveLensNumericalAperture' },
+  '(0048,0120)': { 'tag': '(0048,0120)', 'vr': 'SQ', 'vm': '1', 'name': 'PaletteColorLookupTableSequence' },
+  '(0048,0200)': { 'tag': '(0048,0200)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageNavigationSequence' },
+  '(0048,0201)': { 'tag': '(0048,0201)', 'vr': 'US', 'vm': '2', 'name': 'TopLeftHandCornerOfLocalizerArea' },
+  '(0048,0202)': { 'tag': '(0048,0202)', 'vr': 'US', 'vm': '2', 'name': 'BottomRightHandCornerOfLocalizerArea' },
+  '(0048,0207)': { 'tag': '(0048,0207)', 'vr': 'SQ', 'vm': '1', 'name': 'OpticalPathIdentificationSequence' },
+  '(0048,021A)': { 'tag': '(0048,021A)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanePositionSlideSequence' },
+  '(0048,021E)': { 'tag': '(0048,021E)', 'vr': 'SL', 'vm': '1', 'name': 'RowPositionInTotalImagePixelMatrix' },
+  '(0048,021F)': { 'tag': '(0048,021F)', 'vr': 'SL', 'vm': '1', 'name': 'ColumnPositionInTotalImagePixelMatrix' },
+  '(0048,0301)': { 'tag': '(0048,0301)', 'vr': 'CS', 'vm': '1', 'name': 'PixelOriginInterpretation' },
+  '(0050,0004)': { 'tag': '(0050,0004)', 'vr': 'CS', 'vm': '1', 'name': 'CalibrationImage' },
+  '(0050,0010)': { 'tag': '(0050,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'DeviceSequence' },
+  '(0050,0012)': { 'tag': '(0050,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'ContainerComponentTypeCodeSequence' },
+  '(0050,0013)': { 'tag': '(0050,0013)', 'vr': 'FD', 'vm': '1', 'name': 'ContainerComponentThickness' },
+  '(0050,0014)': { 'tag': '(0050,0014)', 'vr': 'DS', 'vm': '1', 'name': 'DeviceLength' },
+  '(0050,0015)': { 'tag': '(0050,0015)', 'vr': 'FD', 'vm': '1', 'name': 'ContainerComponentWidth' },
+  '(0050,0016)': { 'tag': '(0050,0016)', 'vr': 'DS', 'vm': '1', 'name': 'DeviceDiameter' },
+  '(0050,0017)': { 'tag': '(0050,0017)', 'vr': 'CS', 'vm': '1', 'name': 'DeviceDiameterUnits' },
+  '(0050,0018)': { 'tag': '(0050,0018)', 'vr': 'DS', 'vm': '1', 'name': 'DeviceVolume' },
+  '(0050,0019)': { 'tag': '(0050,0019)', 'vr': 'DS', 'vm': '1', 'name': 'InterMarkerDistance' },
+  '(0050,001A)': { 'tag': '(0050,001A)', 'vr': 'CS', 'vm': '1', 'name': 'ContainerComponentMaterial' },
+  '(0050,001B)': { 'tag': '(0050,001B)', 'vr': 'LO', 'vm': '1', 'name': 'ContainerComponentID' },
+  '(0050,001C)': { 'tag': '(0050,001C)', 'vr': 'FD', 'vm': '1', 'name': 'ContainerComponentLength' },
+  '(0050,001D)': { 'tag': '(0050,001D)', 'vr': 'FD', 'vm': '1', 'name': 'ContainerComponentDiameter' },
+  '(0050,001E)': { 'tag': '(0050,001E)', 'vr': 'LO', 'vm': '1', 'name': 'ContainerComponentDescription' },
+  '(0050,0020)': { 'tag': '(0050,0020)', 'vr': 'LO', 'vm': '1', 'name': 'DeviceDescription' },
+  '(0052,0001)': { 'tag': '(0052,0001)', 'vr': 'FL', 'vm': '1', 'name': 'ContrastBolusIngredientPercentByVolume' },
+  '(0052,0002)': { 'tag': '(0052,0002)', 'vr': 'FD', 'vm': '1', 'name': 'OCTFocalDistance' },
+  '(0052,0003)': { 'tag': '(0052,0003)', 'vr': 'FD', 'vm': '1', 'name': 'BeamSpotSize' },
+  '(0052,0004)': { 'tag': '(0052,0004)', 'vr': 'FD', 'vm': '1', 'name': 'EffectiveRefractiveIndex' },
+  '(0052,0006)': { 'tag': '(0052,0006)', 'vr': 'CS', 'vm': '1', 'name': 'OCTAcquisitionDomain' },
+  '(0052,0007)': { 'tag': '(0052,0007)', 'vr': 'FD', 'vm': '1', 'name': 'OCTOpticalCenterWavelength' },
+  '(0052,0008)': { 'tag': '(0052,0008)', 'vr': 'FD', 'vm': '1', 'name': 'AxialResolution' },
+  '(0052,0009)': { 'tag': '(0052,0009)', 'vr': 'FD', 'vm': '1', 'name': 'RangingDepth' },
+  '(0052,0011)': { 'tag': '(0052,0011)', 'vr': 'FD', 'vm': '1', 'name': 'ALineRate' },
+  '(0052,0012)': { 'tag': '(0052,0012)', 'vr': 'US', 'vm': '1', 'name': 'ALinesPerFrame' },
+  '(0052,0013)': { 'tag': '(0052,0013)', 'vr': 'FD', 'vm': '1', 'name': 'CatheterRotationalRate' },
+  '(0052,0014)': { 'tag': '(0052,0014)', 'vr': 'FD', 'vm': '1', 'name': 'ALinePixelSpacing' },
+  '(0052,0016)': { 'tag': '(0052,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'ModeOfPercutaneousAccessSequence' },
+  '(0052,0025)': { 'tag': '(0052,0025)', 'vr': 'SQ', 'vm': '1', 'name': 'IntravascularOCTFrameTypeSequence' },
+  '(0052,0026)': { 'tag': '(0052,0026)', 'vr': 'CS', 'vm': '1', 'name': 'OCTZOffsetApplied' },
+  '(0052,0027)': { 'tag': '(0052,0027)', 'vr': 'SQ', 'vm': '1', 'name': 'IntravascularFrameContentSequence' },
+  '(0052,0028)': { 'tag': '(0052,0028)', 'vr': 'FD', 'vm': '1', 'name': 'IntravascularLongitudinalDistance' },
+  '(0052,0029)': { 'tag': '(0052,0029)', 'vr': 'SQ', 'vm': '1', 'name': 'IntravascularOCTFrameContentSequence' },
+  '(0052,0030)': { 'tag': '(0052,0030)', 'vr': 'SS', 'vm': '1', 'name': 'OCTZOffsetCorrection' },
+  '(0052,0031)': { 'tag': '(0052,0031)', 'vr': 'CS', 'vm': '1', 'name': 'CatheterDirectionOfRotation' },
+  '(0052,0033)': { 'tag': '(0052,0033)', 'vr': 'FD', 'vm': '1', 'name': 'SeamLineLocation' },
+  '(0052,0034)': { 'tag': '(0052,0034)', 'vr': 'FD', 'vm': '1', 'name': 'FirstALineLocation' },
+  '(0052,0036)': { 'tag': '(0052,0036)', 'vr': 'US', 'vm': '1', 'name': 'SeamLineIndex' },
+  '(0052,0038)': { 'tag': '(0052,0038)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfPaddedAlines' },
+  '(0052,0039)': { 'tag': '(0052,0039)', 'vr': 'CS', 'vm': '1', 'name': 'InterpolationType' },
+  '(0052,003A)': { 'tag': '(0052,003A)', 'vr': 'CS', 'vm': '1', 'name': 'RefractiveIndexApplied' },
+  '(0054,0011)': { 'tag': '(0054,0011)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfEnergyWindows' },
+  '(0054,0012)': { 'tag': '(0054,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'EnergyWindowInformationSequence' },
+  '(0054,0013)': { 'tag': '(0054,0013)', 'vr': 'SQ', 'vm': '1', 'name': 'EnergyWindowRangeSequence' },
+  '(0054,0014)': { 'tag': '(0054,0014)', 'vr': 'DS', 'vm': '1', 'name': 'EnergyWindowLowerLimit' },
+  '(0054,0015)': { 'tag': '(0054,0015)', 'vr': 'DS', 'vm': '1', 'name': 'EnergyWindowUpperLimit' },
+  '(0054,0016)': { 'tag': '(0054,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'RadiopharmaceuticalInformationSequence' },
+  '(0054,0017)': { 'tag': '(0054,0017)', 'vr': 'IS', 'vm': '1', 'name': 'ResidualSyringeCounts' },
+  '(0054,0018)': { 'tag': '(0054,0018)', 'vr': 'SH', 'vm': '1', 'name': 'EnergyWindowName' },
+  '(0054,0020)': { 'tag': '(0054,0020)', 'vr': 'US', 'vm': '1-n', 'name': 'DetectorVector' },
+  '(0054,0021)': { 'tag': '(0054,0021)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfDetectors' },
+  '(0054,0022)': { 'tag': '(0054,0022)', 'vr': 'SQ', 'vm': '1', 'name': 'DetectorInformationSequence' },
+  '(0054,0030)': { 'tag': '(0054,0030)', 'vr': 'US', 'vm': '1-n', 'name': 'PhaseVector' },
+  '(0054,0031)': { 'tag': '(0054,0031)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfPhases' },
+  '(0054,0032)': { 'tag': '(0054,0032)', 'vr': 'SQ', 'vm': '1', 'name': 'PhaseInformationSequence' },
+  '(0054,0033)': { 'tag': '(0054,0033)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfFramesInPhase' },
+  '(0054,0036)': { 'tag': '(0054,0036)', 'vr': 'IS', 'vm': '1', 'name': 'PhaseDelay' },
+  '(0054,0038)': { 'tag': '(0054,0038)', 'vr': 'IS', 'vm': '1', 'name': 'PauseBetweenFrames' },
+  '(0054,0039)': { 'tag': '(0054,0039)', 'vr': 'CS', 'vm': '1', 'name': 'PhaseDescription' },
+  '(0054,0050)': { 'tag': '(0054,0050)', 'vr': 'US', 'vm': '1-n', 'name': 'RotationVector' },
+  '(0054,0051)': { 'tag': '(0054,0051)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfRotations' },
+  '(0054,0052)': { 'tag': '(0054,0052)', 'vr': 'SQ', 'vm': '1', 'name': 'RotationInformationSequence' },
+  '(0054,0053)': { 'tag': '(0054,0053)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfFramesInRotation' },
+  '(0054,0060)': { 'tag': '(0054,0060)', 'vr': 'US', 'vm': '1-n', 'name': 'RRIntervalVector' },
+  '(0054,0061)': { 'tag': '(0054,0061)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfRRIntervals' },
+  '(0054,0062)': { 'tag': '(0054,0062)', 'vr': 'SQ', 'vm': '1', 'name': 'GatedInformationSequence' },
+  '(0054,0063)': { 'tag': '(0054,0063)', 'vr': 'SQ', 'vm': '1', 'name': 'DataInformationSequence' },
+  '(0054,0070)': { 'tag': '(0054,0070)', 'vr': 'US', 'vm': '1-n', 'name': 'TimeSlotVector' },
+  '(0054,0071)': { 'tag': '(0054,0071)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTimeSlots' },
+  '(0054,0072)': { 'tag': '(0054,0072)', 'vr': 'SQ', 'vm': '1', 'name': 'TimeSlotInformationSequence' },
+  '(0054,0073)': { 'tag': '(0054,0073)', 'vr': 'DS', 'vm': '1', 'name': 'TimeSlotTime' },
+  '(0054,0080)': { 'tag': '(0054,0080)', 'vr': 'US', 'vm': '1-n', 'name': 'SliceVector' },
+  '(0054,0081)': { 'tag': '(0054,0081)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfSlices' },
+  '(0054,0090)': { 'tag': '(0054,0090)', 'vr': 'US', 'vm': '1-n', 'name': 'AngularViewVector' },
+  '(0054,0100)': { 'tag': '(0054,0100)', 'vr': 'US', 'vm': '1-n', 'name': 'TimeSliceVector' },
+  '(0054,0101)': { 'tag': '(0054,0101)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTimeSlices' },
+  '(0054,0200)': { 'tag': '(0054,0200)', 'vr': 'DS', 'vm': '1', 'name': 'StartAngle' },
+  '(0054,0202)': { 'tag': '(0054,0202)', 'vr': 'CS', 'vm': '1', 'name': 'TypeOfDetectorMotion' },
+  '(0054,0210)': { 'tag': '(0054,0210)', 'vr': 'IS', 'vm': '1-n', 'name': 'TriggerVector' },
+  '(0054,0211)': { 'tag': '(0054,0211)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTriggersInPhase' },
+  '(0054,0220)': { 'tag': '(0054,0220)', 'vr': 'SQ', 'vm': '1', 'name': 'ViewCodeSequence' },
+  '(0054,0222)': { 'tag': '(0054,0222)', 'vr': 'SQ', 'vm': '1', 'name': 'ViewModifierCodeSequence' },
+  '(0054,0300)': { 'tag': '(0054,0300)', 'vr': 'SQ', 'vm': '1', 'name': 'RadionuclideCodeSequence' },
+  '(0054,0302)': { 'tag': '(0054,0302)', 'vr': 'SQ', 'vm': '1', 'name': 'AdministrationRouteCodeSequence' },
+  '(0054,0304)': { 'tag': '(0054,0304)', 'vr': 'SQ', 'vm': '1', 'name': 'RadiopharmaceuticalCodeSequence' },
+  '(0054,0306)': { 'tag': '(0054,0306)', 'vr': 'SQ', 'vm': '1', 'name': 'CalibrationDataSequence' },
+  '(0054,0308)': { 'tag': '(0054,0308)', 'vr': 'US', 'vm': '1', 'name': 'EnergyWindowNumber' },
+  '(0054,0400)': { 'tag': '(0054,0400)', 'vr': 'SH', 'vm': '1', 'name': 'ImageID' },
+  '(0054,0410)': { 'tag': '(0054,0410)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientOrientationCodeSequence' },
+  '(0054,0412)': { 'tag': '(0054,0412)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientOrientationModifierCodeSequence' },
+  '(0054,0414)': { 'tag': '(0054,0414)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientGantryRelationshipCodeSequence' },
+  '(0054,0500)': { 'tag': '(0054,0500)', 'vr': 'CS', 'vm': '1', 'name': 'SliceProgressionDirection' },
+  '(0054,1000)': { 'tag': '(0054,1000)', 'vr': 'CS', 'vm': '2', 'name': 'SeriesType' },
+  '(0054,1001)': { 'tag': '(0054,1001)', 'vr': 'CS', 'vm': '1', 'name': 'Units' },
+  '(0054,1002)': { 'tag': '(0054,1002)', 'vr': 'CS', 'vm': '1', 'name': 'CountsSource' },
+  '(0054,1004)': { 'tag': '(0054,1004)', 'vr': 'CS', 'vm': '1', 'name': 'ReprojectionMethod' },
+  '(0054,1006)': { 'tag': '(0054,1006)', 'vr': 'CS', 'vm': '1', 'name': 'SUVType' },
+  '(0054,1100)': { 'tag': '(0054,1100)', 'vr': 'CS', 'vm': '1', 'name': 'RandomsCorrectionMethod' },
+  '(0054,1101)': { 'tag': '(0054,1101)', 'vr': 'LO', 'vm': '1', 'name': 'AttenuationCorrectionMethod' },
+  '(0054,1102)': { 'tag': '(0054,1102)', 'vr': 'CS', 'vm': '1', 'name': 'DecayCorrection' },
+  '(0054,1103)': { 'tag': '(0054,1103)', 'vr': 'LO', 'vm': '1', 'name': 'ReconstructionMethod' },
+  '(0054,1104)': { 'tag': '(0054,1104)', 'vr': 'LO', 'vm': '1', 'name': 'DetectorLinesOfResponseUsed' },
+  '(0054,1105)': { 'tag': '(0054,1105)', 'vr': 'LO', 'vm': '1', 'name': 'ScatterCorrectionMethod' },
+  '(0054,1200)': { 'tag': '(0054,1200)', 'vr': 'DS', 'vm': '1', 'name': 'AxialAcceptance' },
+  '(0054,1201)': { 'tag': '(0054,1201)', 'vr': 'IS', 'vm': '2', 'name': 'AxialMash' },
+  '(0054,1202)': { 'tag': '(0054,1202)', 'vr': 'IS', 'vm': '1', 'name': 'TransverseMash' },
+  '(0054,1203)': { 'tag': '(0054,1203)', 'vr': 'DS', 'vm': '2', 'name': 'DetectorElementSize' },
+  '(0054,1210)': { 'tag': '(0054,1210)', 'vr': 'DS', 'vm': '1', 'name': 'CoincidenceWindowWidth' },
+  '(0054,1220)': { 'tag': '(0054,1220)', 'vr': 'CS', 'vm': '1-n', 'name': 'SecondaryCountsType' },
+  '(0054,1300)': { 'tag': '(0054,1300)', 'vr': 'DS', 'vm': '1', 'name': 'FrameReferenceTime' },
+  '(0054,1310)': { 'tag': '(0054,1310)', 'vr': 'IS', 'vm': '1', 'name': 'PrimaryPromptsCountsAccumulated' },
+  '(0054,1311)': { 'tag': '(0054,1311)', 'vr': 'IS', 'vm': '1-n', 'name': 'SecondaryCountsAccumulated' },
+  '(0054,1320)': { 'tag': '(0054,1320)', 'vr': 'DS', 'vm': '1', 'name': 'SliceSensitivityFactor' },
+  '(0054,1321)': { 'tag': '(0054,1321)', 'vr': 'DS', 'vm': '1', 'name': 'DecayFactor' },
+  '(0054,1322)': { 'tag': '(0054,1322)', 'vr': 'DS', 'vm': '1', 'name': 'DoseCalibrationFactor' },
+  '(0054,1323)': { 'tag': '(0054,1323)', 'vr': 'DS', 'vm': '1', 'name': 'ScatterFractionFactor' },
+  '(0054,1324)': { 'tag': '(0054,1324)', 'vr': 'DS', 'vm': '1', 'name': 'DeadTimeFactor' },
+  '(0054,1330)': { 'tag': '(0054,1330)', 'vr': 'US', 'vm': '1', 'name': 'ImageIndex' },
+  '(0054,1400)': { 'tag': '(0054,1400)', 'vr': 'CS', 'vm': '1-n', 'name': 'CountsIncluded' },
+  '(0054,1401)': { 'tag': '(0054,1401)', 'vr': 'CS', 'vm': '1', 'name': 'DeadTimeCorrectionFlag' },
+  '(0060,3000)': { 'tag': '(0060,3000)', 'vr': 'SQ', 'vm': '1', 'name': 'HistogramSequence' },
+  '(0060,3002)': { 'tag': '(0060,3002)', 'vr': 'US', 'vm': '1', 'name': 'HistogramNumberOfBins' },
+  '(0060,3004)': { 'tag': '(0060,3004)', 'vr': 'US|SS', 'vm': '1', 'name': 'HistogramFirstBinValue' },
+  '(0060,3006)': { 'tag': '(0060,3006)', 'vr': 'US|SS', 'vm': '1', 'name': 'HistogramLastBinValue' },
+  '(0060,3008)': { 'tag': '(0060,3008)', 'vr': 'US', 'vm': '1', 'name': 'HistogramBinWidth' },
+  '(0060,3010)': { 'tag': '(0060,3010)', 'vr': 'LO', 'vm': '1', 'name': 'HistogramExplanation' },
+  '(0060,3020)': { 'tag': '(0060,3020)', 'vr': 'UL', 'vm': '1-n', 'name': 'HistogramData' },
+  '(0062,0001)': { 'tag': '(0062,0001)', 'vr': 'CS', 'vm': '1', 'name': 'SegmentationType' },
+  '(0062,0002)': { 'tag': '(0062,0002)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentSequence' },
+  '(0062,0003)': { 'tag': '(0062,0003)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentedPropertyCategoryCodeSequence' },
+  '(0062,0004)': { 'tag': '(0062,0004)', 'vr': 'US', 'vm': '1', 'name': 'SegmentNumber' },
+  '(0062,0005)': { 'tag': '(0062,0005)', 'vr': 'LO', 'vm': '1', 'name': 'SegmentLabel' },
+  '(0062,0006)': { 'tag': '(0062,0006)', 'vr': 'ST', 'vm': '1', 'name': 'SegmentDescription' },
+  '(0062,0008)': { 'tag': '(0062,0008)', 'vr': 'CS', 'vm': '1', 'name': 'SegmentAlgorithmType' },
+  '(0062,0009)': { 'tag': '(0062,0009)', 'vr': 'LO', 'vm': '1', 'name': 'SegmentAlgorithmName' },
+  '(0062,000A)': { 'tag': '(0062,000A)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentIdentificationSequence' },
+  '(0062,000B)': { 'tag': '(0062,000B)', 'vr': 'US', 'vm': '1-n', 'name': 'ReferencedSegmentNumber' },
+  '(0062,000C)': { 'tag': '(0062,000C)', 'vr': 'US', 'vm': '1', 'name': 'RecommendedDisplayGrayscaleValue' },
+  '(0062,000D)': { 'tag': '(0062,000D)', 'vr': 'US', 'vm': '3', 'name': 'RecommendedDisplayCIELabValue' },
+  '(0062,000E)': { 'tag': '(0062,000E)', 'vr': 'US', 'vm': '1', 'name': 'MaximumFractionalValue' },
+  '(0062,000F)': { 'tag': '(0062,000F)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentedPropertyTypeCodeSequence' },
+  '(0062,0010)': { 'tag': '(0062,0010)', 'vr': 'CS', 'vm': '1', 'name': 'SegmentationFractionalType' },
+  '(0064,0002)': { 'tag': '(0064,0002)', 'vr': 'SQ', 'vm': '1', 'name': 'DeformableRegistrationSequence' },
+  '(0064,0003)': { 'tag': '(0064,0003)', 'vr': 'UI', 'vm': '1', 'name': 'SourceFrameOfReferenceUID' },
+  '(0064,0005)': { 'tag': '(0064,0005)', 'vr': 'SQ', 'vm': '1', 'name': 'DeformableRegistrationGridSequence' },
+  '(0064,0007)': { 'tag': '(0064,0007)', 'vr': 'UL', 'vm': '3', 'name': 'GridDimensions' },
+  '(0064,0008)': { 'tag': '(0064,0008)', 'vr': 'FD', 'vm': '3', 'name': 'GridResolution' },
+  '(0064,0009)': { 'tag': '(0064,0009)', 'vr': 'OF', 'vm': '1', 'name': 'VectorGridData' },
+  '(0064,000F)': { 'tag': '(0064,000F)', 'vr': 'SQ', 'vm': '1', 'name': 'PreDeformationMatrixRegistrationSequence' },
+  '(0064,0010)': { 'tag': '(0064,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'PostDeformationMatrixRegistrationSequence' },
+  '(0066,0001)': { 'tag': '(0066,0001)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfSurfaces' },
+  '(0066,0002)': { 'tag': '(0066,0002)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfaceSequence' },
+  '(0066,0003)': { 'tag': '(0066,0003)', 'vr': 'UL', 'vm': '1', 'name': 'SurfaceNumber' },
+  '(0066,0004)': { 'tag': '(0066,0004)', 'vr': 'LT', 'vm': '1', 'name': 'SurfaceComments' },
+  '(0066,0009)': { 'tag': '(0066,0009)', 'vr': 'CS', 'vm': '1', 'name': 'SurfaceProcessing' },
+  '(0066,000A)': { 'tag': '(0066,000A)', 'vr': 'FL', 'vm': '1', 'name': 'SurfaceProcessingRatio' },
+  '(0066,000B)': { 'tag': '(0066,000B)', 'vr': 'LO', 'vm': '1', 'name': 'SurfaceProcessingDescription' },
+  '(0066,000C)': { 'tag': '(0066,000C)', 'vr': 'FL', 'vm': '1', 'name': 'RecommendedPresentationOpacity' },
+  '(0066,000D)': { 'tag': '(0066,000D)', 'vr': 'CS', 'vm': '1', 'name': 'RecommendedPresentationType' },
+  '(0066,000E)': { 'tag': '(0066,000E)', 'vr': 'CS', 'vm': '1', 'name': 'FiniteVolume' },
+  '(0066,0010)': { 'tag': '(0066,0010)', 'vr': 'CS', 'vm': '1', 'name': 'Manifold' },
+  '(0066,0011)': { 'tag': '(0066,0011)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfacePointsSequence' },
+  '(0066,0012)': { 'tag': '(0066,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfacePointsNormalsSequence' },
+  '(0066,0013)': { 'tag': '(0066,0013)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfaceMeshPrimitivesSequence' },
+  '(0066,0015)': { 'tag': '(0066,0015)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfSurfacePoints' },
+  '(0066,0016)': { 'tag': '(0066,0016)', 'vr': 'OF', 'vm': '1', 'name': 'PointCoordinatesData' },
+  '(0066,0017)': { 'tag': '(0066,0017)', 'vr': 'FL', 'vm': '3', 'name': 'PointPositionAccuracy' },
+  '(0066,0018)': { 'tag': '(0066,0018)', 'vr': 'FL', 'vm': '1', 'name': 'MeanPointDistance' },
+  '(0066,0019)': { 'tag': '(0066,0019)', 'vr': 'FL', 'vm': '1', 'name': 'MaximumPointDistance' },
+  '(0066,001A)': { 'tag': '(0066,001A)', 'vr': 'FL', 'vm': '6', 'name': 'PointsBoundingBoxCoordinates' },
+  '(0066,001B)': { 'tag': '(0066,001B)', 'vr': 'FL', 'vm': '3', 'name': 'AxisOfRotation' },
+  '(0066,001C)': { 'tag': '(0066,001C)', 'vr': 'FL', 'vm': '3', 'name': 'CenterOfRotation' },
+  '(0066,001E)': { 'tag': '(0066,001E)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfVectors' },
+  '(0066,001F)': { 'tag': '(0066,001F)', 'vr': 'US', 'vm': '1', 'name': 'VectorDimensionality' },
+  '(0066,0020)': { 'tag': '(0066,0020)', 'vr': 'FL', 'vm': '1-n', 'name': 'VectorAccuracy' },
+  '(0066,0021)': { 'tag': '(0066,0021)', 'vr': 'OF', 'vm': '1', 'name': 'VectorCoordinateData' },
+  '(0066,0023)': { 'tag': '(0066,0023)', 'vr': 'OW', 'vm': '1', 'name': 'TrianglePointIndexList' },
+  '(0066,0024)': { 'tag': '(0066,0024)', 'vr': 'OW', 'vm': '1', 'name': 'EdgePointIndexList' },
+  '(0066,0025)': { 'tag': '(0066,0025)', 'vr': 'OW', 'vm': '1', 'name': 'VertexPointIndexList' },
+  '(0066,0026)': { 'tag': '(0066,0026)', 'vr': 'SQ', 'vm': '1', 'name': 'TriangleStripSequence' },
+  '(0066,0027)': { 'tag': '(0066,0027)', 'vr': 'SQ', 'vm': '1', 'name': 'TriangleFanSequence' },
+  '(0066,0028)': { 'tag': '(0066,0028)', 'vr': 'SQ', 'vm': '1', 'name': 'LineSequence' },
+  '(0066,0029)': { 'tag': '(0066,0029)', 'vr': 'OW', 'vm': '1', 'name': 'PrimitivePointIndexList' },
+  '(0066,002A)': { 'tag': '(0066,002A)', 'vr': 'UL', 'vm': '1', 'name': 'SurfaceCount' },
+  '(0066,002B)': { 'tag': '(0066,002B)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSurfaceSequence' },
+  '(0066,002C)': { 'tag': '(0066,002C)', 'vr': 'UL', 'vm': '1', 'name': 'ReferencedSurfaceNumber' },
+  '(0066,002D)': { 'tag': '(0066,002D)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentSurfaceGenerationAlgorithmIdentificationSequence' },
+  '(0066,002E)': { 'tag': '(0066,002E)', 'vr': 'SQ', 'vm': '1', 'name': 'SegmentSurfaceSourceInstanceSequence' },
+  '(0066,002F)': { 'tag': '(0066,002F)', 'vr': 'SQ', 'vm': '1', 'name': 'AlgorithmFamilyCodeSequence' },
+  '(0066,0030)': { 'tag': '(0066,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'AlgorithmNameCodeSequence' },
+  '(0066,0031)': { 'tag': '(0066,0031)', 'vr': 'LO', 'vm': '1', 'name': 'AlgorithmVersion' },
+  '(0066,0032)': { 'tag': '(0066,0032)', 'vr': 'LT', 'vm': '1', 'name': 'AlgorithmParameters' },
+  '(0066,0034)': { 'tag': '(0066,0034)', 'vr': 'SQ', 'vm': '1', 'name': 'FacetSequence' },
+  '(0066,0035)': { 'tag': '(0066,0035)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfaceProcessingAlgorithmIdentificationSequence' },
+  '(0066,0036)': { 'tag': '(0066,0036)', 'vr': 'LO', 'vm': '1', 'name': 'AlgorithmName' },
+  '(0068,6210)': { 'tag': '(0068,6210)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantSize' },
+  '(0068,6221)': { 'tag': '(0068,6221)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantTemplateVersion' },
+  '(0068,6222)': { 'tag': '(0068,6222)', 'vr': 'SQ', 'vm': '1', 'name': 'ReplacedImplantTemplateSequence' },
+  '(0068,6223)': { 'tag': '(0068,6223)', 'vr': 'CS', 'vm': '1', 'name': 'ImplantType' },
+  '(0068,6224)': { 'tag': '(0068,6224)', 'vr': 'SQ', 'vm': '1', 'name': 'DerivationImplantTemplateSequence' },
+  '(0068,6225)': { 'tag': '(0068,6225)', 'vr': 'SQ', 'vm': '1', 'name': 'OriginalImplantTemplateSequence' },
+  '(0068,6226)': { 'tag': '(0068,6226)', 'vr': 'DT', 'vm': '1', 'name': 'EffectiveDateTime' },
+  '(0068,6230)': { 'tag': '(0068,6230)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTargetAnatomySequence' },
+  '(0068,6260)': { 'tag': '(0068,6260)', 'vr': 'SQ', 'vm': '1', 'name': 'InformationFromManufacturerSequence' },
+  '(0068,6265)': { 'tag': '(0068,6265)', 'vr': 'SQ', 'vm': '1', 'name': 'NotificationFromManufacturerSequence' },
+  '(0068,6270)': { 'tag': '(0068,6270)', 'vr': 'DT', 'vm': '1', 'name': 'InformationIssueDateTime' },
+  '(0068,6280)': { 'tag': '(0068,6280)', 'vr': 'ST', 'vm': '1', 'name': 'InformationSummary' },
+  '(0068,62A0)': { 'tag': '(0068,62A0)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantRegulatoryDisapprovalCodeSequence' },
+  '(0068,62A5)': { 'tag': '(0068,62A5)', 'vr': 'FD', 'vm': '1', 'name': 'OverallTemplateSpatialTolerance' },
+  '(0068,62C0)': { 'tag': '(0068,62C0)', 'vr': 'SQ', 'vm': '1', 'name': 'HPGLDocumentSequence' },
+  '(0068,62D0)': { 'tag': '(0068,62D0)', 'vr': 'US', 'vm': '1', 'name': 'HPGLDocumentID' },
+  '(0068,62D5)': { 'tag': '(0068,62D5)', 'vr': 'LO', 'vm': '1', 'name': 'HPGLDocumentLabel' },
+  '(0068,62E0)': { 'tag': '(0068,62E0)', 'vr': 'SQ', 'vm': '1', 'name': 'ViewOrientationCodeSequence' },
+  '(0068,62F0)': { 'tag': '(0068,62F0)', 'vr': 'FD', 'vm': '9', 'name': 'ViewOrientationModifier' },
+  '(0068,62F2)': { 'tag': '(0068,62F2)', 'vr': 'FD', 'vm': '1', 'name': 'HPGLDocumentScaling' },
+  '(0068,6300)': { 'tag': '(0068,6300)', 'vr': 'OB', 'vm': '1', 'name': 'HPGLDocument' },
+  '(0068,6310)': { 'tag': '(0068,6310)', 'vr': 'US', 'vm': '1', 'name': 'HPGLContourPenNumber' },
+  '(0068,6320)': { 'tag': '(0068,6320)', 'vr': 'SQ', 'vm': '1', 'name': 'HPGLPenSequence' },
+  '(0068,6330)': { 'tag': '(0068,6330)', 'vr': 'US', 'vm': '1', 'name': 'HPGLPenNumber' },
+  '(0068,6340)': { 'tag': '(0068,6340)', 'vr': 'LO', 'vm': '1', 'name': 'HPGLPenLabel' },
+  '(0068,6345)': { 'tag': '(0068,6345)', 'vr': 'ST', 'vm': '1', 'name': 'HPGLPenDescription' },
+  '(0068,6346)': { 'tag': '(0068,6346)', 'vr': 'FD', 'vm': '2', 'name': 'RecommendedRotationPoint' },
+  '(0068,6347)': { 'tag': '(0068,6347)', 'vr': 'FD', 'vm': '4', 'name': 'BoundingRectangle' },
+  '(0068,6350)': { 'tag': '(0068,6350)', 'vr': 'US', 'vm': '1-n', 'name': 'ImplantTemplate3DModelSurfaceNumber' },
+  '(0068,6360)': { 'tag': '(0068,6360)', 'vr': 'SQ', 'vm': '1', 'name': 'SurfaceModelDescriptionSequence' },
+  '(0068,6380)': { 'tag': '(0068,6380)', 'vr': 'LO', 'vm': '1', 'name': 'SurfaceModelLabel' },
+  '(0068,6390)': { 'tag': '(0068,6390)', 'vr': 'FD', 'vm': '1', 'name': 'SurfaceModelScalingFactor' },
+  '(0068,63A0)': { 'tag': '(0068,63A0)', 'vr': 'SQ', 'vm': '1', 'name': 'MaterialsCodeSequence' },
+  '(0068,63A4)': { 'tag': '(0068,63A4)', 'vr': 'SQ', 'vm': '1', 'name': 'CoatingMaterialsCodeSequence' },
+  '(0068,63A8)': { 'tag': '(0068,63A8)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTypeCodeSequence' },
+  '(0068,63AC)': { 'tag': '(0068,63AC)', 'vr': 'SQ', 'vm': '1', 'name': 'FixationMethodCodeSequence' },
+  '(0068,63B0)': { 'tag': '(0068,63B0)', 'vr': 'SQ', 'vm': '1', 'name': 'MatingFeatureSetsSequence' },
+  '(0068,63C0)': { 'tag': '(0068,63C0)', 'vr': 'US', 'vm': '1', 'name': 'MatingFeatureSetID' },
+  '(0068,63D0)': { 'tag': '(0068,63D0)', 'vr': 'LO', 'vm': '1', 'name': 'MatingFeatureSetLabel' },
+  '(0068,63E0)': { 'tag': '(0068,63E0)', 'vr': 'SQ', 'vm': '1', 'name': 'MatingFeatureSequence' },
+  '(0068,63F0)': { 'tag': '(0068,63F0)', 'vr': 'US', 'vm': '1', 'name': 'MatingFeatureID' },
+  '(0068,6400)': { 'tag': '(0068,6400)', 'vr': 'SQ', 'vm': '1', 'name': 'MatingFeatureDegreeOfFreedomSequence' },
+  '(0068,6410)': { 'tag': '(0068,6410)', 'vr': 'US', 'vm': '1', 'name': 'DegreeOfFreedomID' },
+  '(0068,6420)': { 'tag': '(0068,6420)', 'vr': 'CS', 'vm': '1', 'name': 'DegreeOfFreedomType' },
+  '(0068,6430)': { 'tag': '(0068,6430)', 'vr': 'SQ', 'vm': '1', 'name': 'TwoDMatingFeatureCoordinatesSequence' },
+  '(0068,6440)': { 'tag': '(0068,6440)', 'vr': 'US', 'vm': '1', 'name': 'ReferencedHPGLDocumentID' },
+  '(0068,6450)': { 'tag': '(0068,6450)', 'vr': 'FD', 'vm': '2', 'name': 'TwoDMatingPoint' },
+  '(0068,6460)': { 'tag': '(0068,6460)', 'vr': 'FD', 'vm': '4', 'name': 'TwoDMatingAxes' },
+  '(0068,6470)': { 'tag': '(0068,6470)', 'vr': 'SQ', 'vm': '1', 'name': 'TwoDDegreeOfFreedomSequence' },
+  '(0068,6490)': { 'tag': '(0068,6490)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDDegreeOfFreedomAxis' },
+  '(0068,64A0)': { 'tag': '(0068,64A0)', 'vr': 'FD', 'vm': '2', 'name': 'RangeOfFreedom' },
+  '(0068,64C0)': { 'tag': '(0068,64C0)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDMatingPoint' },
+  '(0068,64D0)': { 'tag': '(0068,64D0)', 'vr': 'FD', 'vm': '9', 'name': 'ThreeDMatingAxes' },
+  '(0068,64F0)': { 'tag': '(0068,64F0)', 'vr': 'FD', 'vm': '3', 'name': 'TwoDDegreeOfFreedomAxis' },
+  '(0068,6500)': { 'tag': '(0068,6500)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanningLandmarkPointSequence' },
+  '(0068,6510)': { 'tag': '(0068,6510)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanningLandmarkLineSequence' },
+  '(0068,6520)': { 'tag': '(0068,6520)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanningLandmarkPlaneSequence' },
+  '(0068,6530)': { 'tag': '(0068,6530)', 'vr': 'US', 'vm': '1', 'name': 'PlanningLandmarkID' },
+  '(0068,6540)': { 'tag': '(0068,6540)', 'vr': 'LO', 'vm': '1', 'name': 'PlanningLandmarkDescription' },
+  '(0068,6545)': { 'tag': '(0068,6545)', 'vr': 'SQ', 'vm': '1', 'name': 'PlanningLandmarkIdentificationCodeSequence' },
+  '(0068,6550)': { 'tag': '(0068,6550)', 'vr': 'SQ', 'vm': '1', 'name': 'TwoDPointCoordinatesSequence' },
+  '(0068,6560)': { 'tag': '(0068,6560)', 'vr': 'FD', 'vm': '2', 'name': 'TwoDPointCoordinates' },
+  '(0068,6590)': { 'tag': '(0068,6590)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDPointCoordinates' },
+  '(0068,65A0)': { 'tag': '(0068,65A0)', 'vr': 'SQ', 'vm': '1', 'name': 'TwoDLineCoordinatesSequence' },
+  '(0068,65B0)': { 'tag': '(0068,65B0)', 'vr': 'FD', 'vm': '4', 'name': 'TwoDLineCoordinates' },
+  '(0068,65D0)': { 'tag': '(0068,65D0)', 'vr': 'FD', 'vm': '6', 'name': 'ThreeDLineCoordinates' },
+  '(0068,65E0)': { 'tag': '(0068,65E0)', 'vr': 'SQ', 'vm': '1', 'name': 'TwoDPlaneCoordinatesSequence' },
+  '(0068,65F0)': { 'tag': '(0068,65F0)', 'vr': 'FD', 'vm': '4', 'name': 'TwoDPlaneIntersection' },
+  '(0068,6610)': { 'tag': '(0068,6610)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDPlaneOrigin' },
+  '(0068,6620)': { 'tag': '(0068,6620)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDPlaneNormal' },
+  '(0070,0001)': { 'tag': '(0070,0001)', 'vr': 'SQ', 'vm': '1', 'name': 'GraphicAnnotationSequence' },
+  '(0070,0002)': { 'tag': '(0070,0002)', 'vr': 'CS', 'vm': '1', 'name': 'GraphicLayer' },
+  '(0070,0003)': { 'tag': '(0070,0003)', 'vr': 'CS', 'vm': '1', 'name': 'BoundingBoxAnnotationUnits' },
+  '(0070,0004)': { 'tag': '(0070,0004)', 'vr': 'CS', 'vm': '1', 'name': 'AnchorPointAnnotationUnits' },
+  '(0070,0005)': { 'tag': '(0070,0005)', 'vr': 'CS', 'vm': '1', 'name': 'GraphicAnnotationUnits' },
+  '(0070,0006)': { 'tag': '(0070,0006)', 'vr': 'ST', 'vm': '1', 'name': 'UnformattedTextValue' },
+  '(0070,0008)': { 'tag': '(0070,0008)', 'vr': 'SQ', 'vm': '1', 'name': 'TextObjectSequence' },
+  '(0070,0009)': { 'tag': '(0070,0009)', 'vr': 'SQ', 'vm': '1', 'name': 'GraphicObjectSequence' },
+  '(0070,0010)': { 'tag': '(0070,0010)', 'vr': 'FL', 'vm': '2', 'name': 'BoundingBoxTopLeftHandCorner' },
+  '(0070,0011)': { 'tag': '(0070,0011)', 'vr': 'FL', 'vm': '2', 'name': 'BoundingBoxBottomRightHandCorner' },
+  '(0070,0012)': { 'tag': '(0070,0012)', 'vr': 'CS', 'vm': '1', 'name': 'BoundingBoxTextHorizontalJustification' },
+  '(0070,0014)': { 'tag': '(0070,0014)', 'vr': 'FL', 'vm': '2', 'name': 'AnchorPoint' },
+  '(0070,0015)': { 'tag': '(0070,0015)', 'vr': 'CS', 'vm': '1', 'name': 'AnchorPointVisibility' },
+  '(0070,0020)': { 'tag': '(0070,0020)', 'vr': 'US', 'vm': '1', 'name': 'GraphicDimensions' },
+  '(0070,0021)': { 'tag': '(0070,0021)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfGraphicPoints' },
+  '(0070,0022)': { 'tag': '(0070,0022)', 'vr': 'FL', 'vm': '2-n', 'name': 'GraphicData' },
+  '(0070,0023)': { 'tag': '(0070,0023)', 'vr': 'CS', 'vm': '1', 'name': 'GraphicType' },
+  '(0070,0024)': { 'tag': '(0070,0024)', 'vr': 'CS', 'vm': '1', 'name': 'GraphicFilled' },
+  '(0070,0040)': { 'tag': '(0070,0040)', 'vr': 'IS', 'vm': '1', 'name': 'ImageRotationRetired' },
+  '(0070,0041)': { 'tag': '(0070,0041)', 'vr': 'CS', 'vm': '1', 'name': 'ImageHorizontalFlip' },
+  '(0070,0042)': { 'tag': '(0070,0042)', 'vr': 'US', 'vm': '1', 'name': 'ImageRotation' },
+  '(0070,0050)': { 'tag': '(0070,0050)', 'vr': 'US', 'vm': '2', 'name': 'DisplayedAreaTopLeftHandCornerTrial' },
+  '(0070,0051)': { 'tag': '(0070,0051)', 'vr': 'US', 'vm': '2', 'name': 'DisplayedAreaBottomRightHandCornerTrial' },
+  '(0070,0052)': { 'tag': '(0070,0052)', 'vr': 'SL', 'vm': '2', 'name': 'DisplayedAreaTopLeftHandCorner' },
+  '(0070,0053)': { 'tag': '(0070,0053)', 'vr': 'SL', 'vm': '2', 'name': 'DisplayedAreaBottomRightHandCorner' },
+  '(0070,005A)': { 'tag': '(0070,005A)', 'vr': 'SQ', 'vm': '1', 'name': 'DisplayedAreaSelectionSequence' },
+  '(0070,0060)': { 'tag': '(0070,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'GraphicLayerSequence' },
+  '(0070,0062)': { 'tag': '(0070,0062)', 'vr': 'IS', 'vm': '1', 'name': 'GraphicLayerOrder' },
+  '(0070,0066)': { 'tag': '(0070,0066)', 'vr': 'US', 'vm': '1', 'name': 'GraphicLayerRecommendedDisplayGrayscaleValue' },
+  '(0070,0067)': { 'tag': '(0070,0067)', 'vr': 'US', 'vm': '3', 'name': 'GraphicLayerRecommendedDisplayRGBValue' },
+  '(0070,0068)': { 'tag': '(0070,0068)', 'vr': 'LO', 'vm': '1', 'name': 'GraphicLayerDescription' },
+  '(0070,0080)': { 'tag': '(0070,0080)', 'vr': 'CS', 'vm': '1', 'name': 'ContentLabel' },
+  '(0070,0081)': { 'tag': '(0070,0081)', 'vr': 'LO', 'vm': '1', 'name': 'ContentDescription' },
+  '(0070,0082)': { 'tag': '(0070,0082)', 'vr': 'DA', 'vm': '1', 'name': 'PresentationCreationDate' },
+  '(0070,0083)': { 'tag': '(0070,0083)', 'vr': 'TM', 'vm': '1', 'name': 'PresentationCreationTime' },
+  '(0070,0084)': { 'tag': '(0070,0084)', 'vr': 'PN', 'vm': '1', 'name': 'ContentCreatorName' },
+  '(0070,0086)': { 'tag': '(0070,0086)', 'vr': 'SQ', 'vm': '1', 'name': 'ContentCreatorIdentificationCodeSequence' },
+  '(0070,0087)': { 'tag': '(0070,0087)', 'vr': 'SQ', 'vm': '1', 'name': 'AlternateContentDescriptionSequence' },
+  '(0070,0100)': { 'tag': '(0070,0100)', 'vr': 'CS', 'vm': '1', 'name': 'PresentationSizeMode' },
+  '(0070,0101)': { 'tag': '(0070,0101)', 'vr': 'DS', 'vm': '2', 'name': 'PresentationPixelSpacing' },
+  '(0070,0102)': { 'tag': '(0070,0102)', 'vr': 'IS', 'vm': '2', 'name': 'PresentationPixelAspectRatio' },
+  '(0070,0103)': { 'tag': '(0070,0103)', 'vr': 'FL', 'vm': '1', 'name': 'PresentationPixelMagnificationRatio' },
+  '(0070,0207)': { 'tag': '(0070,0207)', 'vr': 'LO', 'vm': '1', 'name': 'GraphicGroupLabel' },
+  '(0070,0208)': { 'tag': '(0070,0208)', 'vr': 'ST', 'vm': '1', 'name': 'GraphicGroupDescription' },
+  '(0070,0209)': { 'tag': '(0070,0209)', 'vr': 'SQ', 'vm': '1', 'name': 'CompoundGraphicSequence' },
+  '(0070,0226)': { 'tag': '(0070,0226)', 'vr': 'UL', 'vm': '1', 'name': 'CompoundGraphicInstanceID' },
+  '(0070,0227)': { 'tag': '(0070,0227)', 'vr': 'LO', 'vm': '1', 'name': 'FontName' },
+  '(0070,0228)': { 'tag': '(0070,0228)', 'vr': 'CS', 'vm': '1', 'name': 'FontNameType' },
+  '(0070,0229)': { 'tag': '(0070,0229)', 'vr': 'LO', 'vm': '1', 'name': 'CSSFontName' },
+  '(0070,0230)': { 'tag': '(0070,0230)', 'vr': 'FD', 'vm': '1', 'name': 'RotationAngle' },
+  '(0070,0231)': { 'tag': '(0070,0231)', 'vr': 'SQ', 'vm': '1', 'name': 'TextStyleSequence' },
+  '(0070,0232)': { 'tag': '(0070,0232)', 'vr': 'SQ', 'vm': '1', 'name': 'LineStyleSequence' },
+  '(0070,0233)': { 'tag': '(0070,0233)', 'vr': 'SQ', 'vm': '1', 'name': 'FillStyleSequence' },
+  '(0070,0234)': { 'tag': '(0070,0234)', 'vr': 'SQ', 'vm': '1', 'name': 'GraphicGroupSequence' },
+  '(0070,0241)': { 'tag': '(0070,0241)', 'vr': 'US', 'vm': '3', 'name': 'TextColorCIELabValue' },
+  '(0070,0242)': { 'tag': '(0070,0242)', 'vr': 'CS', 'vm': '1', 'name': 'HorizontalAlignment' },
+  '(0070,0243)': { 'tag': '(0070,0243)', 'vr': 'CS', 'vm': '1', 'name': 'VerticalAlignment' },
+  '(0070,0244)': { 'tag': '(0070,0244)', 'vr': 'CS', 'vm': '1', 'name': 'ShadowStyle' },
+  '(0070,0245)': { 'tag': '(0070,0245)', 'vr': 'FL', 'vm': '1', 'name': 'ShadowOffsetX' },
+  '(0070,0246)': { 'tag': '(0070,0246)', 'vr': 'FL', 'vm': '1', 'name': 'ShadowOffsetY' },
+  '(0070,0247)': { 'tag': '(0070,0247)', 'vr': 'US', 'vm': '3', 'name': 'ShadowColorCIELabValue' },
+  '(0070,0248)': { 'tag': '(0070,0248)', 'vr': 'CS', 'vm': '1', 'name': 'Underlined' },
+  '(0070,0249)': { 'tag': '(0070,0249)', 'vr': 'CS', 'vm': '1', 'name': 'Bold' },
+  '(0070,0250)': { 'tag': '(0070,0250)', 'vr': 'CS', 'vm': '1', 'name': 'Italic' },
+  '(0070,0251)': { 'tag': '(0070,0251)', 'vr': 'US', 'vm': '3', 'name': 'PatternOnColorCIELabValue' },
+  '(0070,0252)': { 'tag': '(0070,0252)', 'vr': 'US', 'vm': '3', 'name': 'PatternOffColorCIELabValue' },
+  '(0070,0253)': { 'tag': '(0070,0253)', 'vr': 'FL', 'vm': '1', 'name': 'LineThickness' },
+  '(0070,0254)': { 'tag': '(0070,0254)', 'vr': 'CS', 'vm': '1', 'name': 'LineDashingStyle' },
+  '(0070,0255)': { 'tag': '(0070,0255)', 'vr': 'UL', 'vm': '1', 'name': 'LinePattern' },
+  '(0070,0256)': { 'tag': '(0070,0256)', 'vr': 'OB', 'vm': '1', 'name': 'FillPattern' },
+  '(0070,0257)': { 'tag': '(0070,0257)', 'vr': 'CS', 'vm': '1', 'name': 'FillMode' },
+  '(0070,0258)': { 'tag': '(0070,0258)', 'vr': 'FL', 'vm': '1', 'name': 'ShadowOpacity' },
+  '(0070,0261)': { 'tag': '(0070,0261)', 'vr': 'FL', 'vm': '1', 'name': 'GapLength' },
+  '(0070,0262)': { 'tag': '(0070,0262)', 'vr': 'FL', 'vm': '1', 'name': 'DiameterOfVisibility' },
+  '(0070,0273)': { 'tag': '(0070,0273)', 'vr': 'FL', 'vm': '2', 'name': 'RotationPoint' },
+  '(0070,0274)': { 'tag': '(0070,0274)', 'vr': 'CS', 'vm': '1', 'name': 'TickAlignment' },
+  '(0070,0278)': { 'tag': '(0070,0278)', 'vr': 'CS', 'vm': '1', 'name': 'ShowTickLabel' },
+  '(0070,0279)': { 'tag': '(0070,0279)', 'vr': 'CS', 'vm': '1', 'name': 'TickLabelAlignment' },
+  '(0070,0282)': { 'tag': '(0070,0282)', 'vr': 'CS', 'vm': '1', 'name': 'CompoundGraphicUnits' },
+  '(0070,0284)': { 'tag': '(0070,0284)', 'vr': 'FL', 'vm': '1', 'name': 'PatternOnOpacity' },
+  '(0070,0285)': { 'tag': '(0070,0285)', 'vr': 'FL', 'vm': '1', 'name': 'PatternOffOpacity' },
+  '(0070,0287)': { 'tag': '(0070,0287)', 'vr': 'SQ', 'vm': '1', 'name': 'MajorTicksSequence' },
+  '(0070,0288)': { 'tag': '(0070,0288)', 'vr': 'FL', 'vm': '1', 'name': 'TickPosition' },
+  '(0070,0289)': { 'tag': '(0070,0289)', 'vr': 'SH', 'vm': '1', 'name': 'TickLabel' },
+  '(0070,0294)': { 'tag': '(0070,0294)', 'vr': 'CS', 'vm': '1', 'name': 'CompoundGraphicType' },
+  '(0070,0295)': { 'tag': '(0070,0295)', 'vr': 'UL', 'vm': '1', 'name': 'GraphicGroupID' },
+  '(0070,0306)': { 'tag': '(0070,0306)', 'vr': 'CS', 'vm': '1', 'name': 'ShapeType' },
+  '(0070,0308)': { 'tag': '(0070,0308)', 'vr': 'SQ', 'vm': '1', 'name': 'RegistrationSequence' },
+  '(0070,0309)': { 'tag': '(0070,0309)', 'vr': 'SQ', 'vm': '1', 'name': 'MatrixRegistrationSequence' },
+  '(0070,030A)': { 'tag': '(0070,030A)', 'vr': 'SQ', 'vm': '1', 'name': 'MatrixSequence' },
+  '(0070,030C)': { 'tag': '(0070,030C)', 'vr': 'CS', 'vm': '1', 'name': 'FrameOfReferenceTransformationMatrixType' },
+  '(0070,030D)': { 'tag': '(0070,030D)', 'vr': 'SQ', 'vm': '1', 'name': 'RegistrationTypeCodeSequence' },
+  '(0070,030F)': { 'tag': '(0070,030F)', 'vr': 'ST', 'vm': '1', 'name': 'FiducialDescription' },
+  '(0070,0310)': { 'tag': '(0070,0310)', 'vr': 'SH', 'vm': '1', 'name': 'FiducialIdentifier' },
+  '(0070,0311)': { 'tag': '(0070,0311)', 'vr': 'SQ', 'vm': '1', 'name': 'FiducialIdentifierCodeSequence' },
+  '(0070,0312)': { 'tag': '(0070,0312)', 'vr': 'FD', 'vm': '1', 'name': 'ContourUncertaintyRadius' },
+  '(0070,0314)': { 'tag': '(0070,0314)', 'vr': 'SQ', 'vm': '1', 'name': 'UsedFiducialsSequence' },
+  '(0070,0318)': { 'tag': '(0070,0318)', 'vr': 'SQ', 'vm': '1', 'name': 'GraphicCoordinatesDataSequence' },
+  '(0070,031A)': { 'tag': '(0070,031A)', 'vr': 'UI', 'vm': '1', 'name': 'FiducialUID' },
+  '(0070,031C)': { 'tag': '(0070,031C)', 'vr': 'SQ', 'vm': '1', 'name': 'FiducialSetSequence' },
+  '(0070,031E)': { 'tag': '(0070,031E)', 'vr': 'SQ', 'vm': '1', 'name': 'FiducialSequence' },
+  '(0070,0401)': { 'tag': '(0070,0401)', 'vr': 'US', 'vm': '3', 'name': 'GraphicLayerRecommendedDisplayCIELabValue' },
+  '(0070,0402)': { 'tag': '(0070,0402)', 'vr': 'SQ', 'vm': '1', 'name': 'BlendingSequence' },
+  '(0070,0403)': { 'tag': '(0070,0403)', 'vr': 'FL', 'vm': '1', 'name': 'RelativeOpacity' },
+  '(0070,0404)': { 'tag': '(0070,0404)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSpatialRegistrationSequence' },
+  '(0070,0405)': { 'tag': '(0070,0405)', 'vr': 'CS', 'vm': '1', 'name': 'BlendingPosition' },
+  '(0072,0002)': { 'tag': '(0072,0002)', 'vr': 'SH', 'vm': '1', 'name': 'HangingProtocolName' },
+  '(0072,0004)': { 'tag': '(0072,0004)', 'vr': 'LO', 'vm': '1', 'name': 'HangingProtocolDescription' },
+  '(0072,0006)': { 'tag': '(0072,0006)', 'vr': 'CS', 'vm': '1', 'name': 'HangingProtocolLevel' },
+  '(0072,0008)': { 'tag': '(0072,0008)', 'vr': 'LO', 'vm': '1', 'name': 'HangingProtocolCreator' },
+  '(0072,000A)': { 'tag': '(0072,000A)', 'vr': 'DT', 'vm': '1', 'name': 'HangingProtocolCreationDateTime' },
+  '(0072,000C)': { 'tag': '(0072,000C)', 'vr': 'SQ', 'vm': '1', 'name': 'HangingProtocolDefinitionSequence' },
+  '(0072,000E)': { 'tag': '(0072,000E)', 'vr': 'SQ', 'vm': '1', 'name': 'HangingProtocolUserIdentificationCodeSequence' },
+  '(0072,0010)': { 'tag': '(0072,0010)', 'vr': 'LO', 'vm': '1', 'name': 'HangingProtocolUserGroupName' },
+  '(0072,0012)': { 'tag': '(0072,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceHangingProtocolSequence' },
+  '(0072,0014)': { 'tag': '(0072,0014)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfPriorsReferenced' },
+  '(0072,0020)': { 'tag': '(0072,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageSetsSequence' },
+  '(0072,0022)': { 'tag': '(0072,0022)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageSetSelectorSequence' },
+  '(0072,0024)': { 'tag': '(0072,0024)', 'vr': 'CS', 'vm': '1', 'name': 'ImageSetSelectorUsageFlag' },
+  '(0072,0026)': { 'tag': '(0072,0026)', 'vr': 'AT', 'vm': '1', 'name': 'SelectorAttribute' },
+  '(0072,0028)': { 'tag': '(0072,0028)', 'vr': 'US', 'vm': '1', 'name': 'SelectorValueNumber' },
+  '(0072,0030)': { 'tag': '(0072,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'TimeBasedImageSetsSequence' },
+  '(0072,0032)': { 'tag': '(0072,0032)', 'vr': 'US', 'vm': '1', 'name': 'ImageSetNumber' },
+  '(0072,0034)': { 'tag': '(0072,0034)', 'vr': 'CS', 'vm': '1', 'name': 'ImageSetSelectorCategory' },
+  '(0072,0038)': { 'tag': '(0072,0038)', 'vr': 'US', 'vm': '2', 'name': 'RelativeTime' },
+  '(0072,003A)': { 'tag': '(0072,003A)', 'vr': 'CS', 'vm': '1', 'name': 'RelativeTimeUnits' },
+  '(0072,003C)': { 'tag': '(0072,003C)', 'vr': 'SS', 'vm': '2', 'name': 'AbstractPriorValue' },
+  '(0072,003E)': { 'tag': '(0072,003E)', 'vr': 'SQ', 'vm': '1', 'name': 'AbstractPriorCodeSequence' },
+  '(0072,0040)': { 'tag': '(0072,0040)', 'vr': 'LO', 'vm': '1', 'name': 'ImageSetLabel' },
+  '(0072,0050)': { 'tag': '(0072,0050)', 'vr': 'CS', 'vm': '1', 'name': 'SelectorAttributeVR' },
+  '(0072,0052)': { 'tag': '(0072,0052)', 'vr': 'AT', 'vm': '1-n', 'name': 'SelectorSequencePointer' },
+  '(0072,0054)': { 'tag': '(0072,0054)', 'vr': 'LO', 'vm': '1-n', 'name': 'SelectorSequencePointerPrivateCreator' },
+  '(0072,0056)': { 'tag': '(0072,0056)', 'vr': 'LO', 'vm': '1', 'name': 'SelectorAttributePrivateCreator' },
+  '(0072,0060)': { 'tag': '(0072,0060)', 'vr': 'AT', 'vm': '1-n', 'name': 'SelectorATValue' },
+  '(0072,0062)': { 'tag': '(0072,0062)', 'vr': 'CS', 'vm': '1-n', 'name': 'SelectorCSValue' },
+  '(0072,0064)': { 'tag': '(0072,0064)', 'vr': 'IS', 'vm': '1-n', 'name': 'SelectorISValue' },
+  '(0072,0066)': { 'tag': '(0072,0066)', 'vr': 'LO', 'vm': '1-n', 'name': 'SelectorLOValue' },
+  '(0072,0068)': { 'tag': '(0072,0068)', 'vr': 'LT', 'vm': '1', 'name': 'SelectorLTValue' },
+  '(0072,006A)': { 'tag': '(0072,006A)', 'vr': 'PN', 'vm': '1-n', 'name': 'SelectorPNValue' },
+  '(0072,006C)': { 'tag': '(0072,006C)', 'vr': 'SH', 'vm': '1-n', 'name': 'SelectorSHValue' },
+  '(0072,006E)': { 'tag': '(0072,006E)', 'vr': 'ST', 'vm': '1', 'name': 'SelectorSTValue' },
+  '(0072,0070)': { 'tag': '(0072,0070)', 'vr': 'UT', 'vm': '1', 'name': 'SelectorUTValue' },
+  '(0072,0072)': { 'tag': '(0072,0072)', 'vr': 'DS', 'vm': '1-n', 'name': 'SelectorDSValue' },
+  '(0072,0074)': { 'tag': '(0072,0074)', 'vr': 'FD', 'vm': '1-n', 'name': 'SelectorFDValue' },
+  '(0072,0076)': { 'tag': '(0072,0076)', 'vr': 'FL', 'vm': '1-n', 'name': 'SelectorFLValue' },
+  '(0072,0078)': { 'tag': '(0072,0078)', 'vr': 'UL', 'vm': '1-n', 'name': 'SelectorULValue' },
+  '(0072,007A)': { 'tag': '(0072,007A)', 'vr': 'US', 'vm': '1-n', 'name': 'SelectorUSValue' },
+  '(0072,007C)': { 'tag': '(0072,007C)', 'vr': 'SL', 'vm': '1-n', 'name': 'SelectorSLValue' },
+  '(0072,007E)': { 'tag': '(0072,007E)', 'vr': 'SS', 'vm': '1-n', 'name': 'SelectorSSValue' },
+  '(0072,0080)': { 'tag': '(0072,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'SelectorCodeSequenceValue' },
+  '(0072,0100)': { 'tag': '(0072,0100)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfScreens' },
+  '(0072,0102)': { 'tag': '(0072,0102)', 'vr': 'SQ', 'vm': '1', 'name': 'NominalScreenDefinitionSequence' },
+  '(0072,0104)': { 'tag': '(0072,0104)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfVerticalPixels' },
+  '(0072,0106)': { 'tag': '(0072,0106)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfHorizontalPixels' },
+  '(0072,0108)': { 'tag': '(0072,0108)', 'vr': 'FD', 'vm': '4', 'name': 'DisplayEnvironmentSpatialPosition' },
+  '(0072,010A)': { 'tag': '(0072,010A)', 'vr': 'US', 'vm': '1', 'name': 'ScreenMinimumGrayscaleBitDepth' },
+  '(0072,010C)': { 'tag': '(0072,010C)', 'vr': 'US', 'vm': '1', 'name': 'ScreenMinimumColorBitDepth' },
+  '(0072,010E)': { 'tag': '(0072,010E)', 'vr': 'US', 'vm': '1', 'name': 'ApplicationMaximumRepaintTime' },
+  '(0072,0200)': { 'tag': '(0072,0200)', 'vr': 'SQ', 'vm': '1', 'name': 'DisplaySetsSequence' },
+  '(0072,0202)': { 'tag': '(0072,0202)', 'vr': 'US', 'vm': '1', 'name': 'DisplaySetNumber' },
+  '(0072,0203)': { 'tag': '(0072,0203)', 'vr': 'LO', 'vm': '1', 'name': 'DisplaySetLabel' },
+  '(0072,0204)': { 'tag': '(0072,0204)', 'vr': 'US', 'vm': '1', 'name': 'DisplaySetPresentationGroup' },
+  '(0072,0206)': { 'tag': '(0072,0206)', 'vr': 'LO', 'vm': '1', 'name': 'DisplaySetPresentationGroupDescription' },
+  '(0072,0208)': { 'tag': '(0072,0208)', 'vr': 'CS', 'vm': '1', 'name': 'PartialDataDisplayHandling' },
+  '(0072,0210)': { 'tag': '(0072,0210)', 'vr': 'SQ', 'vm': '1', 'name': 'SynchronizedScrollingSequence' },
+  '(0072,0212)': { 'tag': '(0072,0212)', 'vr': 'US', 'vm': '2-n', 'name': 'DisplaySetScrollingGroup' },
+  '(0072,0214)': { 'tag': '(0072,0214)', 'vr': 'SQ', 'vm': '1', 'name': 'NavigationIndicatorSequence' },
+  '(0072,0216)': { 'tag': '(0072,0216)', 'vr': 'US', 'vm': '1', 'name': 'NavigationDisplaySet' },
+  '(0072,0218)': { 'tag': '(0072,0218)', 'vr': 'US', 'vm': '1-n', 'name': 'ReferenceDisplaySets' },
+  '(0072,0300)': { 'tag': '(0072,0300)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageBoxesSequence' },
+  '(0072,0302)': { 'tag': '(0072,0302)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxNumber' },
+  '(0072,0304)': { 'tag': '(0072,0304)', 'vr': 'CS', 'vm': '1', 'name': 'ImageBoxLayoutType' },
+  '(0072,0306)': { 'tag': '(0072,0306)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxTileHorizontalDimension' },
+  '(0072,0308)': { 'tag': '(0072,0308)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxTileVerticalDimension' },
+  '(0072,0310)': { 'tag': '(0072,0310)', 'vr': 'CS', 'vm': '1', 'name': 'ImageBoxScrollDirection' },
+  '(0072,0312)': { 'tag': '(0072,0312)', 'vr': 'CS', 'vm': '1', 'name': 'ImageBoxSmallScrollType' },
+  '(0072,0314)': { 'tag': '(0072,0314)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxSmallScrollAmount' },
+  '(0072,0316)': { 'tag': '(0072,0316)', 'vr': 'CS', 'vm': '1', 'name': 'ImageBoxLargeScrollType' },
+  '(0072,0318)': { 'tag': '(0072,0318)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxLargeScrollAmount' },
+  '(0072,0320)': { 'tag': '(0072,0320)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxOverlapPriority' },
+  '(0072,0330)': { 'tag': '(0072,0330)', 'vr': 'FD', 'vm': '1', 'name': 'CineRelativeToRealTime' },
+  '(0072,0400)': { 'tag': '(0072,0400)', 'vr': 'SQ', 'vm': '1', 'name': 'FilterOperationsSequence' },
+  '(0072,0402)': { 'tag': '(0072,0402)', 'vr': 'CS', 'vm': '1', 'name': 'FilterByCategory' },
+  '(0072,0404)': { 'tag': '(0072,0404)', 'vr': 'CS', 'vm': '1', 'name': 'FilterByAttributePresence' },
+  '(0072,0406)': { 'tag': '(0072,0406)', 'vr': 'CS', 'vm': '1', 'name': 'FilterByOperator' },
+  '(0072,0420)': { 'tag': '(0072,0420)', 'vr': 'US', 'vm': '3', 'name': 'StructuredDisplayBackgroundCIELabValue' },
+  '(0072,0421)': { 'tag': '(0072,0421)', 'vr': 'US', 'vm': '3', 'name': 'EmptyImageBoxCIELabValue' },
+  '(0072,0422)': { 'tag': '(0072,0422)', 'vr': 'SQ', 'vm': '1', 'name': 'StructuredDisplayImageBoxSequence' },
+  '(0072,0424)': { 'tag': '(0072,0424)', 'vr': 'SQ', 'vm': '1', 'name': 'StructuredDisplayTextBoxSequence' },
+  '(0072,0427)': { 'tag': '(0072,0427)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedFirstFrameSequence' },
+  '(0072,0430)': { 'tag': '(0072,0430)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageBoxSynchronizationSequence' },
+  '(0072,0432)': { 'tag': '(0072,0432)', 'vr': 'US', 'vm': '2-n', 'name': 'SynchronizedImageBoxList' },
+  '(0072,0434)': { 'tag': '(0072,0434)', 'vr': 'CS', 'vm': '1', 'name': 'TypeOfSynchronization' },
+  '(0072,0500)': { 'tag': '(0072,0500)', 'vr': 'CS', 'vm': '1', 'name': 'BlendingOperationType' },
+  '(0072,0510)': { 'tag': '(0072,0510)', 'vr': 'CS', 'vm': '1', 'name': 'ReformattingOperationType' },
+  '(0072,0512)': { 'tag': '(0072,0512)', 'vr': 'FD', 'vm': '1', 'name': 'ReformattingThickness' },
+  '(0072,0514)': { 'tag': '(0072,0514)', 'vr': 'FD', 'vm': '1', 'name': 'ReformattingInterval' },
+  '(0072,0516)': { 'tag': '(0072,0516)', 'vr': 'CS', 'vm': '1', 'name': 'ReformattingOperationInitialViewDirection' },
+  '(0072,0520)': { 'tag': '(0072,0520)', 'vr': 'CS', 'vm': '1-n', 'name': 'ThreeDRenderingType' },
+  '(0072,0600)': { 'tag': '(0072,0600)', 'vr': 'SQ', 'vm': '1', 'name': 'SortingOperationsSequence' },
+  '(0072,0602)': { 'tag': '(0072,0602)', 'vr': 'CS', 'vm': '1', 'name': 'SortByCategory' },
+  '(0072,0604)': { 'tag': '(0072,0604)', 'vr': 'CS', 'vm': '1', 'name': 'SortingDirection' },
+  '(0072,0700)': { 'tag': '(0072,0700)', 'vr': 'CS', 'vm': '2', 'name': 'DisplaySetPatientOrientation' },
+  '(0072,0702)': { 'tag': '(0072,0702)', 'vr': 'CS', 'vm': '1', 'name': 'VOIType' },
+  '(0072,0704)': { 'tag': '(0072,0704)', 'vr': 'CS', 'vm': '1', 'name': 'PseudoColorType' },
+  '(0072,0705)': { 'tag': '(0072,0705)', 'vr': 'SQ', 'vm': '1', 'name': 'PseudoColorPaletteInstanceReferenceSequence' },
+  '(0072,0706)': { 'tag': '(0072,0706)', 'vr': 'CS', 'vm': '1', 'name': 'ShowGrayscaleInverted' },
+  '(0072,0710)': { 'tag': '(0072,0710)', 'vr': 'CS', 'vm': '1', 'name': 'ShowImageTrueSizeFlag' },
+  '(0072,0712)': { 'tag': '(0072,0712)', 'vr': 'CS', 'vm': '1', 'name': 'ShowGraphicAnnotationFlag' },
+  '(0072,0714)': { 'tag': '(0072,0714)', 'vr': 'CS', 'vm': '1', 'name': 'ShowPatientDemographicsFlag' },
+  '(0072,0716)': { 'tag': '(0072,0716)', 'vr': 'CS', 'vm': '1', 'name': 'ShowAcquisitionTechniquesFlag' },
+  '(0072,0717)': { 'tag': '(0072,0717)', 'vr': 'CS', 'vm': '1', 'name': 'DisplaySetHorizontalJustification' },
+  '(0072,0718)': { 'tag': '(0072,0718)', 'vr': 'CS', 'vm': '1', 'name': 'DisplaySetVerticalJustification' },
+  '(0074,0120)': { 'tag': '(0074,0120)', 'vr': 'FD', 'vm': '1', 'name': 'ContinuationStartMeterset' },
+  '(0074,0121)': { 'tag': '(0074,0121)', 'vr': 'FD', 'vm': '1', 'name': 'ContinuationEndMeterset' },
+  '(0074,1000)': { 'tag': '(0074,1000)', 'vr': 'CS', 'vm': '1', 'name': 'ProcedureStepState' },
+  '(0074,1002)': { 'tag': '(0074,1002)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureStepProgressInformationSequence' },
+  '(0074,1004)': { 'tag': '(0074,1004)', 'vr': 'DS', 'vm': '1', 'name': 'ProcedureStepProgress' },
+  '(0074,1006)': { 'tag': '(0074,1006)', 'vr': 'ST', 'vm': '1', 'name': 'ProcedureStepProgressDescription' },
+  '(0074,1008)': { 'tag': '(0074,1008)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureStepCommunicationsURISequence' },
+  '(0074,100a)': { 'tag': '(0074,100a)', 'vr': 'ST', 'vm': '1', 'name': 'ContactURI' },
+  '(0074,100c)': { 'tag': '(0074,100c)', 'vr': 'LO', 'vm': '1', 'name': 'ContactDisplayName' },
+  '(0074,100e)': { 'tag': '(0074,100e)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureStepDiscontinuationReasonCodeSequence' },
+  '(0074,1020)': { 'tag': '(0074,1020)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamTaskSequence' },
+  '(0074,1022)': { 'tag': '(0074,1022)', 'vr': 'CS', 'vm': '1', 'name': 'BeamTaskType' },
+  '(0074,1024)': { 'tag': '(0074,1024)', 'vr': 'IS', 'vm': '1', 'name': 'BeamOrderIndexTrial' },
+  '(0074,1026)': { 'tag': '(0074,1026)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopVerticalAdjustedPosition' },
+  '(0074,1027)': { 'tag': '(0074,1027)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopLongitudinalAdjustedPosition' },
+  '(0074,1028)': { 'tag': '(0074,1028)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopLateralAdjustedPosition' },
+  '(0074,102A)': { 'tag': '(0074,102A)', 'vr': 'FD', 'vm': '1', 'name': 'PatientSupportAdjustedAngle' },
+  '(0074,102B)': { 'tag': '(0074,102B)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopEccentricAdjustedAngle' },
+  '(0074,102C)': { 'tag': '(0074,102C)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopPitchAdjustedAngle' },
+  '(0074,102D)': { 'tag': '(0074,102D)', 'vr': 'FD', 'vm': '1', 'name': 'TableTopRollAdjustedAngle' },
+  '(0074,1030)': { 'tag': '(0074,1030)', 'vr': 'SQ', 'vm': '1', 'name': 'DeliveryVerificationImageSequence' },
+  '(0074,1032)': { 'tag': '(0074,1032)', 'vr': 'CS', 'vm': '1', 'name': 'VerificationImageTiming' },
+  '(0074,1034)': { 'tag': '(0074,1034)', 'vr': 'CS', 'vm': '1', 'name': 'DoubleExposureFlag' },
+  '(0074,1036)': { 'tag': '(0074,1036)', 'vr': 'CS', 'vm': '1', 'name': 'DoubleExposureOrdering' },
+  '(0074,1038)': { 'tag': '(0074,1038)', 'vr': 'DS', 'vm': '1', 'name': 'DoubleExposureMetersetTrial' },
+  '(0074,103A)': { 'tag': '(0074,103A)', 'vr': 'DS', 'vm': '4', 'name': 'DoubleExposureFieldDeltaTrial' },
+  '(0074,1040)': { 'tag': '(0074,1040)', 'vr': 'SQ', 'vm': '1', 'name': 'RelatedReferenceRTImageSequence' },
+  '(0074,1042)': { 'tag': '(0074,1042)', 'vr': 'SQ', 'vm': '1', 'name': 'GeneralMachineVerificationSequence' },
+  '(0074,1044)': { 'tag': '(0074,1044)', 'vr': 'SQ', 'vm': '1', 'name': 'ConventionalMachineVerificationSequence' },
+  '(0074,1046)': { 'tag': '(0074,1046)', 'vr': 'SQ', 'vm': '1', 'name': 'IonMachineVerificationSequence' },
+  '(0074,1048)': { 'tag': '(0074,1048)', 'vr': 'SQ', 'vm': '1', 'name': 'FailedAttributesSequence' },
+  '(0074,104A)': { 'tag': '(0074,104A)', 'vr': 'SQ', 'vm': '1', 'name': 'OverriddenAttributesSequence' },
+  '(0074,104C)': { 'tag': '(0074,104C)', 'vr': 'SQ', 'vm': '1', 'name': 'ConventionalControlPointVerificationSequence' },
+  '(0074,104E)': { 'tag': '(0074,104E)', 'vr': 'SQ', 'vm': '1', 'name': 'IonControlPointVerificationSequence' },
+  '(0074,1050)': { 'tag': '(0074,1050)', 'vr': 'SQ', 'vm': '1', 'name': 'AttributeOccurrenceSequence' },
+  '(0074,1052)': { 'tag': '(0074,1052)', 'vr': 'AT', 'vm': '1', 'name': 'AttributeOccurrencePointer' },
+  '(0074,1054)': { 'tag': '(0074,1054)', 'vr': 'UL', 'vm': '1', 'name': 'AttributeItemSelector' },
+  '(0074,1056)': { 'tag': '(0074,1056)', 'vr': 'LO', 'vm': '1', 'name': 'AttributeOccurrencePrivateCreator' },
+  '(0074,1057)': { 'tag': '(0074,1057)', 'vr': 'IS', 'vm': '1-n', 'name': 'SelectorSequencePointerItems' },
+  '(0074,1200)': { 'tag': '(0074,1200)', 'vr': 'CS', 'vm': '1', 'name': 'ScheduledProcedureStepPriority' },
+  '(0074,1202)': { 'tag': '(0074,1202)', 'vr': 'LO', 'vm': '1', 'name': 'WorklistLabel' },
+  '(0074,1204)': { 'tag': '(0074,1204)', 'vr': 'LO', 'vm': '1', 'name': 'ProcedureStepLabel' },
+  '(0074,1210)': { 'tag': '(0074,1210)', 'vr': 'SQ', 'vm': '1', 'name': 'ScheduledProcessingParametersSequence' },
+  '(0074,1212)': { 'tag': '(0074,1212)', 'vr': 'SQ', 'vm': '1', 'name': 'PerformedProcessingParametersSequence' },
+  '(0074,1216)': { 'tag': '(0074,1216)', 'vr': 'SQ', 'vm': '1', 'name': 'UnifiedProcedureStepPerformedProcedureSequence' },
+  '(0074,1220)': { 'tag': '(0074,1220)', 'vr': 'SQ', 'vm': '1', 'name': 'RelatedProcedureStepSequence' },
+  '(0074,1222)': { 'tag': '(0074,1222)', 'vr': 'LO', 'vm': '1', 'name': 'ProcedureStepRelationshipType' },
+  '(0074,1224)': { 'tag': '(0074,1224)', 'vr': 'SQ', 'vm': '1', 'name': 'ReplacedProcedureStepSequence' },
+  '(0074,1230)': { 'tag': '(0074,1230)', 'vr': 'LO', 'vm': '1', 'name': 'DeletionLock' },
+  '(0074,1234)': { 'tag': '(0074,1234)', 'vr': 'AE', 'vm': '1', 'name': 'ReceivingAE' },
+  '(0074,1236)': { 'tag': '(0074,1236)', 'vr': 'AE', 'vm': '1', 'name': 'RequestingAE' },
+  '(0074,1238)': { 'tag': '(0074,1238)', 'vr': 'LT', 'vm': '1', 'name': 'ReasonForCancellation' },
+  '(0074,1242)': { 'tag': '(0074,1242)', 'vr': 'CS', 'vm': '1', 'name': 'SCPStatus' },
+  '(0074,1244)': { 'tag': '(0074,1244)', 'vr': 'CS', 'vm': '1', 'name': 'SubscriptionListStatus' },
+  '(0074,1246)': { 'tag': '(0074,1246)', 'vr': 'CS', 'vm': '1', 'name': 'UnifiedProcedureStepListStatus' },
+  '(0074,1324)': { 'tag': '(0074,1324)', 'vr': 'UL', 'vm': '1', 'name': 'BeamOrderIndex' },
+  '(0074,1338)': { 'tag': '(0074,1338)', 'vr': 'FD', 'vm': '1', 'name': 'DoubleExposureMeterset' },
+  '(0074,133A)': { 'tag': '(0074,133A)', 'vr': 'FD', 'vm': '4', 'name': 'DoubleExposureFieldDelta' },
+  '(0076,0001)': { 'tag': '(0076,0001)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantAssemblyTemplateName' },
+  '(0076,0003)': { 'tag': '(0076,0003)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantAssemblyTemplateIssuer' },
+  '(0076,0006)': { 'tag': '(0076,0006)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantAssemblyTemplateVersion' },
+  '(0076,0008)': { 'tag': '(0076,0008)', 'vr': 'SQ', 'vm': '1', 'name': 'ReplacedImplantAssemblyTemplateSequence' },
+  '(0076,000A)': { 'tag': '(0076,000A)', 'vr': 'CS', 'vm': '1', 'name': 'ImplantAssemblyTemplateType' },
+  '(0076,000C)': { 'tag': '(0076,000C)', 'vr': 'SQ', 'vm': '1', 'name': 'OriginalImplantAssemblyTemplateSequence' },
+  '(0076,000E)': { 'tag': '(0076,000E)', 'vr': 'SQ', 'vm': '1', 'name': 'DerivationImplantAssemblyTemplateSequence' },
+  '(0076,0010)': { 'tag': '(0076,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantAssemblyTemplateTargetAnatomySequence' },
+  '(0076,0020)': { 'tag': '(0076,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'ProcedureTypeCodeSequence' },
+  '(0076,0030)': { 'tag': '(0076,0030)', 'vr': 'LO', 'vm': '1', 'name': 'SurgicalTechnique' },
+  '(0076,0032)': { 'tag': '(0076,0032)', 'vr': 'SQ', 'vm': '1', 'name': 'ComponentTypesSequence' },
+  '(0076,0034)': { 'tag': '(0076,0034)', 'vr': 'CS', 'vm': '1', 'name': 'ComponentTypeCodeSequence' },
+  '(0076,0036)': { 'tag': '(0076,0036)', 'vr': 'CS', 'vm': '1', 'name': 'ExclusiveComponentType' },
+  '(0076,0038)': { 'tag': '(0076,0038)', 'vr': 'CS', 'vm': '1', 'name': 'MandatoryComponentType' },
+  '(0076,0040)': { 'tag': '(0076,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ComponentSequence' },
+  '(0076,0055)': { 'tag': '(0076,0055)', 'vr': 'US', 'vm': '1', 'name': 'ComponentID' },
+  '(0076,0060)': { 'tag': '(0076,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'ComponentAssemblySequence' },
+  '(0076,0070)': { 'tag': '(0076,0070)', 'vr': 'US', 'vm': '1', 'name': 'Component1ReferencedID' },
+  '(0076,0080)': { 'tag': '(0076,0080)', 'vr': 'US', 'vm': '1', 'name': 'Component1ReferencedMatingFeatureSetID' },
+  '(0076,0090)': { 'tag': '(0076,0090)', 'vr': 'US', 'vm': '1', 'name': 'Component1ReferencedMatingFeatureID' },
+  '(0076,00A0)': { 'tag': '(0076,00A0)', 'vr': 'US', 'vm': '1', 'name': 'Component2ReferencedID' },
+  '(0076,00B0)': { 'tag': '(0076,00B0)', 'vr': 'US', 'vm': '1', 'name': 'Component2ReferencedMatingFeatureSetID' },
+  '(0076,00C0)': { 'tag': '(0076,00C0)', 'vr': 'US', 'vm': '1', 'name': 'Component2ReferencedMatingFeatureID' },
+  '(0078,0001)': { 'tag': '(0078,0001)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantTemplateGroupName' },
+  '(0078,0010)': { 'tag': '(0078,0010)', 'vr': 'ST', 'vm': '1', 'name': 'ImplantTemplateGroupDescription' },
+  '(0078,0020)': { 'tag': '(0078,0020)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantTemplateGroupIssuer' },
+  '(0078,0024)': { 'tag': '(0078,0024)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantTemplateGroupVersion' },
+  '(0078,0026)': { 'tag': '(0078,0026)', 'vr': 'SQ', 'vm': '1', 'name': 'ReplacedImplantTemplateGroupSequence' },
+  '(0078,0028)': { 'tag': '(0078,0028)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTemplateGroupTargetAnatomySequence' },
+  '(0078,002A)': { 'tag': '(0078,002A)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTemplateGroupMembersSequence' },
+  '(0078,002E)': { 'tag': '(0078,002E)', 'vr': 'US', 'vm': '1', 'name': 'ImplantTemplateGroupMemberID' },
+  '(0078,0050)': { 'tag': '(0078,0050)', 'vr': 'FD', 'vm': '3', 'name': 'ThreeDImplantTemplateGroupMemberMatchingPoint' },
+  '(0078,0060)': { 'tag': '(0078,0060)', 'vr': 'FD', 'vm': '9', 'name': 'ThreeDImplantTemplateGroupMemberMatchingAxes' },
+  '(0078,0070)': { 'tag': '(0078,0070)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTemplateGroupMemberMatching2DCoordinatesSequence' },
+  '(0078,0090)': { 'tag': '(0078,0090)', 'vr': 'FD', 'vm': '2', 'name': 'TwoDImplantTemplateGroupMemberMatchingPoint' },
+  '(0078,00A0)': { 'tag': '(0078,00A0)', 'vr': 'FD', 'vm': '4', 'name': 'TwoDImplantTemplateGroupMemberMatchingAxes' },
+  '(0078,00B0)': { 'tag': '(0078,00B0)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTemplateGroupVariationDimensionSequence' },
+  '(0078,00B2)': { 'tag': '(0078,00B2)', 'vr': 'LO', 'vm': '1', 'name': 'ImplantTemplateGroupVariationDimensionName' },
+  '(0078,00B4)': { 'tag': '(0078,00B4)', 'vr': 'SQ', 'vm': '1', 'name': 'ImplantTemplateGroupVariationDimensionRankSequence' },
+  '(0078,00B6)': { 'tag': '(0078,00B6)', 'vr': 'US', 'vm': '1', 'name': 'ReferencedImplantTemplateGroupMemberID' },
+  '(0078,00B8)': { 'tag': '(0078,00B8)', 'vr': 'US', 'vm': '1', 'name': 'ImplantTemplateGroupVariationDimensionRank' },
+  '(0088,0130)': { 'tag': '(0088,0130)', 'vr': 'SH', 'vm': '1', 'name': 'StorageMediaFileSetID' },
+  '(0088,0140)': { 'tag': '(0088,0140)', 'vr': 'UI', 'vm': '1', 'name': 'StorageMediaFileSetUID' },
+  '(0088,0200)': { 'tag': '(0088,0200)', 'vr': 'SQ', 'vm': '1', 'name': 'IconImageSequence' },
+  '(0088,0904)': { 'tag': '(0088,0904)', 'vr': 'LO', 'vm': '1', 'name': 'TopicTitle' },
+  '(0088,0906)': { 'tag': '(0088,0906)', 'vr': 'ST', 'vm': '1', 'name': 'TopicSubject' },
+  '(0088,0910)': { 'tag': '(0088,0910)', 'vr': 'LO', 'vm': '1', 'name': 'TopicAuthor' },
+  '(0088,0912)': { 'tag': '(0088,0912)', 'vr': 'LO', 'vm': '1-32', 'name': 'TopicKeywords' },
+  '(0100,0410)': { 'tag': '(0100,0410)', 'vr': 'CS', 'vm': '1', 'name': 'SOPInstanceStatus' },
+  '(0100,0420)': { 'tag': '(0100,0420)', 'vr': 'DT', 'vm': '1', 'name': 'SOPAuthorizationDateTime' },
+  '(0100,0424)': { 'tag': '(0100,0424)', 'vr': 'LT', 'vm': '1', 'name': 'SOPAuthorizationComment' },
+  '(0100,0426)': { 'tag': '(0100,0426)', 'vr': 'LO', 'vm': '1', 'name': 'AuthorizationEquipmentCertificationNumber' },
+  '(0400,0005)': { 'tag': '(0400,0005)', 'vr': 'US', 'vm': '1', 'name': 'MACIDNumber' },
+  '(0400,0010)': { 'tag': '(0400,0010)', 'vr': 'UI', 'vm': '1', 'name': 'MACCalculationTransferSyntaxUID' },
+  '(0400,0015)': { 'tag': '(0400,0015)', 'vr': 'CS', 'vm': '1', 'name': 'MACAlgorithm' },
+  '(0400,0020)': { 'tag': '(0400,0020)', 'vr': 'AT', 'vm': '1-n', 'name': 'DataElementsSigned' },
+  '(0400,0100)': { 'tag': '(0400,0100)', 'vr': 'UI', 'vm': '1', 'name': 'DigitalSignatureUID' },
+  '(0400,0105)': { 'tag': '(0400,0105)', 'vr': 'DT', 'vm': '1', 'name': 'DigitalSignatureDateTime' },
+  '(0400,0110)': { 'tag': '(0400,0110)', 'vr': 'CS', 'vm': '1', 'name': 'CertificateType' },
+  '(0400,0115)': { 'tag': '(0400,0115)', 'vr': 'OB', 'vm': '1', 'name': 'CertificateOfSigner' },
+  '(0400,0120)': { 'tag': '(0400,0120)', 'vr': 'OB', 'vm': '1', 'name': 'Signature' },
+  '(0400,0305)': { 'tag': '(0400,0305)', 'vr': 'CS', 'vm': '1', 'name': 'CertifiedTimestampType' },
+  '(0400,0310)': { 'tag': '(0400,0310)', 'vr': 'OB', 'vm': '1', 'name': 'CertifiedTimestamp' },
+  '(0400,0401)': { 'tag': '(0400,0401)', 'vr': 'SQ', 'vm': '1', 'name': 'DigitalSignaturePurposeCodeSequence' },
+  '(0400,0402)': { 'tag': '(0400,0402)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedDigitalSignatureSequence' },
+  '(0400,0403)': { 'tag': '(0400,0403)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSOPInstanceMACSequence' },
+  '(0400,0404)': { 'tag': '(0400,0404)', 'vr': 'OB', 'vm': '1', 'name': 'MAC' },
+  '(0400,0500)': { 'tag': '(0400,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'EncryptedAttributesSequence' },
+  '(0400,0510)': { 'tag': '(0400,0510)', 'vr': 'UI', 'vm': '1', 'name': 'EncryptedContentTransferSyntaxUID' },
+  '(0400,0520)': { 'tag': '(0400,0520)', 'vr': 'OB', 'vm': '1', 'name': 'EncryptedContent' },
+  '(0400,0550)': { 'tag': '(0400,0550)', 'vr': 'SQ', 'vm': '1', 'name': 'ModifiedAttributesSequence' },
+  '(0400,0561)': { 'tag': '(0400,0561)', 'vr': 'SQ', 'vm': '1', 'name': 'OriginalAttributesSequence' },
+  '(0400,0562)': { 'tag': '(0400,0562)', 'vr': 'DT', 'vm': '1', 'name': 'AttributeModificationDateTime' },
+  '(0400,0563)': { 'tag': '(0400,0563)', 'vr': 'LO', 'vm': '1', 'name': 'ModifyingSystem' },
+  '(0400,0564)': { 'tag': '(0400,0564)', 'vr': 'LO', 'vm': '1', 'name': 'SourceOfPreviousValues' },
+  '(0400,0565)': { 'tag': '(0400,0565)', 'vr': 'CS', 'vm': '1', 'name': 'ReasonForTheAttributeModification' },
+  '(1000,xxx0)': { 'tag': '(1000,xxx0)', 'vr': 'US', 'vm': '3', 'name': 'EscapeTriplet' },
+  '(1000,xxx1)': { 'tag': '(1000,xxx1)', 'vr': 'US', 'vm': '3', 'name': 'RunLengthTriplet' },
+  '(1000,xxx2)': { 'tag': '(1000,xxx2)', 'vr': 'US', 'vm': '1', 'name': 'HuffmanTableSize' },
+  '(1000,xxx3)': { 'tag': '(1000,xxx3)', 'vr': 'US', 'vm': '3', 'name': 'HuffmanTableTriplet' },
+  '(1000,xxx4)': { 'tag': '(1000,xxx4)', 'vr': 'US', 'vm': '1', 'name': 'ShiftTableSize' },
+  '(1000,xxx5)': { 'tag': '(1000,xxx5)', 'vr': 'US', 'vm': '3', 'name': 'ShiftTableTriplet' },
+  '(1010,xxxx)': { 'tag': '(1010,xxxx)', 'vr': 'US', 'vm': '1-n', 'name': 'ZonalMap' },
+  '(2000,0010)': { 'tag': '(2000,0010)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfCopies' },
+  '(2000,001E)': { 'tag': '(2000,001E)', 'vr': 'SQ', 'vm': '1', 'name': 'PrinterConfigurationSequence' },
+  '(2000,0020)': { 'tag': '(2000,0020)', 'vr': 'CS', 'vm': '1', 'name': 'PrintPriority' },
+  '(2000,0030)': { 'tag': '(2000,0030)', 'vr': 'CS', 'vm': '1', 'name': 'MediumType' },
+  '(2000,0040)': { 'tag': '(2000,0040)', 'vr': 'CS', 'vm': '1', 'name': 'FilmDestination' },
+  '(2000,0050)': { 'tag': '(2000,0050)', 'vr': 'LO', 'vm': '1', 'name': 'FilmSessionLabel' },
+  '(2000,0060)': { 'tag': '(2000,0060)', 'vr': 'IS', 'vm': '1', 'name': 'MemoryAllocation' },
+  '(2000,0061)': { 'tag': '(2000,0061)', 'vr': 'IS', 'vm': '1', 'name': 'MaximumMemoryAllocation' },
+  '(2000,0062)': { 'tag': '(2000,0062)', 'vr': 'CS', 'vm': '1', 'name': 'ColorImagePrintingFlag' },
+  '(2000,0063)': { 'tag': '(2000,0063)', 'vr': 'CS', 'vm': '1', 'name': 'CollationFlag' },
+  '(2000,0065)': { 'tag': '(2000,0065)', 'vr': 'CS', 'vm': '1', 'name': 'AnnotationFlag' },
+  '(2000,0067)': { 'tag': '(2000,0067)', 'vr': 'CS', 'vm': '1', 'name': 'ImageOverlayFlag' },
+  '(2000,0069)': { 'tag': '(2000,0069)', 'vr': 'CS', 'vm': '1', 'name': 'PresentationLUTFlag' },
+  '(2000,006A)': { 'tag': '(2000,006A)', 'vr': 'CS', 'vm': '1', 'name': 'ImageBoxPresentationLUTFlag' },
+  '(2000,00A0)': { 'tag': '(2000,00A0)', 'vr': 'US', 'vm': '1', 'name': 'MemoryBitDepth' },
+  '(2000,00A1)': { 'tag': '(2000,00A1)', 'vr': 'US', 'vm': '1', 'name': 'PrintingBitDepth' },
+  '(2000,00A2)': { 'tag': '(2000,00A2)', 'vr': 'SQ', 'vm': '1', 'name': 'MediaInstalledSequence' },
+  '(2000,00A4)': { 'tag': '(2000,00A4)', 'vr': 'SQ', 'vm': '1', 'name': 'OtherMediaAvailableSequence' },
+  '(2000,00A8)': { 'tag': '(2000,00A8)', 'vr': 'SQ', 'vm': '1', 'name': 'SupportedImageDisplayFormatsSequence' },
+  '(2000,0500)': { 'tag': '(2000,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedFilmBoxSequence' },
+  '(2000,0510)': { 'tag': '(2000,0510)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedStoredPrintSequence' },
+  '(2010,0010)': { 'tag': '(2010,0010)', 'vr': 'ST', 'vm': '1', 'name': 'ImageDisplayFormat' },
+  '(2010,0030)': { 'tag': '(2010,0030)', 'vr': 'CS', 'vm': '1', 'name': 'AnnotationDisplayFormatID' },
+  '(2010,0040)': { 'tag': '(2010,0040)', 'vr': 'CS', 'vm': '1', 'name': 'FilmOrientation' },
+  '(2010,0050)': { 'tag': '(2010,0050)', 'vr': 'CS', 'vm': '1', 'name': 'FilmSizeID' },
+  '(2010,0052)': { 'tag': '(2010,0052)', 'vr': 'CS', 'vm': '1', 'name': 'PrinterResolutionID' },
+  '(2010,0054)': { 'tag': '(2010,0054)', 'vr': 'CS', 'vm': '1', 'name': 'DefaultPrinterResolutionID' },
+  '(2010,0060)': { 'tag': '(2010,0060)', 'vr': 'CS', 'vm': '1', 'name': 'MagnificationType' },
+  '(2010,0080)': { 'tag': '(2010,0080)', 'vr': 'CS', 'vm': '1', 'name': 'SmoothingType' },
+  '(2010,00A6)': { 'tag': '(2010,00A6)', 'vr': 'CS', 'vm': '1', 'name': 'DefaultMagnificationType' },
+  '(2010,00A7)': { 'tag': '(2010,00A7)', 'vr': 'CS', 'vm': '1-n', 'name': 'OtherMagnificationTypesAvailable' },
+  '(2010,00A8)': { 'tag': '(2010,00A8)', 'vr': 'CS', 'vm': '1', 'name': 'DefaultSmoothingType' },
+  '(2010,00A9)': { 'tag': '(2010,00A9)', 'vr': 'CS', 'vm': '1-n', 'name': 'OtherSmoothingTypesAvailable' },
+  '(2010,0100)': { 'tag': '(2010,0100)', 'vr': 'CS', 'vm': '1', 'name': 'BorderDensity' },
+  '(2010,0110)': { 'tag': '(2010,0110)', 'vr': 'CS', 'vm': '1', 'name': 'EmptyImageDensity' },
+  '(2010,0120)': { 'tag': '(2010,0120)', 'vr': 'US', 'vm': '1', 'name': 'MinDensity' },
+  '(2010,0130)': { 'tag': '(2010,0130)', 'vr': 'US', 'vm': '1', 'name': 'MaxDensity' },
+  '(2010,0140)': { 'tag': '(2010,0140)', 'vr': 'CS', 'vm': '1', 'name': 'Trim' },
+  '(2010,0150)': { 'tag': '(2010,0150)', 'vr': 'ST', 'vm': '1', 'name': 'ConfigurationInformation' },
+  '(2010,0152)': { 'tag': '(2010,0152)', 'vr': 'LT', 'vm': '1', 'name': 'ConfigurationInformationDescription' },
+  '(2010,0154)': { 'tag': '(2010,0154)', 'vr': 'IS', 'vm': '1', 'name': 'MaximumCollatedFilms' },
+  '(2010,015E)': { 'tag': '(2010,015E)', 'vr': 'US', 'vm': '1', 'name': 'Illumination' },
+  '(2010,0160)': { 'tag': '(2010,0160)', 'vr': 'US', 'vm': '1', 'name': 'ReflectedAmbientLight' },
+  '(2010,0376)': { 'tag': '(2010,0376)', 'vr': 'DS', 'vm': '2', 'name': 'PrinterPixelSpacing' },
+  '(2010,0500)': { 'tag': '(2010,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedFilmSessionSequence' },
+  '(2010,0510)': { 'tag': '(2010,0510)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageBoxSequence' },
+  '(2010,0520)': { 'tag': '(2010,0520)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedBasicAnnotationBoxSequence' },
+  '(2020,0010)': { 'tag': '(2020,0010)', 'vr': 'US', 'vm': '1', 'name': 'ImageBoxPosition' },
+  '(2020,0020)': { 'tag': '(2020,0020)', 'vr': 'CS', 'vm': '1', 'name': 'Polarity' },
+  '(2020,0030)': { 'tag': '(2020,0030)', 'vr': 'DS', 'vm': '1', 'name': 'RequestedImageSize' },
+  '(2020,0040)': { 'tag': '(2020,0040)', 'vr': 'CS', 'vm': '1', 'name': 'RequestedDecimateCropBehavior' },
+  '(2020,0050)': { 'tag': '(2020,0050)', 'vr': 'CS', 'vm': '1', 'name': 'RequestedResolutionID' },
+  '(2020,00A0)': { 'tag': '(2020,00A0)', 'vr': 'CS', 'vm': '1', 'name': 'RequestedImageSizeFlag' },
+  '(2020,00A2)': { 'tag': '(2020,00A2)', 'vr': 'CS', 'vm': '1', 'name': 'DecimateCropResult' },
+  '(2020,0110)': { 'tag': '(2020,0110)', 'vr': 'SQ', 'vm': '1', 'name': 'BasicGrayscaleImageSequence' },
+  '(2020,0111)': { 'tag': '(2020,0111)', 'vr': 'SQ', 'vm': '1', 'name': 'BasicColorImageSequence' },
+  '(2020,0130)': { 'tag': '(2020,0130)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageOverlayBoxSequence' },
+  '(2020,0140)': { 'tag': '(2020,0140)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedVOILUTBoxSequence' },
+  '(2030,0010)': { 'tag': '(2030,0010)', 'vr': 'US', 'vm': '1', 'name': 'AnnotationPosition' },
+  '(2030,0020)': { 'tag': '(2030,0020)', 'vr': 'LO', 'vm': '1', 'name': 'TextString' },
+  '(2040,0010)': { 'tag': '(2040,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedOverlayPlaneSequence' },
+  '(2040,0011)': { 'tag': '(2040,0011)', 'vr': 'US', 'vm': '1-99', 'name': 'ReferencedOverlayPlaneGroups' },
+  '(2040,0020)': { 'tag': '(2040,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'OverlayPixelDataSequence' },
+  '(2040,0060)': { 'tag': '(2040,0060)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayMagnificationType' },
+  '(2040,0070)': { 'tag': '(2040,0070)', 'vr': 'CS', 'vm': '1', 'name': 'OverlaySmoothingType' },
+  '(2040,0072)': { 'tag': '(2040,0072)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayOrImageMagnification' },
+  '(2040,0074)': { 'tag': '(2040,0074)', 'vr': 'US', 'vm': '1', 'name': 'MagnifyToNumberOfColumns' },
+  '(2040,0080)': { 'tag': '(2040,0080)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayForegroundDensity' },
+  '(2040,0082)': { 'tag': '(2040,0082)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayBackgroundDensity' },
+  '(2040,0090)': { 'tag': '(2040,0090)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayMode' },
+  '(2040,0100)': { 'tag': '(2040,0100)', 'vr': 'CS', 'vm': '1', 'name': 'ThresholdDensity' },
+  '(2040,0500)': { 'tag': '(2040,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedImageBoxSequenceRetired' },
+  '(2050,0010)': { 'tag': '(2050,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'PresentationLUTSequence' },
+  '(2050,0020)': { 'tag': '(2050,0020)', 'vr': 'CS', 'vm': '1', 'name': 'PresentationLUTShape' },
+  '(2050,0500)': { 'tag': '(2050,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPresentationLUTSequence' },
+  '(2100,0010)': { 'tag': '(2100,0010)', 'vr': 'SH', 'vm': '1', 'name': 'PrintJobID' },
+  '(2100,0020)': { 'tag': '(2100,0020)', 'vr': 'CS', 'vm': '1', 'name': 'ExecutionStatus' },
+  '(2100,0030)': { 'tag': '(2100,0030)', 'vr': 'CS', 'vm': '1', 'name': 'ExecutionStatusInfo' },
+  '(2100,0040)': { 'tag': '(2100,0040)', 'vr': 'DA', 'vm': '1', 'name': 'CreationDate' },
+  '(2100,0050)': { 'tag': '(2100,0050)', 'vr': 'TM', 'vm': '1', 'name': 'CreationTime' },
+  '(2100,0070)': { 'tag': '(2100,0070)', 'vr': 'AE', 'vm': '1', 'name': 'Originator' },
+  '(2100,0140)': { 'tag': '(2100,0140)', 'vr': 'AE', 'vm': '1', 'name': 'DestinationAE' },
+  '(2100,0160)': { 'tag': '(2100,0160)', 'vr': 'SH', 'vm': '1', 'name': 'OwnerID' },
+  '(2100,0170)': { 'tag': '(2100,0170)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFilms' },
+  '(2100,0500)': { 'tag': '(2100,0500)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPrintJobSequencePullStoredPrint' },
+  '(2110,0010)': { 'tag': '(2110,0010)', 'vr': 'CS', 'vm': '1', 'name': 'PrinterStatus' },
+  '(2110,0020)': { 'tag': '(2110,0020)', 'vr': 'CS', 'vm': '1', 'name': 'PrinterStatusInfo' },
+  '(2110,0030)': { 'tag': '(2110,0030)', 'vr': 'LO', 'vm': '1', 'name': 'PrinterName' },
+  '(2110,0099)': { 'tag': '(2110,0099)', 'vr': 'SH', 'vm': '1', 'name': 'PrintQueueID' },
+  '(2120,0010)': { 'tag': '(2120,0010)', 'vr': 'CS', 'vm': '1', 'name': 'QueueStatus' },
+  '(2120,0050)': { 'tag': '(2120,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'PrintJobDescriptionSequence' },
+  '(2120,0070)': { 'tag': '(2120,0070)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedPrintJobSequence' },
+  '(2130,0010)': { 'tag': '(2130,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'PrintManagementCapabilitiesSequence' },
+  '(2130,0015)': { 'tag': '(2130,0015)', 'vr': 'SQ', 'vm': '1', 'name': 'PrinterCharacteristicsSequence' },
+  '(2130,0030)': { 'tag': '(2130,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'FilmBoxContentSequence' },
+  '(2130,0040)': { 'tag': '(2130,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageBoxContentSequence' },
+  '(2130,0050)': { 'tag': '(2130,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'AnnotationContentSequence' },
+  '(2130,0060)': { 'tag': '(2130,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'ImageOverlayBoxContentSequence' },
+  '(2130,0080)': { 'tag': '(2130,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'PresentationLUTContentSequence' },
+  '(2130,00A0)': { 'tag': '(2130,00A0)', 'vr': 'SQ', 'vm': '1', 'name': 'ProposedStudySequence' },
+  '(2130,00C0)': { 'tag': '(2130,00C0)', 'vr': 'SQ', 'vm': '1', 'name': 'OriginalImageSequence' },
+  '(2200,0001)': { 'tag': '(2200,0001)', 'vr': 'CS', 'vm': '1', 'name': 'LabelUsingInformationExtractedFromInstances' },
+  '(2200,0002)': { 'tag': '(2200,0002)', 'vr': 'UT', 'vm': '1', 'name': 'LabelText' },
+  '(2200,0003)': { 'tag': '(2200,0003)', 'vr': 'CS', 'vm': '1', 'name': 'LabelStyleSelection' },
+  '(2200,0004)': { 'tag': '(2200,0004)', 'vr': 'LT', 'vm': '1', 'name': 'MediaDisposition' },
+  '(2200,0005)': { 'tag': '(2200,0005)', 'vr': 'LT', 'vm': '1', 'name': 'BarcodeValue' },
+  '(2200,0006)': { 'tag': '(2200,0006)', 'vr': 'CS', 'vm': '1', 'name': 'BarcodeSymbology' },
+  '(2200,0007)': { 'tag': '(2200,0007)', 'vr': 'CS', 'vm': '1', 'name': 'AllowMediaSplitting' },
+  '(2200,0008)': { 'tag': '(2200,0008)', 'vr': 'CS', 'vm': '1', 'name': 'IncludeNonDICOMObjects' },
+  '(2200,0009)': { 'tag': '(2200,0009)', 'vr': 'CS', 'vm': '1', 'name': 'IncludeDisplayApplication' },
+  '(2200,000A)': { 'tag': '(2200,000A)', 'vr': 'CS', 'vm': '1', 'name': 'PreserveCompositeInstancesAfterMediaCreation' },
+  '(2200,000B)': { 'tag': '(2200,000B)', 'vr': 'US', 'vm': '1', 'name': 'TotalNumberOfPiecesOfMediaCreated' },
+  '(2200,000C)': { 'tag': '(2200,000C)', 'vr': 'LO', 'vm': '1', 'name': 'RequestedMediaApplicationProfile' },
+  '(2200,000D)': { 'tag': '(2200,000D)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedStorageMediaSequence' },
+  '(2200,000E)': { 'tag': '(2200,000E)', 'vr': 'AT', 'vm': '1-n', 'name': 'FailureAttributes' },
+  '(2200,000F)': { 'tag': '(2200,000F)', 'vr': 'CS', 'vm': '1', 'name': 'AllowLossyCompression' },
+  '(2200,0020)': { 'tag': '(2200,0020)', 'vr': 'CS', 'vm': '1', 'name': 'RequestPriority' },
+  '(3002,0002)': { 'tag': '(3002,0002)', 'vr': 'SH', 'vm': '1', 'name': 'RTImageLabel' },
+  '(3002,0003)': { 'tag': '(3002,0003)', 'vr': 'LO', 'vm': '1', 'name': 'RTImageName' },
+  '(3002,0004)': { 'tag': '(3002,0004)', 'vr': 'ST', 'vm': '1', 'name': 'RTImageDescription' },
+  '(3002,000A)': { 'tag': '(3002,000A)', 'vr': 'CS', 'vm': '1', 'name': 'ReportedValuesOrigin' },
+  '(3002,000C)': { 'tag': '(3002,000C)', 'vr': 'CS', 'vm': '1', 'name': 'RTImagePlane' },
+  '(3002,000D)': { 'tag': '(3002,000D)', 'vr': 'DS', 'vm': '3', 'name': 'XRayImageReceptorTranslation' },
+  '(3002,000E)': { 'tag': '(3002,000E)', 'vr': 'DS', 'vm': '1', 'name': 'XRayImageReceptorAngle' },
+  '(3002,0010)': { 'tag': '(3002,0010)', 'vr': 'DS', 'vm': '6', 'name': 'RTImageOrientation' },
+  '(3002,0011)': { 'tag': '(3002,0011)', 'vr': 'DS', 'vm': '2', 'name': 'ImagePlanePixelSpacing' },
+  '(3002,0012)': { 'tag': '(3002,0012)', 'vr': 'DS', 'vm': '2', 'name': 'RTImagePosition' },
+  '(3002,0020)': { 'tag': '(3002,0020)', 'vr': 'SH', 'vm': '1', 'name': 'RadiationMachineName' },
+  '(3002,0022)': { 'tag': '(3002,0022)', 'vr': 'DS', 'vm': '1', 'name': 'RadiationMachineSAD' },
+  '(3002,0024)': { 'tag': '(3002,0024)', 'vr': 'DS', 'vm': '1', 'name': 'RadiationMachineSSD' },
+  '(3002,0026)': { 'tag': '(3002,0026)', 'vr': 'DS', 'vm': '1', 'name': 'RTImageSID' },
+  '(3002,0028)': { 'tag': '(3002,0028)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToReferenceObjectDistance' },
+  '(3002,0029)': { 'tag': '(3002,0029)', 'vr': 'IS', 'vm': '1', 'name': 'FractionNumber' },
+  '(3002,0030)': { 'tag': '(3002,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'ExposureSequence' },
+  '(3002,0032)': { 'tag': '(3002,0032)', 'vr': 'DS', 'vm': '1', 'name': 'MetersetExposure' },
+  '(3002,0034)': { 'tag': '(3002,0034)', 'vr': 'DS', 'vm': '4', 'name': 'DiaphragmPosition' },
+  '(3002,0040)': { 'tag': '(3002,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'FluenceMapSequence' },
+  '(3002,0041)': { 'tag': '(3002,0041)', 'vr': 'CS', 'vm': '1', 'name': 'FluenceDataSource' },
+  '(3002,0042)': { 'tag': '(3002,0042)', 'vr': 'DS', 'vm': '1', 'name': 'FluenceDataScale' },
+  '(3002,0050)': { 'tag': '(3002,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'PrimaryFluenceModeSequence' },
+  '(3002,0051)': { 'tag': '(3002,0051)', 'vr': 'CS', 'vm': '1', 'name': 'FluenceMode' },
+  '(3002,0052)': { 'tag': '(3002,0052)', 'vr': 'SH', 'vm': '1', 'name': 'FluenceModeID' },
+  '(3004,0001)': { 'tag': '(3004,0001)', 'vr': 'CS', 'vm': '1', 'name': 'DVHType' },
+  '(3004,0002)': { 'tag': '(3004,0002)', 'vr': 'CS', 'vm': '1', 'name': 'DoseUnits' },
+  '(3004,0004)': { 'tag': '(3004,0004)', 'vr': 'CS', 'vm': '1', 'name': 'DoseType' },
+  '(3004,0006)': { 'tag': '(3004,0006)', 'vr': 'LO', 'vm': '1', 'name': 'DoseComment' },
+  '(3004,0008)': { 'tag': '(3004,0008)', 'vr': 'DS', 'vm': '3', 'name': 'NormalizationPoint' },
+  '(3004,000A)': { 'tag': '(3004,000A)', 'vr': 'CS', 'vm': '1', 'name': 'DoseSummationType' },
+  '(3004,000C)': { 'tag': '(3004,000C)', 'vr': 'DS', 'vm': '2-n', 'name': 'GridFrameOffsetVector' },
+  '(3004,000E)': { 'tag': '(3004,000E)', 'vr': 'DS', 'vm': '1', 'name': 'DoseGridScaling' },
+  '(3004,0010)': { 'tag': '(3004,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'RTDoseROISequence' },
+  '(3004,0012)': { 'tag': '(3004,0012)', 'vr': 'DS', 'vm': '1', 'name': 'DoseValue' },
+  '(3004,0014)': { 'tag': '(3004,0014)', 'vr': 'CS', 'vm': '1-3', 'name': 'TissueHeterogeneityCorrection' },
+  '(3004,0040)': { 'tag': '(3004,0040)', 'vr': 'DS', 'vm': '3', 'name': 'DVHNormalizationPoint' },
+  '(3004,0042)': { 'tag': '(3004,0042)', 'vr': 'DS', 'vm': '1', 'name': 'DVHNormalizationDoseValue' },
+  '(3004,0050)': { 'tag': '(3004,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'DVHSequence' },
+  '(3004,0052)': { 'tag': '(3004,0052)', 'vr': 'DS', 'vm': '1', 'name': 'DVHDoseScaling' },
+  '(3004,0054)': { 'tag': '(3004,0054)', 'vr': 'CS', 'vm': '1', 'name': 'DVHVolumeUnits' },
+  '(3004,0056)': { 'tag': '(3004,0056)', 'vr': 'IS', 'vm': '1', 'name': 'DVHNumberOfBins' },
+  '(3004,0058)': { 'tag': '(3004,0058)', 'vr': 'DS', 'vm': '2-2n', 'name': 'DVHData' },
+  '(3004,0060)': { 'tag': '(3004,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'DVHReferencedROISequence' },
+  '(3004,0062)': { 'tag': '(3004,0062)', 'vr': 'CS', 'vm': '1', 'name': 'DVHROIContributionType' },
+  '(3004,0070)': { 'tag': '(3004,0070)', 'vr': 'DS', 'vm': '1', 'name': 'DVHMinimumDose' },
+  '(3004,0072)': { 'tag': '(3004,0072)', 'vr': 'DS', 'vm': '1', 'name': 'DVHMaximumDose' },
+  '(3004,0074)': { 'tag': '(3004,0074)', 'vr': 'DS', 'vm': '1', 'name': 'DVHMeanDose' },
+  '(3006,0002)': { 'tag': '(3006,0002)', 'vr': 'SH', 'vm': '1', 'name': 'StructureSetLabel' },
+  '(3006,0004)': { 'tag': '(3006,0004)', 'vr': 'LO', 'vm': '1', 'name': 'StructureSetName' },
+  '(3006,0006)': { 'tag': '(3006,0006)', 'vr': 'ST', 'vm': '1', 'name': 'StructureSetDescription' },
+  '(3006,0008)': { 'tag': '(3006,0008)', 'vr': 'DA', 'vm': '1', 'name': 'StructureSetDate' },
+  '(3006,0009)': { 'tag': '(3006,0009)', 'vr': 'TM', 'vm': '1', 'name': 'StructureSetTime' },
+  '(3006,0010)': { 'tag': '(3006,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedFrameOfReferenceSequence' },
+  '(3006,0012)': { 'tag': '(3006,0012)', 'vr': 'SQ', 'vm': '1', 'name': 'RTReferencedStudySequence' },
+  '(3006,0014)': { 'tag': '(3006,0014)', 'vr': 'SQ', 'vm': '1', 'name': 'RTReferencedSeriesSequence' },
+  '(3006,0016)': { 'tag': '(3006,0016)', 'vr': 'SQ', 'vm': '1', 'name': 'ContourImageSequence' },
+  '(3006,0020)': { 'tag': '(3006,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'StructureSetROISequence' },
+  '(3006,0022)': { 'tag': '(3006,0022)', 'vr': 'IS', 'vm': '1', 'name': 'ROINumber' },
+  '(3006,0024)': { 'tag': '(3006,0024)', 'vr': 'UI', 'vm': '1', 'name': 'ReferencedFrameOfReferenceUID' },
+  '(3006,0026)': { 'tag': '(3006,0026)', 'vr': 'LO', 'vm': '1', 'name': 'ROIName' },
+  '(3006,0028)': { 'tag': '(3006,0028)', 'vr': 'ST', 'vm': '1', 'name': 'ROIDescription' },
+  '(3006,002A)': { 'tag': '(3006,002A)', 'vr': 'IS', 'vm': '3', 'name': 'ROIDisplayColor' },
+  '(3006,002C)': { 'tag': '(3006,002C)', 'vr': 'DS', 'vm': '1', 'name': 'ROIVolume' },
+  '(3006,0030)': { 'tag': '(3006,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'RTRelatedROISequence' },
+  '(3006,0033)': { 'tag': '(3006,0033)', 'vr': 'CS', 'vm': '1', 'name': 'RTROIRelationship' },
+  '(3006,0036)': { 'tag': '(3006,0036)', 'vr': 'CS', 'vm': '1', 'name': 'ROIGenerationAlgorithm' },
+  '(3006,0038)': { 'tag': '(3006,0038)', 'vr': 'LO', 'vm': '1', 'name': 'ROIGenerationDescription' },
+  '(3006,0039)': { 'tag': '(3006,0039)', 'vr': 'SQ', 'vm': '1', 'name': 'ROIContourSequence' },
+  '(3006,0040)': { 'tag': '(3006,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ContourSequence' },
+  '(3006,0042)': { 'tag': '(3006,0042)', 'vr': 'CS', 'vm': '1', 'name': 'ContourGeometricType' },
+  '(3006,0044)': { 'tag': '(3006,0044)', 'vr': 'DS', 'vm': '1', 'name': 'ContourSlabThickness' },
+  '(3006,0045)': { 'tag': '(3006,0045)', 'vr': 'DS', 'vm': '3', 'name': 'ContourOffsetVector' },
+  '(3006,0046)': { 'tag': '(3006,0046)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfContourPoints' },
+  '(3006,0048)': { 'tag': '(3006,0048)', 'vr': 'IS', 'vm': '1', 'name': 'ContourNumber' },
+  '(3006,0049)': { 'tag': '(3006,0049)', 'vr': 'IS', 'vm': '1-n', 'name': 'AttachedContours' },
+  '(3006,0050)': { 'tag': '(3006,0050)', 'vr': 'DS', 'vm': '3-3n', 'name': 'ContourData' },
+  '(3006,0080)': { 'tag': '(3006,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'RTROIObservationsSequence' },
+  '(3006,0082)': { 'tag': '(3006,0082)', 'vr': 'IS', 'vm': '1', 'name': 'ObservationNumber' },
+  '(3006,0084)': { 'tag': '(3006,0084)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedROINumber' },
+  '(3006,0085)': { 'tag': '(3006,0085)', 'vr': 'SH', 'vm': '1', 'name': 'ROIObservationLabel' },
+  '(3006,0086)': { 'tag': '(3006,0086)', 'vr': 'SQ', 'vm': '1', 'name': 'RTROIIdentificationCodeSequence' },
+  '(3006,0088)': { 'tag': '(3006,0088)', 'vr': 'ST', 'vm': '1', 'name': 'ROIObservationDescription' },
+  '(3006,00A0)': { 'tag': '(3006,00A0)', 'vr': 'SQ', 'vm': '1', 'name': 'RelatedRTROIObservationsSequence' },
+  '(3006,00A4)': { 'tag': '(3006,00A4)', 'vr': 'CS', 'vm': '1', 'name': 'RTROIInterpretedType' },
+  '(3006,00A6)': { 'tag': '(3006,00A6)', 'vr': 'PN', 'vm': '1', 'name': 'ROIInterpreter' },
+  '(3006,00B0)': { 'tag': '(3006,00B0)', 'vr': 'SQ', 'vm': '1', 'name': 'ROIPhysicalPropertiesSequence' },
+  '(3006,00B2)': { 'tag': '(3006,00B2)', 'vr': 'CS', 'vm': '1', 'name': 'ROIPhysicalProperty' },
+  '(3006,00B4)': { 'tag': '(3006,00B4)', 'vr': 'DS', 'vm': '1', 'name': 'ROIPhysicalPropertyValue' },
+  '(3006,00B6)': { 'tag': '(3006,00B6)', 'vr': 'SQ', 'vm': '1', 'name': 'ROIElementalCompositionSequence' },
+  '(3006,00B7)': { 'tag': '(3006,00B7)', 'vr': 'US', 'vm': '1', 'name': 'ROIElementalCompositionAtomicNumber' },
+  '(3006,00B8)': { 'tag': '(3006,00B8)', 'vr': 'FL', 'vm': '1', 'name': 'ROIElementalCompositionAtomicMassFraction' },
+  '(3006,00C0)': { 'tag': '(3006,00C0)', 'vr': 'SQ', 'vm': '1', 'name': 'FrameOfReferenceRelationshipSequence' },
+  '(3006,00C2)': { 'tag': '(3006,00C2)', 'vr': 'UI', 'vm': '1', 'name': 'RelatedFrameOfReferenceUID' },
+  '(3006,00C4)': { 'tag': '(3006,00C4)', 'vr': 'CS', 'vm': '1', 'name': 'FrameOfReferenceTransformationType' },
+  '(3006,00C6)': { 'tag': '(3006,00C6)', 'vr': 'DS', 'vm': '16', 'name': 'FrameOfReferenceTransformationMatrix' },
+  '(3006,00C8)': { 'tag': '(3006,00C8)', 'vr': 'LO', 'vm': '1', 'name': 'FrameOfReferenceTransformationComment' },
+  '(3008,0010)': { 'tag': '(3008,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'MeasuredDoseReferenceSequence' },
+  '(3008,0012)': { 'tag': '(3008,0012)', 'vr': 'ST', 'vm': '1', 'name': 'MeasuredDoseDescription' },
+  '(3008,0014)': { 'tag': '(3008,0014)', 'vr': 'CS', 'vm': '1', 'name': 'MeasuredDoseType' },
+  '(3008,0016)': { 'tag': '(3008,0016)', 'vr': 'DS', 'vm': '1', 'name': 'MeasuredDoseValue' },
+  '(3008,0020)': { 'tag': '(3008,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentSessionBeamSequence' },
+  '(3008,0021)': { 'tag': '(3008,0021)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentSessionIonBeamSequence' },
+  '(3008,0022)': { 'tag': '(3008,0022)', 'vr': 'IS', 'vm': '1', 'name': 'CurrentFractionNumber' },
+  '(3008,0024)': { 'tag': '(3008,0024)', 'vr': 'DA', 'vm': '1', 'name': 'TreatmentControlPointDate' },
+  '(3008,0025)': { 'tag': '(3008,0025)', 'vr': 'TM', 'vm': '1', 'name': 'TreatmentControlPointTime' },
+  '(3008,002A)': { 'tag': '(3008,002A)', 'vr': 'CS', 'vm': '1', 'name': 'TreatmentTerminationStatus' },
+  '(3008,002B)': { 'tag': '(3008,002B)', 'vr': 'SH', 'vm': '1', 'name': 'TreatmentTerminationCode' },
+  '(3008,002C)': { 'tag': '(3008,002C)', 'vr': 'CS', 'vm': '1', 'name': 'TreatmentVerificationStatus' },
+  '(3008,0030)': { 'tag': '(3008,0030)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedTreatmentRecordSequence' },
+  '(3008,0032)': { 'tag': '(3008,0032)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedPrimaryMeterset' },
+  '(3008,0033)': { 'tag': '(3008,0033)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedSecondaryMeterset' },
+  '(3008,0036)': { 'tag': '(3008,0036)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredPrimaryMeterset' },
+  '(3008,0037)': { 'tag': '(3008,0037)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredSecondaryMeterset' },
+  '(3008,003A)': { 'tag': '(3008,003A)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedTreatmentTime' },
+  '(3008,003B)': { 'tag': '(3008,003B)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredTreatmentTime' },
+  '(3008,0040)': { 'tag': '(3008,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ControlPointDeliverySequence' },
+  '(3008,0041)': { 'tag': '(3008,0041)', 'vr': 'SQ', 'vm': '1', 'name': 'IonControlPointDeliverySequence' },
+  '(3008,0042)': { 'tag': '(3008,0042)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedMeterset' },
+  '(3008,0044)': { 'tag': '(3008,0044)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredMeterset' },
+  '(3008,0045)': { 'tag': '(3008,0045)', 'vr': 'FL', 'vm': '1', 'name': 'MetersetRateSet' },
+  '(3008,0046)': { 'tag': '(3008,0046)', 'vr': 'FL', 'vm': '1', 'name': 'MetersetRateDelivered' },
+  '(3008,0047)': { 'tag': '(3008,0047)', 'vr': 'FL', 'vm': '1-n', 'name': 'ScanSpotMetersetsDelivered' },
+  '(3008,0048)': { 'tag': '(3008,0048)', 'vr': 'DS', 'vm': '1', 'name': 'DoseRateDelivered' },
+  '(3008,0050)': { 'tag': '(3008,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentSummaryCalculatedDoseReferenceSequence' },
+  '(3008,0052)': { 'tag': '(3008,0052)', 'vr': 'DS', 'vm': '1', 'name': 'CumulativeDoseToDoseReference' },
+  '(3008,0054)': { 'tag': '(3008,0054)', 'vr': 'DA', 'vm': '1', 'name': 'FirstTreatmentDate' },
+  '(3008,0056)': { 'tag': '(3008,0056)', 'vr': 'DA', 'vm': '1', 'name': 'MostRecentTreatmentDate' },
+  '(3008,005A)': { 'tag': '(3008,005A)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFractionsDelivered' },
+  '(3008,0060)': { 'tag': '(3008,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'OverrideSequence' },
+  '(3008,0061)': { 'tag': '(3008,0061)', 'vr': 'AT', 'vm': '1', 'name': 'ParameterSequencePointer' },
+  '(3008,0062)': { 'tag': '(3008,0062)', 'vr': 'AT', 'vm': '1', 'name': 'OverrideParameterPointer' },
+  '(3008,0063)': { 'tag': '(3008,0063)', 'vr': 'IS', 'vm': '1', 'name': 'ParameterItemIndex' },
+  '(3008,0064)': { 'tag': '(3008,0064)', 'vr': 'IS', 'vm': '1', 'name': 'MeasuredDoseReferenceNumber' },
+  '(3008,0065)': { 'tag': '(3008,0065)', 'vr': 'AT', 'vm': '1', 'name': 'ParameterPointer' },
+  '(3008,0066)': { 'tag': '(3008,0066)', 'vr': 'ST', 'vm': '1', 'name': 'OverrideReason' },
+  '(3008,0068)': { 'tag': '(3008,0068)', 'vr': 'SQ', 'vm': '1', 'name': 'CorrectedParameterSequence' },
+  '(3008,006A)': { 'tag': '(3008,006A)', 'vr': 'FL', 'vm': '1', 'name': 'CorrectionValue' },
+  '(3008,0070)': { 'tag': '(3008,0070)', 'vr': 'SQ', 'vm': '1', 'name': 'CalculatedDoseReferenceSequence' },
+  '(3008,0072)': { 'tag': '(3008,0072)', 'vr': 'IS', 'vm': '1', 'name': 'CalculatedDoseReferenceNumber' },
+  '(3008,0074)': { 'tag': '(3008,0074)', 'vr': 'ST', 'vm': '1', 'name': 'CalculatedDoseReferenceDescription' },
+  '(3008,0076)': { 'tag': '(3008,0076)', 'vr': 'DS', 'vm': '1', 'name': 'CalculatedDoseReferenceDoseValue' },
+  '(3008,0078)': { 'tag': '(3008,0078)', 'vr': 'DS', 'vm': '1', 'name': 'StartMeterset' },
+  '(3008,007A)': { 'tag': '(3008,007A)', 'vr': 'DS', 'vm': '1', 'name': 'EndMeterset' },
+  '(3008,0080)': { 'tag': '(3008,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedMeasuredDoseReferenceSequence' },
+  '(3008,0082)': { 'tag': '(3008,0082)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedMeasuredDoseReferenceNumber' },
+  '(3008,0090)': { 'tag': '(3008,0090)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedCalculatedDoseReferenceSequence' },
+  '(3008,0092)': { 'tag': '(3008,0092)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedCalculatedDoseReferenceNumber' },
+  '(3008,00A0)': { 'tag': '(3008,00A0)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamLimitingDeviceLeafPairsSequence' },
+  '(3008,00B0)': { 'tag': '(3008,00B0)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedWedgeSequence' },
+  '(3008,00C0)': { 'tag': '(3008,00C0)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedCompensatorSequence' },
+  '(3008,00D0)': { 'tag': '(3008,00D0)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedBlockSequence' },
+  '(3008,00E0)': { 'tag': '(3008,00E0)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentSummaryMeasuredDoseReferenceSequence' },
+  '(3008,00F0)': { 'tag': '(3008,00F0)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedSnoutSequence' },
+  '(3008,00F2)': { 'tag': '(3008,00F2)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedRangeShifterSequence' },
+  '(3008,00F4)': { 'tag': '(3008,00F4)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedLateralSpreadingDeviceSequence' },
+  '(3008,00F6)': { 'tag': '(3008,00F6)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedRangeModulatorSequence' },
+  '(3008,0100)': { 'tag': '(3008,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedSourceSequence' },
+  '(3008,0105)': { 'tag': '(3008,0105)', 'vr': 'LO', 'vm': '1', 'name': 'SourceSerialNumber' },
+  '(3008,0110)': { 'tag': '(3008,0110)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentSessionApplicationSetupSequence' },
+  '(3008,0116)': { 'tag': '(3008,0116)', 'vr': 'CS', 'vm': '1', 'name': 'ApplicationSetupCheck' },
+  '(3008,0120)': { 'tag': '(3008,0120)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedBrachyAccessoryDeviceSequence' },
+  '(3008,0122)': { 'tag': '(3008,0122)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedBrachyAccessoryDeviceNumber' },
+  '(3008,0130)': { 'tag': '(3008,0130)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedChannelSequence' },
+  '(3008,0132)': { 'tag': '(3008,0132)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedChannelTotalTime' },
+  '(3008,0134)': { 'tag': '(3008,0134)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredChannelTotalTime' },
+  '(3008,0136)': { 'tag': '(3008,0136)', 'vr': 'IS', 'vm': '1', 'name': 'SpecifiedNumberOfPulses' },
+  '(3008,0138)': { 'tag': '(3008,0138)', 'vr': 'IS', 'vm': '1', 'name': 'DeliveredNumberOfPulses' },
+  '(3008,013A)': { 'tag': '(3008,013A)', 'vr': 'DS', 'vm': '1', 'name': 'SpecifiedPulseRepetitionInterval' },
+  '(3008,013C)': { 'tag': '(3008,013C)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveredPulseRepetitionInterval' },
+  '(3008,0140)': { 'tag': '(3008,0140)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedSourceApplicatorSequence' },
+  '(3008,0142)': { 'tag': '(3008,0142)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedSourceApplicatorNumber' },
+  '(3008,0150)': { 'tag': '(3008,0150)', 'vr': 'SQ', 'vm': '1', 'name': 'RecordedChannelShieldSequence' },
+  '(3008,0152)': { 'tag': '(3008,0152)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedChannelShieldNumber' },
+  '(3008,0160)': { 'tag': '(3008,0160)', 'vr': 'SQ', 'vm': '1', 'name': 'BrachyControlPointDeliveredSequence' },
+  '(3008,0162)': { 'tag': '(3008,0162)', 'vr': 'DA', 'vm': '1', 'name': 'SafePositionExitDate' },
+  '(3008,0164)': { 'tag': '(3008,0164)', 'vr': 'TM', 'vm': '1', 'name': 'SafePositionExitTime' },
+  '(3008,0166)': { 'tag': '(3008,0166)', 'vr': 'DA', 'vm': '1', 'name': 'SafePositionReturnDate' },
+  '(3008,0168)': { 'tag': '(3008,0168)', 'vr': 'TM', 'vm': '1', 'name': 'SafePositionReturnTime' },
+  '(3008,0200)': { 'tag': '(3008,0200)', 'vr': 'CS', 'vm': '1', 'name': 'CurrentTreatmentStatus' },
+  '(3008,0202)': { 'tag': '(3008,0202)', 'vr': 'ST', 'vm': '1', 'name': 'TreatmentStatusComment' },
+  '(3008,0220)': { 'tag': '(3008,0220)', 'vr': 'SQ', 'vm': '1', 'name': 'FractionGroupSummarySequence' },
+  '(3008,0223)': { 'tag': '(3008,0223)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedFractionNumber' },
+  '(3008,0224)': { 'tag': '(3008,0224)', 'vr': 'CS', 'vm': '1', 'name': 'FractionGroupType' },
+  '(3008,0230)': { 'tag': '(3008,0230)', 'vr': 'CS', 'vm': '1', 'name': 'BeamStopperPosition' },
+  '(3008,0240)': { 'tag': '(3008,0240)', 'vr': 'SQ', 'vm': '1', 'name': 'FractionStatusSummarySequence' },
+  '(3008,0250)': { 'tag': '(3008,0250)', 'vr': 'DA', 'vm': '1', 'name': 'TreatmentDate' },
+  '(3008,0251)': { 'tag': '(3008,0251)', 'vr': 'TM', 'vm': '1', 'name': 'TreatmentTime' },
+  '(300A,0002)': { 'tag': '(300A,0002)', 'vr': 'SH', 'vm': '1', 'name': 'RTPlanLabel' },
+  '(300A,0003)': { 'tag': '(300A,0003)', 'vr': 'LO', 'vm': '1', 'name': 'RTPlanName' },
+  '(300A,0004)': { 'tag': '(300A,0004)', 'vr': 'ST', 'vm': '1', 'name': 'RTPlanDescription' },
+  '(300A,0006)': { 'tag': '(300A,0006)', 'vr': 'DA', 'vm': '1', 'name': 'RTPlanDate' },
+  '(300A,0007)': { 'tag': '(300A,0007)', 'vr': 'TM', 'vm': '1', 'name': 'RTPlanTime' },
+  '(300A,0009)': { 'tag': '(300A,0009)', 'vr': 'LO', 'vm': '1-n', 'name': 'TreatmentProtocols' },
+  '(300A,000A)': { 'tag': '(300A,000A)', 'vr': 'CS', 'vm': '1', 'name': 'PlanIntent' },
+  '(300A,000B)': { 'tag': '(300A,000B)', 'vr': 'LO', 'vm': '1-n', 'name': 'TreatmentSites' },
+  '(300A,000C)': { 'tag': '(300A,000C)', 'vr': 'CS', 'vm': '1', 'name': 'RTPlanGeometry' },
+  '(300A,000E)': { 'tag': '(300A,000E)', 'vr': 'ST', 'vm': '1', 'name': 'PrescriptionDescription' },
+  '(300A,0010)': { 'tag': '(300A,0010)', 'vr': 'SQ', 'vm': '1', 'name': 'DoseReferenceSequence' },
+  '(300A,0012)': { 'tag': '(300A,0012)', 'vr': 'IS', 'vm': '1', 'name': 'DoseReferenceNumber' },
+  '(300A,0013)': { 'tag': '(300A,0013)', 'vr': 'UI', 'vm': '1', 'name': 'DoseReferenceUID' },
+  '(300A,0014)': { 'tag': '(300A,0014)', 'vr': 'CS', 'vm': '1', 'name': 'DoseReferenceStructureType' },
+  '(300A,0015)': { 'tag': '(300A,0015)', 'vr': 'CS', 'vm': '1', 'name': 'NominalBeamEnergyUnit' },
+  '(300A,0016)': { 'tag': '(300A,0016)', 'vr': 'LO', 'vm': '1', 'name': 'DoseReferenceDescription' },
+  '(300A,0018)': { 'tag': '(300A,0018)', 'vr': 'DS', 'vm': '3', 'name': 'DoseReferencePointCoordinates' },
+  '(300A,001A)': { 'tag': '(300A,001A)', 'vr': 'DS', 'vm': '1', 'name': 'NominalPriorDose' },
+  '(300A,0020)': { 'tag': '(300A,0020)', 'vr': 'CS', 'vm': '1', 'name': 'DoseReferenceType' },
+  '(300A,0021)': { 'tag': '(300A,0021)', 'vr': 'DS', 'vm': '1', 'name': 'ConstraintWeight' },
+  '(300A,0022)': { 'tag': '(300A,0022)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveryWarningDose' },
+  '(300A,0023)': { 'tag': '(300A,0023)', 'vr': 'DS', 'vm': '1', 'name': 'DeliveryMaximumDose' },
+  '(300A,0025)': { 'tag': '(300A,0025)', 'vr': 'DS', 'vm': '1', 'name': 'TargetMinimumDose' },
+  '(300A,0026)': { 'tag': '(300A,0026)', 'vr': 'DS', 'vm': '1', 'name': 'TargetPrescriptionDose' },
+  '(300A,0027)': { 'tag': '(300A,0027)', 'vr': 'DS', 'vm': '1', 'name': 'TargetMaximumDose' },
+  '(300A,0028)': { 'tag': '(300A,0028)', 'vr': 'DS', 'vm': '1', 'name': 'TargetUnderdoseVolumeFraction' },
+  '(300A,002A)': { 'tag': '(300A,002A)', 'vr': 'DS', 'vm': '1', 'name': 'OrganAtRiskFullVolumeDose' },
+  '(300A,002B)': { 'tag': '(300A,002B)', 'vr': 'DS', 'vm': '1', 'name': 'OrganAtRiskLimitDose' },
+  '(300A,002C)': { 'tag': '(300A,002C)', 'vr': 'DS', 'vm': '1', 'name': 'OrganAtRiskMaximumDose' },
+  '(300A,002D)': { 'tag': '(300A,002D)', 'vr': 'DS', 'vm': '1', 'name': 'OrganAtRiskOverdoseVolumeFraction' },
+  '(300A,0040)': { 'tag': '(300A,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ToleranceTableSequence' },
+  '(300A,0042)': { 'tag': '(300A,0042)', 'vr': 'IS', 'vm': '1', 'name': 'ToleranceTableNumber' },
+  '(300A,0043)': { 'tag': '(300A,0043)', 'vr': 'SH', 'vm': '1', 'name': 'ToleranceTableLabel' },
+  '(300A,0044)': { 'tag': '(300A,0044)', 'vr': 'DS', 'vm': '1', 'name': 'GantryAngleTolerance' },
+  '(300A,0046)': { 'tag': '(300A,0046)', 'vr': 'DS', 'vm': '1', 'name': 'BeamLimitingDeviceAngleTolerance' },
+  '(300A,0048)': { 'tag': '(300A,0048)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamLimitingDeviceToleranceSequence' },
+  '(300A,004A)': { 'tag': '(300A,004A)', 'vr': 'DS', 'vm': '1', 'name': 'BeamLimitingDevicePositionTolerance' },
+  '(300A,004B)': { 'tag': '(300A,004B)', 'vr': 'FL', 'vm': '1', 'name': 'SnoutPositionTolerance' },
+  '(300A,004C)': { 'tag': '(300A,004C)', 'vr': 'DS', 'vm': '1', 'name': 'PatientSupportAngleTolerance' },
+  '(300A,004E)': { 'tag': '(300A,004E)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopEccentricAngleTolerance' },
+  '(300A,004F)': { 'tag': '(300A,004F)', 'vr': 'FL', 'vm': '1', 'name': 'TableTopPitchAngleTolerance' },
+  '(300A,0050)': { 'tag': '(300A,0050)', 'vr': 'FL', 'vm': '1', 'name': 'TableTopRollAngleTolerance' },
+  '(300A,0051)': { 'tag': '(300A,0051)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopVerticalPositionTolerance' },
+  '(300A,0052)': { 'tag': '(300A,0052)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLongitudinalPositionTolerance' },
+  '(300A,0053)': { 'tag': '(300A,0053)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLateralPositionTolerance' },
+  '(300A,0055)': { 'tag': '(300A,0055)', 'vr': 'CS', 'vm': '1', 'name': 'RTPlanRelationship' },
+  '(300A,0070)': { 'tag': '(300A,0070)', 'vr': 'SQ', 'vm': '1', 'name': 'FractionGroupSequence' },
+  '(300A,0071)': { 'tag': '(300A,0071)', 'vr': 'IS', 'vm': '1', 'name': 'FractionGroupNumber' },
+  '(300A,0072)': { 'tag': '(300A,0072)', 'vr': 'LO', 'vm': '1', 'name': 'FractionGroupDescription' },
+  '(300A,0078)': { 'tag': '(300A,0078)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFractionsPlanned' },
+  '(300A,0079)': { 'tag': '(300A,0079)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFractionPatternDigitsPerDay' },
+  '(300A,007A)': { 'tag': '(300A,007A)', 'vr': 'IS', 'vm': '1', 'name': 'RepeatFractionCycleLength' },
+  '(300A,007B)': { 'tag': '(300A,007B)', 'vr': 'LT', 'vm': '1', 'name': 'FractionPattern' },
+  '(300A,0080)': { 'tag': '(300A,0080)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfBeams' },
+  '(300A,0082)': { 'tag': '(300A,0082)', 'vr': 'DS', 'vm': '3', 'name': 'BeamDoseSpecificationPoint' },
+  '(300A,0084)': { 'tag': '(300A,0084)', 'vr': 'DS', 'vm': '1', 'name': 'BeamDose' },
+  '(300A,0086)': { 'tag': '(300A,0086)', 'vr': 'DS', 'vm': '1', 'name': 'BeamMeterset' },
+  '(300A,0088)': { 'tag': '(300A,0088)', 'vr': 'FL', 'vm': '1', 'name': 'BeamDosePointDepth' },
+  '(300A,0089)': { 'tag': '(300A,0089)', 'vr': 'FL', 'vm': '1', 'name': 'BeamDosePointEquivalentDepth' },
+  '(300A,008A)': { 'tag': '(300A,008A)', 'vr': 'FL', 'vm': '1', 'name': 'BeamDosePointSSD' },
+  '(300A,00A0)': { 'tag': '(300A,00A0)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfBrachyApplicationSetups' },
+  '(300A,00A2)': { 'tag': '(300A,00A2)', 'vr': 'DS', 'vm': '3', 'name': 'BrachyApplicationSetupDoseSpecificationPoint' },
+  '(300A,00A4)': { 'tag': '(300A,00A4)', 'vr': 'DS', 'vm': '1', 'name': 'BrachyApplicationSetupDose' },
+  '(300A,00B0)': { 'tag': '(300A,00B0)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamSequence' },
+  '(300A,00B2)': { 'tag': '(300A,00B2)', 'vr': 'SH', 'vm': '1', 'name': 'TreatmentMachineName' },
+  '(300A,00B3)': { 'tag': '(300A,00B3)', 'vr': 'CS', 'vm': '1', 'name': 'PrimaryDosimeterUnit' },
+  '(300A,00B4)': { 'tag': '(300A,00B4)', 'vr': 'DS', 'vm': '1', 'name': 'SourceAxisDistance' },
+  '(300A,00B6)': { 'tag': '(300A,00B6)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamLimitingDeviceSequence' },
+  '(300A,00B8)': { 'tag': '(300A,00B8)', 'vr': 'CS', 'vm': '1', 'name': 'RTBeamLimitingDeviceType' },
+  '(300A,00BA)': { 'tag': '(300A,00BA)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToBeamLimitingDeviceDistance' },
+  '(300A,00BB)': { 'tag': '(300A,00BB)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToBeamLimitingDeviceDistance' },
+  '(300A,00BC)': { 'tag': '(300A,00BC)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfLeafJawPairs' },
+  '(300A,00BE)': { 'tag': '(300A,00BE)', 'vr': 'DS', 'vm': '3-n', 'name': 'LeafPositionBoundaries' },
+  '(300A,00C0)': { 'tag': '(300A,00C0)', 'vr': 'IS', 'vm': '1', 'name': 'BeamNumber' },
+  '(300A,00C2)': { 'tag': '(300A,00C2)', 'vr': 'LO', 'vm': '1', 'name': 'BeamName' },
+  '(300A,00C3)': { 'tag': '(300A,00C3)', 'vr': 'ST', 'vm': '1', 'name': 'BeamDescription' },
+  '(300A,00C4)': { 'tag': '(300A,00C4)', 'vr': 'CS', 'vm': '1', 'name': 'BeamType' },
+  '(300A,00C6)': { 'tag': '(300A,00C6)', 'vr': 'CS', 'vm': '1', 'name': 'RadiationType' },
+  '(300A,00C7)': { 'tag': '(300A,00C7)', 'vr': 'CS', 'vm': '1', 'name': 'HighDoseTechniqueType' },
+  '(300A,00C8)': { 'tag': '(300A,00C8)', 'vr': 'IS', 'vm': '1', 'name': 'ReferenceImageNumber' },
+  '(300A,00CA)': { 'tag': '(300A,00CA)', 'vr': 'SQ', 'vm': '1', 'name': 'PlannedVerificationImageSequence' },
+  '(300A,00CC)': { 'tag': '(300A,00CC)', 'vr': 'LO', 'vm': '1-n', 'name': 'ImagingDeviceSpecificAcquisitionParameters' },
+  '(300A,00CE)': { 'tag': '(300A,00CE)', 'vr': 'CS', 'vm': '1', 'name': 'TreatmentDeliveryType' },
+  '(300A,00D0)': { 'tag': '(300A,00D0)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfWedges' },
+  '(300A,00D1)': { 'tag': '(300A,00D1)', 'vr': 'SQ', 'vm': '1', 'name': 'WedgeSequence' },
+  '(300A,00D2)': { 'tag': '(300A,00D2)', 'vr': 'IS', 'vm': '1', 'name': 'WedgeNumber' },
+  '(300A,00D3)': { 'tag': '(300A,00D3)', 'vr': 'CS', 'vm': '1', 'name': 'WedgeType' },
+  '(300A,00D4)': { 'tag': '(300A,00D4)', 'vr': 'SH', 'vm': '1', 'name': 'WedgeID' },
+  '(300A,00D5)': { 'tag': '(300A,00D5)', 'vr': 'IS', 'vm': '1', 'name': 'WedgeAngle' },
+  '(300A,00D6)': { 'tag': '(300A,00D6)', 'vr': 'DS', 'vm': '1', 'name': 'WedgeFactor' },
+  '(300A,00D7)': { 'tag': '(300A,00D7)', 'vr': 'FL', 'vm': '1', 'name': 'TotalWedgeTrayWaterEquivalentThickness' },
+  '(300A,00D8)': { 'tag': '(300A,00D8)', 'vr': 'DS', 'vm': '1', 'name': 'WedgeOrientation' },
+  '(300A,00D9)': { 'tag': '(300A,00D9)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToWedgeTrayDistance' },
+  '(300A,00DA)': { 'tag': '(300A,00DA)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToWedgeTrayDistance' },
+  '(300A,00DB)': { 'tag': '(300A,00DB)', 'vr': 'FL', 'vm': '1', 'name': 'WedgeThinEdgePosition' },
+  '(300A,00DC)': { 'tag': '(300A,00DC)', 'vr': 'SH', 'vm': '1', 'name': 'BolusID' },
+  '(300A,00DD)': { 'tag': '(300A,00DD)', 'vr': 'ST', 'vm': '1', 'name': 'BolusDescription' },
+  '(300A,00E0)': { 'tag': '(300A,00E0)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfCompensators' },
+  '(300A,00E1)': { 'tag': '(300A,00E1)', 'vr': 'SH', 'vm': '1', 'name': 'MaterialID' },
+  '(300A,00E2)': { 'tag': '(300A,00E2)', 'vr': 'DS', 'vm': '1', 'name': 'TotalCompensatorTrayFactor' },
+  '(300A,00E3)': { 'tag': '(300A,00E3)', 'vr': 'SQ', 'vm': '1', 'name': 'CompensatorSequence' },
+  '(300A,00E4)': { 'tag': '(300A,00E4)', 'vr': 'IS', 'vm': '1', 'name': 'CompensatorNumber' },
+  '(300A,00E5)': { 'tag': '(300A,00E5)', 'vr': 'SH', 'vm': '1', 'name': 'CompensatorID' },
+  '(300A,00E6)': { 'tag': '(300A,00E6)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToCompensatorTrayDistance' },
+  '(300A,00E7)': { 'tag': '(300A,00E7)', 'vr': 'IS', 'vm': '1', 'name': 'CompensatorRows' },
+  '(300A,00E8)': { 'tag': '(300A,00E8)', 'vr': 'IS', 'vm': '1', 'name': 'CompensatorColumns' },
+  '(300A,00E9)': { 'tag': '(300A,00E9)', 'vr': 'DS', 'vm': '2', 'name': 'CompensatorPixelSpacing' },
+  '(300A,00EA)': { 'tag': '(300A,00EA)', 'vr': 'DS', 'vm': '2', 'name': 'CompensatorPosition' },
+  '(300A,00EB)': { 'tag': '(300A,00EB)', 'vr': 'DS', 'vm': '1-n', 'name': 'CompensatorTransmissionData' },
+  '(300A,00EC)': { 'tag': '(300A,00EC)', 'vr': 'DS', 'vm': '1-n', 'name': 'CompensatorThicknessData' },
+  '(300A,00ED)': { 'tag': '(300A,00ED)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfBoli' },
+  '(300A,00EE)': { 'tag': '(300A,00EE)', 'vr': 'CS', 'vm': '1', 'name': 'CompensatorType' },
+  '(300A,00F0)': { 'tag': '(300A,00F0)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfBlocks' },
+  '(300A,00F2)': { 'tag': '(300A,00F2)', 'vr': 'DS', 'vm': '1', 'name': 'TotalBlockTrayFactor' },
+  '(300A,00F3)': { 'tag': '(300A,00F3)', 'vr': 'FL', 'vm': '1', 'name': 'TotalBlockTrayWaterEquivalentThickness' },
+  '(300A,00F4)': { 'tag': '(300A,00F4)', 'vr': 'SQ', 'vm': '1', 'name': 'BlockSequence' },
+  '(300A,00F5)': { 'tag': '(300A,00F5)', 'vr': 'SH', 'vm': '1', 'name': 'BlockTrayID' },
+  '(300A,00F6)': { 'tag': '(300A,00F6)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToBlockTrayDistance' },
+  '(300A,00F7)': { 'tag': '(300A,00F7)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToBlockTrayDistance' },
+  '(300A,00F8)': { 'tag': '(300A,00F8)', 'vr': 'CS', 'vm': '1', 'name': 'BlockType' },
+  '(300A,00F9)': { 'tag': '(300A,00F9)', 'vr': 'LO', 'vm': '1', 'name': 'AccessoryCode' },
+  '(300A,00FA)': { 'tag': '(300A,00FA)', 'vr': 'CS', 'vm': '1', 'name': 'BlockDivergence' },
+  '(300A,00FB)': { 'tag': '(300A,00FB)', 'vr': 'CS', 'vm': '1', 'name': 'BlockMountingPosition' },
+  '(300A,00FC)': { 'tag': '(300A,00FC)', 'vr': 'IS', 'vm': '1', 'name': 'BlockNumber' },
+  '(300A,00FE)': { 'tag': '(300A,00FE)', 'vr': 'LO', 'vm': '1', 'name': 'BlockName' },
+  '(300A,0100)': { 'tag': '(300A,0100)', 'vr': 'DS', 'vm': '1', 'name': 'BlockThickness' },
+  '(300A,0102)': { 'tag': '(300A,0102)', 'vr': 'DS', 'vm': '1', 'name': 'BlockTransmission' },
+  '(300A,0104)': { 'tag': '(300A,0104)', 'vr': 'IS', 'vm': '1', 'name': 'BlockNumberOfPoints' },
+  '(300A,0106)': { 'tag': '(300A,0106)', 'vr': 'DS', 'vm': '2-2n', 'name': 'BlockData' },
+  '(300A,0107)': { 'tag': '(300A,0107)', 'vr': 'SQ', 'vm': '1', 'name': 'ApplicatorSequence' },
+  '(300A,0108)': { 'tag': '(300A,0108)', 'vr': 'SH', 'vm': '1', 'name': 'ApplicatorID' },
+  '(300A,0109)': { 'tag': '(300A,0109)', 'vr': 'CS', 'vm': '1', 'name': 'ApplicatorType' },
+  '(300A,010A)': { 'tag': '(300A,010A)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicatorDescription' },
+  '(300A,010C)': { 'tag': '(300A,010C)', 'vr': 'DS', 'vm': '1', 'name': 'CumulativeDoseReferenceCoefficient' },
+  '(300A,010E)': { 'tag': '(300A,010E)', 'vr': 'DS', 'vm': '1', 'name': 'FinalCumulativeMetersetWeight' },
+  '(300A,0110)': { 'tag': '(300A,0110)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfControlPoints' },
+  '(300A,0111)': { 'tag': '(300A,0111)', 'vr': 'SQ', 'vm': '1', 'name': 'ControlPointSequence' },
+  '(300A,0112)': { 'tag': '(300A,0112)', 'vr': 'IS', 'vm': '1', 'name': 'ControlPointIndex' },
+  '(300A,0114)': { 'tag': '(300A,0114)', 'vr': 'DS', 'vm': '1', 'name': 'NominalBeamEnergy' },
+  '(300A,0115)': { 'tag': '(300A,0115)', 'vr': 'DS', 'vm': '1', 'name': 'DoseRateSet' },
+  '(300A,0116)': { 'tag': '(300A,0116)', 'vr': 'SQ', 'vm': '1', 'name': 'WedgePositionSequence' },
+  '(300A,0118)': { 'tag': '(300A,0118)', 'vr': 'CS', 'vm': '1', 'name': 'WedgePosition' },
+  '(300A,011A)': { 'tag': '(300A,011A)', 'vr': 'SQ', 'vm': '1', 'name': 'BeamLimitingDevicePositionSequence' },
+  '(300A,011C)': { 'tag': '(300A,011C)', 'vr': 'DS', 'vm': '2-2n', 'name': 'LeafJawPositions' },
+  '(300A,011E)': { 'tag': '(300A,011E)', 'vr': 'DS', 'vm': '1', 'name': 'GantryAngle' },
+  '(300A,011F)': { 'tag': '(300A,011F)', 'vr': 'CS', 'vm': '1', 'name': 'GantryRotationDirection' },
+  '(300A,0120)': { 'tag': '(300A,0120)', 'vr': 'DS', 'vm': '1', 'name': 'BeamLimitingDeviceAngle' },
+  '(300A,0121)': { 'tag': '(300A,0121)', 'vr': 'CS', 'vm': '1', 'name': 'BeamLimitingDeviceRotationDirection' },
+  '(300A,0122)': { 'tag': '(300A,0122)', 'vr': 'DS', 'vm': '1', 'name': 'PatientSupportAngle' },
+  '(300A,0123)': { 'tag': '(300A,0123)', 'vr': 'CS', 'vm': '1', 'name': 'PatientSupportRotationDirection' },
+  '(300A,0124)': { 'tag': '(300A,0124)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopEccentricAxisDistance' },
+  '(300A,0125)': { 'tag': '(300A,0125)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopEccentricAngle' },
+  '(300A,0126)': { 'tag': '(300A,0126)', 'vr': 'CS', 'vm': '1', 'name': 'TableTopEccentricRotationDirection' },
+  '(300A,0128)': { 'tag': '(300A,0128)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopVerticalPosition' },
+  '(300A,0129)': { 'tag': '(300A,0129)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLongitudinalPosition' },
+  '(300A,012A)': { 'tag': '(300A,012A)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLateralPosition' },
+  '(300A,012C)': { 'tag': '(300A,012C)', 'vr': 'DS', 'vm': '3', 'name': 'IsocenterPosition' },
+  '(300A,012E)': { 'tag': '(300A,012E)', 'vr': 'DS', 'vm': '3', 'name': 'SurfaceEntryPoint' },
+  '(300A,0130)': { 'tag': '(300A,0130)', 'vr': 'DS', 'vm': '1', 'name': 'SourceToSurfaceDistance' },
+  '(300A,0134)': { 'tag': '(300A,0134)', 'vr': 'DS', 'vm': '1', 'name': 'CumulativeMetersetWeight' },
+  '(300A,0140)': { 'tag': '(300A,0140)', 'vr': 'FL', 'vm': '1', 'name': 'TableTopPitchAngle' },
+  '(300A,0142)': { 'tag': '(300A,0142)', 'vr': 'CS', 'vm': '1', 'name': 'TableTopPitchRotationDirection' },
+  '(300A,0144)': { 'tag': '(300A,0144)', 'vr': 'FL', 'vm': '1', 'name': 'TableTopRollAngle' },
+  '(300A,0146)': { 'tag': '(300A,0146)', 'vr': 'CS', 'vm': '1', 'name': 'TableTopRollRotationDirection' },
+  '(300A,0148)': { 'tag': '(300A,0148)', 'vr': 'FL', 'vm': '1', 'name': 'HeadFixationAngle' },
+  '(300A,014A)': { 'tag': '(300A,014A)', 'vr': 'FL', 'vm': '1', 'name': 'GantryPitchAngle' },
+  '(300A,014C)': { 'tag': '(300A,014C)', 'vr': 'CS', 'vm': '1', 'name': 'GantryPitchRotationDirection' },
+  '(300A,014E)': { 'tag': '(300A,014E)', 'vr': 'FL', 'vm': '1', 'name': 'GantryPitchAngleTolerance' },
+  '(300A,0180)': { 'tag': '(300A,0180)', 'vr': 'SQ', 'vm': '1', 'name': 'PatientSetupSequence' },
+  '(300A,0182)': { 'tag': '(300A,0182)', 'vr': 'IS', 'vm': '1', 'name': 'PatientSetupNumber' },
+  '(300A,0183)': { 'tag': '(300A,0183)', 'vr': 'LO', 'vm': '1', 'name': 'PatientSetupLabel' },
+  '(300A,0184)': { 'tag': '(300A,0184)', 'vr': 'LO', 'vm': '1', 'name': 'PatientAdditionalPosition' },
+  '(300A,0190)': { 'tag': '(300A,0190)', 'vr': 'SQ', 'vm': '1', 'name': 'FixationDeviceSequence' },
+  '(300A,0192)': { 'tag': '(300A,0192)', 'vr': 'CS', 'vm': '1', 'name': 'FixationDeviceType' },
+  '(300A,0194)': { 'tag': '(300A,0194)', 'vr': 'SH', 'vm': '1', 'name': 'FixationDeviceLabel' },
+  '(300A,0196)': { 'tag': '(300A,0196)', 'vr': 'ST', 'vm': '1', 'name': 'FixationDeviceDescription' },
+  '(300A,0198)': { 'tag': '(300A,0198)', 'vr': 'SH', 'vm': '1', 'name': 'FixationDevicePosition' },
+  '(300A,0199)': { 'tag': '(300A,0199)', 'vr': 'FL', 'vm': '1', 'name': 'FixationDevicePitchAngle' },
+  '(300A,019A)': { 'tag': '(300A,019A)', 'vr': 'FL', 'vm': '1', 'name': 'FixationDeviceRollAngle' },
+  '(300A,01A0)': { 'tag': '(300A,01A0)', 'vr': 'SQ', 'vm': '1', 'name': 'ShieldingDeviceSequence' },
+  '(300A,01A2)': { 'tag': '(300A,01A2)', 'vr': 'CS', 'vm': '1', 'name': 'ShieldingDeviceType' },
+  '(300A,01A4)': { 'tag': '(300A,01A4)', 'vr': 'SH', 'vm': '1', 'name': 'ShieldingDeviceLabel' },
+  '(300A,01A6)': { 'tag': '(300A,01A6)', 'vr': 'ST', 'vm': '1', 'name': 'ShieldingDeviceDescription' },
+  '(300A,01A8)': { 'tag': '(300A,01A8)', 'vr': 'SH', 'vm': '1', 'name': 'ShieldingDevicePosition' },
+  '(300A,01B0)': { 'tag': '(300A,01B0)', 'vr': 'CS', 'vm': '1', 'name': 'SetupTechnique' },
+  '(300A,01B2)': { 'tag': '(300A,01B2)', 'vr': 'ST', 'vm': '1', 'name': 'SetupTechniqueDescription' },
+  '(300A,01B4)': { 'tag': '(300A,01B4)', 'vr': 'SQ', 'vm': '1', 'name': 'SetupDeviceSequence' },
+  '(300A,01B6)': { 'tag': '(300A,01B6)', 'vr': 'CS', 'vm': '1', 'name': 'SetupDeviceType' },
+  '(300A,01B8)': { 'tag': '(300A,01B8)', 'vr': 'SH', 'vm': '1', 'name': 'SetupDeviceLabel' },
+  '(300A,01BA)': { 'tag': '(300A,01BA)', 'vr': 'ST', 'vm': '1', 'name': 'SetupDeviceDescription' },
+  '(300A,01BC)': { 'tag': '(300A,01BC)', 'vr': 'DS', 'vm': '1', 'name': 'SetupDeviceParameter' },
+  '(300A,01D0)': { 'tag': '(300A,01D0)', 'vr': 'ST', 'vm': '1', 'name': 'SetupReferenceDescription' },
+  '(300A,01D2)': { 'tag': '(300A,01D2)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopVerticalSetupDisplacement' },
+  '(300A,01D4)': { 'tag': '(300A,01D4)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLongitudinalSetupDisplacement' },
+  '(300A,01D6)': { 'tag': '(300A,01D6)', 'vr': 'DS', 'vm': '1', 'name': 'TableTopLateralSetupDisplacement' },
+  '(300A,0200)': { 'tag': '(300A,0200)', 'vr': 'CS', 'vm': '1', 'name': 'BrachyTreatmentTechnique' },
+  '(300A,0202)': { 'tag': '(300A,0202)', 'vr': 'CS', 'vm': '1', 'name': 'BrachyTreatmentType' },
+  '(300A,0206)': { 'tag': '(300A,0206)', 'vr': 'SQ', 'vm': '1', 'name': 'TreatmentMachineSequence' },
+  '(300A,0210)': { 'tag': '(300A,0210)', 'vr': 'SQ', 'vm': '1', 'name': 'SourceSequence' },
+  '(300A,0212)': { 'tag': '(300A,0212)', 'vr': 'IS', 'vm': '1', 'name': 'SourceNumber' },
+  '(300A,0214)': { 'tag': '(300A,0214)', 'vr': 'CS', 'vm': '1', 'name': 'SourceType' },
+  '(300A,0216)': { 'tag': '(300A,0216)', 'vr': 'LO', 'vm': '1', 'name': 'SourceManufacturer' },
+  '(300A,0218)': { 'tag': '(300A,0218)', 'vr': 'DS', 'vm': '1', 'name': 'ActiveSourceDiameter' },
+  '(300A,021A)': { 'tag': '(300A,021A)', 'vr': 'DS', 'vm': '1', 'name': 'ActiveSourceLength' },
+  '(300A,0222)': { 'tag': '(300A,0222)', 'vr': 'DS', 'vm': '1', 'name': 'SourceEncapsulationNominalThickness' },
+  '(300A,0224)': { 'tag': '(300A,0224)', 'vr': 'DS', 'vm': '1', 'name': 'SourceEncapsulationNominalTransmission' },
+  '(300A,0226)': { 'tag': '(300A,0226)', 'vr': 'LO', 'vm': '1', 'name': 'SourceIsotopeName' },
+  '(300A,0228)': { 'tag': '(300A,0228)', 'vr': 'DS', 'vm': '1', 'name': 'SourceIsotopeHalfLife' },
+  '(300A,0229)': { 'tag': '(300A,0229)', 'vr': 'CS', 'vm': '1', 'name': 'SourceStrengthUnits' },
+  '(300A,022A)': { 'tag': '(300A,022A)', 'vr': 'DS', 'vm': '1', 'name': 'ReferenceAirKermaRate' },
+  '(300A,022B)': { 'tag': '(300A,022B)', 'vr': 'DS', 'vm': '1', 'name': 'SourceStrength' },
+  '(300A,022C)': { 'tag': '(300A,022C)', 'vr': 'DA', 'vm': '1', 'name': 'SourceStrengthReferenceDate' },
+  '(300A,022E)': { 'tag': '(300A,022E)', 'vr': 'TM', 'vm': '1', 'name': 'SourceStrengthReferenceTime' },
+  '(300A,0230)': { 'tag': '(300A,0230)', 'vr': 'SQ', 'vm': '1', 'name': 'ApplicationSetupSequence' },
+  '(300A,0232)': { 'tag': '(300A,0232)', 'vr': 'CS', 'vm': '1', 'name': 'ApplicationSetupType' },
+  '(300A,0234)': { 'tag': '(300A,0234)', 'vr': 'IS', 'vm': '1', 'name': 'ApplicationSetupNumber' },
+  '(300A,0236)': { 'tag': '(300A,0236)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicationSetupName' },
+  '(300A,0238)': { 'tag': '(300A,0238)', 'vr': 'LO', 'vm': '1', 'name': 'ApplicationSetupManufacturer' },
+  '(300A,0240)': { 'tag': '(300A,0240)', 'vr': 'IS', 'vm': '1', 'name': 'TemplateNumber' },
+  '(300A,0242)': { 'tag': '(300A,0242)', 'vr': 'SH', 'vm': '1', 'name': 'TemplateType' },
+  '(300A,0244)': { 'tag': '(300A,0244)', 'vr': 'LO', 'vm': '1', 'name': 'TemplateName' },
+  '(300A,0250)': { 'tag': '(300A,0250)', 'vr': 'DS', 'vm': '1', 'name': 'TotalReferenceAirKerma' },
+  '(300A,0260)': { 'tag': '(300A,0260)', 'vr': 'SQ', 'vm': '1', 'name': 'BrachyAccessoryDeviceSequence' },
+  '(300A,0262)': { 'tag': '(300A,0262)', 'vr': 'IS', 'vm': '1', 'name': 'BrachyAccessoryDeviceNumber' },
+  '(300A,0263)': { 'tag': '(300A,0263)', 'vr': 'SH', 'vm': '1', 'name': 'BrachyAccessoryDeviceID' },
+  '(300A,0264)': { 'tag': '(300A,0264)', 'vr': 'CS', 'vm': '1', 'name': 'BrachyAccessoryDeviceType' },
+  '(300A,0266)': { 'tag': '(300A,0266)', 'vr': 'LO', 'vm': '1', 'name': 'BrachyAccessoryDeviceName' },
+  '(300A,026A)': { 'tag': '(300A,026A)', 'vr': 'DS', 'vm': '1', 'name': 'BrachyAccessoryDeviceNominalThickness' },
+  '(300A,026C)': { 'tag': '(300A,026C)', 'vr': 'DS', 'vm': '1', 'name': 'BrachyAccessoryDeviceNominalTransmission' },
+  '(300A,0280)': { 'tag': '(300A,0280)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelSequence' },
+  '(300A,0282)': { 'tag': '(300A,0282)', 'vr': 'IS', 'vm': '1', 'name': 'ChannelNumber' },
+  '(300A,0284)': { 'tag': '(300A,0284)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelLength' },
+  '(300A,0286)': { 'tag': '(300A,0286)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelTotalTime' },
+  '(300A,0288)': { 'tag': '(300A,0288)', 'vr': 'CS', 'vm': '1', 'name': 'SourceMovementType' },
+  '(300A,028A)': { 'tag': '(300A,028A)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPulses' },
+  '(300A,028C)': { 'tag': '(300A,028C)', 'vr': 'DS', 'vm': '1', 'name': 'PulseRepetitionInterval' },
+  '(300A,0290)': { 'tag': '(300A,0290)', 'vr': 'IS', 'vm': '1', 'name': 'SourceApplicatorNumber' },
+  '(300A,0291)': { 'tag': '(300A,0291)', 'vr': 'SH', 'vm': '1', 'name': 'SourceApplicatorID' },
+  '(300A,0292)': { 'tag': '(300A,0292)', 'vr': 'CS', 'vm': '1', 'name': 'SourceApplicatorType' },
+  '(300A,0294)': { 'tag': '(300A,0294)', 'vr': 'LO', 'vm': '1', 'name': 'SourceApplicatorName' },
+  '(300A,0296)': { 'tag': '(300A,0296)', 'vr': 'DS', 'vm': '1', 'name': 'SourceApplicatorLength' },
+  '(300A,0298)': { 'tag': '(300A,0298)', 'vr': 'LO', 'vm': '1', 'name': 'SourceApplicatorManufacturer' },
+  '(300A,029C)': { 'tag': '(300A,029C)', 'vr': 'DS', 'vm': '1', 'name': 'SourceApplicatorWallNominalThickness' },
+  '(300A,029E)': { 'tag': '(300A,029E)', 'vr': 'DS', 'vm': '1', 'name': 'SourceApplicatorWallNominalTransmission' },
+  '(300A,02A0)': { 'tag': '(300A,02A0)', 'vr': 'DS', 'vm': '1', 'name': 'SourceApplicatorStepSize' },
+  '(300A,02A2)': { 'tag': '(300A,02A2)', 'vr': 'IS', 'vm': '1', 'name': 'TransferTubeNumber' },
+  '(300A,02A4)': { 'tag': '(300A,02A4)', 'vr': 'DS', 'vm': '1', 'name': 'TransferTubeLength' },
+  '(300A,02B0)': { 'tag': '(300A,02B0)', 'vr': 'SQ', 'vm': '1', 'name': 'ChannelShieldSequence' },
+  '(300A,02B2)': { 'tag': '(300A,02B2)', 'vr': 'IS', 'vm': '1', 'name': 'ChannelShieldNumber' },
+  '(300A,02B3)': { 'tag': '(300A,02B3)', 'vr': 'SH', 'vm': '1', 'name': 'ChannelShieldID' },
+  '(300A,02B4)': { 'tag': '(300A,02B4)', 'vr': 'LO', 'vm': '1', 'name': 'ChannelShieldName' },
+  '(300A,02B8)': { 'tag': '(300A,02B8)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelShieldNominalThickness' },
+  '(300A,02BA)': { 'tag': '(300A,02BA)', 'vr': 'DS', 'vm': '1', 'name': 'ChannelShieldNominalTransmission' },
+  '(300A,02C8)': { 'tag': '(300A,02C8)', 'vr': 'DS', 'vm': '1', 'name': 'FinalCumulativeTimeWeight' },
+  '(300A,02D0)': { 'tag': '(300A,02D0)', 'vr': 'SQ', 'vm': '1', 'name': 'BrachyControlPointSequence' },
+  '(300A,02D2)': { 'tag': '(300A,02D2)', 'vr': 'DS', 'vm': '1', 'name': 'ControlPointRelativePosition' },
+  '(300A,02D4)': { 'tag': '(300A,02D4)', 'vr': 'DS', 'vm': '3', 'name': 'ControlPoint3DPosition' },
+  '(300A,02D6)': { 'tag': '(300A,02D6)', 'vr': 'DS', 'vm': '1', 'name': 'CumulativeTimeWeight' },
+  '(300A,02E0)': { 'tag': '(300A,02E0)', 'vr': 'CS', 'vm': '1', 'name': 'CompensatorDivergence' },
+  '(300A,02E1)': { 'tag': '(300A,02E1)', 'vr': 'CS', 'vm': '1', 'name': 'CompensatorMountingPosition' },
+  '(300A,02E2)': { 'tag': '(300A,02E2)', 'vr': 'DS', 'vm': '1-n', 'name': 'SourceToCompensatorDistance' },
+  '(300A,02E3)': { 'tag': '(300A,02E3)', 'vr': 'FL', 'vm': '1', 'name': 'TotalCompensatorTrayWaterEquivalentThickness' },
+  '(300A,02E4)': { 'tag': '(300A,02E4)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToCompensatorTrayDistance' },
+  '(300A,02E5)': { 'tag': '(300A,02E5)', 'vr': 'FL', 'vm': '1', 'name': 'CompensatorColumnOffset' },
+  '(300A,02E6)': { 'tag': '(300A,02E6)', 'vr': 'FL', 'vm': '1-n', 'name': 'IsocenterToCompensatorDistances' },
+  '(300A,02E7)': { 'tag': '(300A,02E7)', 'vr': 'FL', 'vm': '1', 'name': 'CompensatorRelativeStoppingPowerRatio' },
+  '(300A,02E8)': { 'tag': '(300A,02E8)', 'vr': 'FL', 'vm': '1', 'name': 'CompensatorMillingToolDiameter' },
+  '(300A,02EA)': { 'tag': '(300A,02EA)', 'vr': 'SQ', 'vm': '1', 'name': 'IonRangeCompensatorSequence' },
+  '(300A,02EB)': { 'tag': '(300A,02EB)', 'vr': 'LT', 'vm': '1', 'name': 'CompensatorDescription' },
+  '(300A,0302)': { 'tag': '(300A,0302)', 'vr': 'IS', 'vm': '1', 'name': 'RadiationMassNumber' },
+  '(300A,0304)': { 'tag': '(300A,0304)', 'vr': 'IS', 'vm': '1', 'name': 'RadiationAtomicNumber' },
+  '(300A,0306)': { 'tag': '(300A,0306)', 'vr': 'SS', 'vm': '1', 'name': 'RadiationChargeState' },
+  '(300A,0308)': { 'tag': '(300A,0308)', 'vr': 'CS', 'vm': '1', 'name': 'ScanMode' },
+  '(300A,030A)': { 'tag': '(300A,030A)', 'vr': 'FL', 'vm': '2', 'name': 'VirtualSourceAxisDistances' },
+  '(300A,030C)': { 'tag': '(300A,030C)', 'vr': 'SQ', 'vm': '1', 'name': 'SnoutSequence' },
+  '(300A,030D)': { 'tag': '(300A,030D)', 'vr': 'FL', 'vm': '1', 'name': 'SnoutPosition' },
+  '(300A,030F)': { 'tag': '(300A,030F)', 'vr': 'SH', 'vm': '1', 'name': 'SnoutID' },
+  '(300A,0312)': { 'tag': '(300A,0312)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfRangeShifters' },
+  '(300A,0314)': { 'tag': '(300A,0314)', 'vr': 'SQ', 'vm': '1', 'name': 'RangeShifterSequence' },
+  '(300A,0316)': { 'tag': '(300A,0316)', 'vr': 'IS', 'vm': '1', 'name': 'RangeShifterNumber' },
+  '(300A,0318)': { 'tag': '(300A,0318)', 'vr': 'SH', 'vm': '1', 'name': 'RangeShifterID' },
+  '(300A,0320)': { 'tag': '(300A,0320)', 'vr': 'CS', 'vm': '1', 'name': 'RangeShifterType' },
+  '(300A,0322)': { 'tag': '(300A,0322)', 'vr': 'LO', 'vm': '1', 'name': 'RangeShifterDescription' },
+  '(300A,0330)': { 'tag': '(300A,0330)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfLateralSpreadingDevices' },
+  '(300A,0332)': { 'tag': '(300A,0332)', 'vr': 'SQ', 'vm': '1', 'name': 'LateralSpreadingDeviceSequence' },
+  '(300A,0334)': { 'tag': '(300A,0334)', 'vr': 'IS', 'vm': '1', 'name': 'LateralSpreadingDeviceNumber' },
+  '(300A,0336)': { 'tag': '(300A,0336)', 'vr': 'SH', 'vm': '1', 'name': 'LateralSpreadingDeviceID' },
+  '(300A,0338)': { 'tag': '(300A,0338)', 'vr': 'CS', 'vm': '1', 'name': 'LateralSpreadingDeviceType' },
+  '(300A,033A)': { 'tag': '(300A,033A)', 'vr': 'LO', 'vm': '1', 'name': 'LateralSpreadingDeviceDescription' },
+  '(300A,033C)': { 'tag': '(300A,033C)', 'vr': 'FL', 'vm': '1', 'name': 'LateralSpreadingDeviceWaterEquivalentThickness' },
+  '(300A,0340)': { 'tag': '(300A,0340)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfRangeModulators' },
+  '(300A,0342)': { 'tag': '(300A,0342)', 'vr': 'SQ', 'vm': '1', 'name': 'RangeModulatorSequence' },
+  '(300A,0344)': { 'tag': '(300A,0344)', 'vr': 'IS', 'vm': '1', 'name': 'RangeModulatorNumber' },
+  '(300A,0346)': { 'tag': '(300A,0346)', 'vr': 'SH', 'vm': '1', 'name': 'RangeModulatorID' },
+  '(300A,0348)': { 'tag': '(300A,0348)', 'vr': 'CS', 'vm': '1', 'name': 'RangeModulatorType' },
+  '(300A,034A)': { 'tag': '(300A,034A)', 'vr': 'LO', 'vm': '1', 'name': 'RangeModulatorDescription' },
+  '(300A,034C)': { 'tag': '(300A,034C)', 'vr': 'SH', 'vm': '1', 'name': 'BeamCurrentModulationID' },
+  '(300A,0350)': { 'tag': '(300A,0350)', 'vr': 'CS', 'vm': '1', 'name': 'PatientSupportType' },
+  '(300A,0352)': { 'tag': '(300A,0352)', 'vr': 'SH', 'vm': '1', 'name': 'PatientSupportID' },
+  '(300A,0354)': { 'tag': '(300A,0354)', 'vr': 'LO', 'vm': '1', 'name': 'PatientSupportAccessoryCode' },
+  '(300A,0356)': { 'tag': '(300A,0356)', 'vr': 'FL', 'vm': '1', 'name': 'FixationLightAzimuthalAngle' },
+  '(300A,0358)': { 'tag': '(300A,0358)', 'vr': 'FL', 'vm': '1', 'name': 'FixationLightPolarAngle' },
+  '(300A,035A)': { 'tag': '(300A,035A)', 'vr': 'FL', 'vm': '1', 'name': 'MetersetRate' },
+  '(300A,0360)': { 'tag': '(300A,0360)', 'vr': 'SQ', 'vm': '1', 'name': 'RangeShifterSettingsSequence' },
+  '(300A,0362)': { 'tag': '(300A,0362)', 'vr': 'LO', 'vm': '1', 'name': 'RangeShifterSetting' },
+  '(300A,0364)': { 'tag': '(300A,0364)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToRangeShifterDistance' },
+  '(300A,0366)': { 'tag': '(300A,0366)', 'vr': 'FL', 'vm': '1', 'name': 'RangeShifterWaterEquivalentThickness' },
+  '(300A,0370)': { 'tag': '(300A,0370)', 'vr': 'SQ', 'vm': '1', 'name': 'LateralSpreadingDeviceSettingsSequence' },
+  '(300A,0372)': { 'tag': '(300A,0372)', 'vr': 'LO', 'vm': '1', 'name': 'LateralSpreadingDeviceSetting' },
+  '(300A,0374)': { 'tag': '(300A,0374)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToLateralSpreadingDeviceDistance' },
+  '(300A,0380)': { 'tag': '(300A,0380)', 'vr': 'SQ', 'vm': '1', 'name': 'RangeModulatorSettingsSequence' },
+  '(300A,0382)': { 'tag': '(300A,0382)', 'vr': 'FL', 'vm': '1', 'name': 'RangeModulatorGatingStartValue' },
+  '(300A,0384)': { 'tag': '(300A,0384)', 'vr': 'FL', 'vm': '1', 'name': 'RangeModulatorGatingStopValue' },
+  '(300A,0386)': { 'tag': '(300A,0386)', 'vr': 'FL', 'vm': '1', 'name': 'RangeModulatorGatingStartWaterEquivalentThickness' },
+  '(300A,0388)': { 'tag': '(300A,0388)', 'vr': 'FL', 'vm': '1', 'name': 'RangeModulatorGatingStopWaterEquivalentThickness' },
+  '(300A,038A)': { 'tag': '(300A,038A)', 'vr': 'FL', 'vm': '1', 'name': 'IsocenterToRangeModulatorDistance' },
+  '(300A,0390)': { 'tag': '(300A,0390)', 'vr': 'SH', 'vm': '1', 'name': 'ScanSpotTuneID' },
+  '(300A,0392)': { 'tag': '(300A,0392)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfScanSpotPositions' },
+  '(300A,0394)': { 'tag': '(300A,0394)', 'vr': 'FL', 'vm': '1-n', 'name': 'ScanSpotPositionMap' },
+  '(300A,0396)': { 'tag': '(300A,0396)', 'vr': 'FL', 'vm': '1-n', 'name': 'ScanSpotMetersetWeights' },
+  '(300A,0398)': { 'tag': '(300A,0398)', 'vr': 'FL', 'vm': '2', 'name': 'ScanningSpotSize' },
+  '(300A,039A)': { 'tag': '(300A,039A)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfPaintings' },
+  '(300A,03A0)': { 'tag': '(300A,03A0)', 'vr': 'SQ', 'vm': '1', 'name': 'IonToleranceTableSequence' },
+  '(300A,03A2)': { 'tag': '(300A,03A2)', 'vr': 'SQ', 'vm': '1', 'name': 'IonBeamSequence' },
+  '(300A,03A4)': { 'tag': '(300A,03A4)', 'vr': 'SQ', 'vm': '1', 'name': 'IonBeamLimitingDeviceSequence' },
+  '(300A,03A6)': { 'tag': '(300A,03A6)', 'vr': 'SQ', 'vm': '1', 'name': 'IonBlockSequence' },
+  '(300A,03A8)': { 'tag': '(300A,03A8)', 'vr': 'SQ', 'vm': '1', 'name': 'IonControlPointSequence' },
+  '(300A,03AA)': { 'tag': '(300A,03AA)', 'vr': 'SQ', 'vm': '1', 'name': 'IonWedgeSequence' },
+  '(300A,03AC)': { 'tag': '(300A,03AC)', 'vr': 'SQ', 'vm': '1', 'name': 'IonWedgePositionSequence' },
+  '(300A,0401)': { 'tag': '(300A,0401)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedSetupImageSequence' },
+  '(300A,0402)': { 'tag': '(300A,0402)', 'vr': 'ST', 'vm': '1', 'name': 'SetupImageComment' },
+  '(300A,0410)': { 'tag': '(300A,0410)', 'vr': 'SQ', 'vm': '1', 'name': 'MotionSynchronizationSequence' },
+  '(300A,0412)': { 'tag': '(300A,0412)', 'vr': 'FL', 'vm': '3', 'name': 'ControlPointOrientation' },
+  '(300A,0420)': { 'tag': '(300A,0420)', 'vr': 'SQ', 'vm': '1', 'name': 'GeneralAccessorySequence' },
+  '(300A,0421)': { 'tag': '(300A,0421)', 'vr': 'SH', 'vm': '1', 'name': 'GeneralAccessoryID' },
+  '(300A,0422)': { 'tag': '(300A,0422)', 'vr': 'ST', 'vm': '1', 'name': 'GeneralAccessoryDescription' },
+  '(300A,0423)': { 'tag': '(300A,0423)', 'vr': 'CS', 'vm': '1', 'name': 'GeneralAccessoryType' },
+  '(300A,0424)': { 'tag': '(300A,0424)', 'vr': 'IS', 'vm': '1', 'name': 'GeneralAccessoryNumber' },
+  '(300A,0431)': { 'tag': '(300A,0431)', 'vr': 'SQ', 'vm': '1', 'name': 'ApplicatorGeometrySequence' },
+  '(300A,0432)': { 'tag': '(300A,0432)', 'vr': 'CS', 'vm': '1', 'name': 'ApplicatorApertureShape' },
+  '(300A,0433)': { 'tag': '(300A,0433)', 'vr': 'FL', 'vm': '1', 'name': 'ApplicatorOpening' },
+  '(300A,0434)': { 'tag': '(300A,0434)', 'vr': 'FL', 'vm': '1', 'name': 'ApplicatorOpeningX' },
+  '(300A,0435)': { 'tag': '(300A,0435)', 'vr': 'FL', 'vm': '1', 'name': 'ApplicatorOpeningY' },
+  '(300A,0436)': { 'tag': '(300A,0436)', 'vr': 'FL', 'vm': '1', 'name': 'SourceToApplicatorMountingPositionDistance' },
+  '(300C,0002)': { 'tag': '(300C,0002)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedRTPlanSequence' },
+  '(300C,0004)': { 'tag': '(300C,0004)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedBeamSequence' },
+  '(300C,0006)': { 'tag': '(300C,0006)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedBeamNumber' },
+  '(300C,0007)': { 'tag': '(300C,0007)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedReferenceImageNumber' },
+  '(300C,0008)': { 'tag': '(300C,0008)', 'vr': 'DS', 'vm': '1', 'name': 'StartCumulativeMetersetWeight' },
+  '(300C,0009)': { 'tag': '(300C,0009)', 'vr': 'DS', 'vm': '1', 'name': 'EndCumulativeMetersetWeight' },
+  '(300C,000A)': { 'tag': '(300C,000A)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedBrachyApplicationSetupSequence' },
+  '(300C,000C)': { 'tag': '(300C,000C)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedBrachyApplicationSetupNumber' },
+  '(300C,000E)': { 'tag': '(300C,000E)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedSourceNumber' },
+  '(300C,0020)': { 'tag': '(300C,0020)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedFractionGroupSequence' },
+  '(300C,0022)': { 'tag': '(300C,0022)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedFractionGroupNumber' },
+  '(300C,0040)': { 'tag': '(300C,0040)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedVerificationImageSequence' },
+  '(300C,0042)': { 'tag': '(300C,0042)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedReferenceImageSequence' },
+  '(300C,0050)': { 'tag': '(300C,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedDoseReferenceSequence' },
+  '(300C,0051)': { 'tag': '(300C,0051)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedDoseReferenceNumber' },
+  '(300C,0055)': { 'tag': '(300C,0055)', 'vr': 'SQ', 'vm': '1', 'name': 'BrachyReferencedDoseReferenceSequence' },
+  '(300C,0060)': { 'tag': '(300C,0060)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedStructureSetSequence' },
+  '(300C,006A)': { 'tag': '(300C,006A)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedPatientSetupNumber' },
+  '(300C,0080)': { 'tag': '(300C,0080)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedDoseSequence' },
+  '(300C,00A0)': { 'tag': '(300C,00A0)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedToleranceTableNumber' },
+  '(300C,00B0)': { 'tag': '(300C,00B0)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedBolusSequence' },
+  '(300C,00C0)': { 'tag': '(300C,00C0)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedWedgeNumber' },
+  '(300C,00D0)': { 'tag': '(300C,00D0)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedCompensatorNumber' },
+  '(300C,00E0)': { 'tag': '(300C,00E0)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedBlockNumber' },
+  '(300C,00F0)': { 'tag': '(300C,00F0)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedControlPointIndex' },
+  '(300C,00F2)': { 'tag': '(300C,00F2)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedControlPointSequence' },
+  '(300C,00F4)': { 'tag': '(300C,00F4)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedStartControlPointIndex' },
+  '(300C,00F6)': { 'tag': '(300C,00F6)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedStopControlPointIndex' },
+  '(300C,0100)': { 'tag': '(300C,0100)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedRangeShifterNumber' },
+  '(300C,0102)': { 'tag': '(300C,0102)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedLateralSpreadingDeviceNumber' },
+  '(300C,0104)': { 'tag': '(300C,0104)', 'vr': 'IS', 'vm': '1', 'name': 'ReferencedRangeModulatorNumber' },
+  '(300E,0002)': { 'tag': '(300E,0002)', 'vr': 'CS', 'vm': '1', 'name': 'ApprovalStatus' },
+  '(300E,0004)': { 'tag': '(300E,0004)', 'vr': 'DA', 'vm': '1', 'name': 'ReviewDate' },
+  '(300E,0005)': { 'tag': '(300E,0005)', 'vr': 'TM', 'vm': '1', 'name': 'ReviewTime' },
+  '(300E,0008)': { 'tag': '(300E,0008)', 'vr': 'PN', 'vm': '1', 'name': 'ReviewerName' },
+  '(4000,0010)': { 'tag': '(4000,0010)', 'vr': 'LT', 'vm': '1', 'name': 'Arbitrary' },
+  '(4000,4000)': { 'tag': '(4000,4000)', 'vr': 'LT', 'vm': '1', 'name': 'TextComments' },
+  '(4008,0040)': { 'tag': '(4008,0040)', 'vr': 'SH', 'vm': '1', 'name': 'ResultsID' },
+  '(4008,0042)': { 'tag': '(4008,0042)', 'vr': 'LO', 'vm': '1', 'name': 'ResultsIDIssuer' },
+  '(4008,0050)': { 'tag': '(4008,0050)', 'vr': 'SQ', 'vm': '1', 'name': 'ReferencedInterpretationSequence' },
+  '(4008,00FF)': { 'tag': '(4008,00FF)', 'vr': 'CS', 'vm': '1', 'name': 'ReportProductionStatusTrial' },
+  '(4008,0100)': { 'tag': '(4008,0100)', 'vr': 'DA', 'vm': '1', 'name': 'InterpretationRecordedDate' },
+  '(4008,0101)': { 'tag': '(4008,0101)', 'vr': 'TM', 'vm': '1', 'name': 'InterpretationRecordedTime' },
+  '(4008,0102)': { 'tag': '(4008,0102)', 'vr': 'PN', 'vm': '1', 'name': 'InterpretationRecorder' },
+  '(4008,0103)': { 'tag': '(4008,0103)', 'vr': 'LO', 'vm': '1', 'name': 'ReferenceToRecordedSound' },
+  '(4008,0108)': { 'tag': '(4008,0108)', 'vr': 'DA', 'vm': '1', 'name': 'InterpretationTranscriptionDate' },
+  '(4008,0109)': { 'tag': '(4008,0109)', 'vr': 'TM', 'vm': '1', 'name': 'InterpretationTranscriptionTime' },
+  '(4008,010A)': { 'tag': '(4008,010A)', 'vr': 'PN', 'vm': '1', 'name': 'InterpretationTranscriber' },
+  '(4008,010B)': { 'tag': '(4008,010B)', 'vr': 'ST', 'vm': '1', 'name': 'InterpretationText' },
+  '(4008,010C)': { 'tag': '(4008,010C)', 'vr': 'PN', 'vm': '1', 'name': 'InterpretationAuthor' },
+  '(4008,0111)': { 'tag': '(4008,0111)', 'vr': 'SQ', 'vm': '1', 'name': 'InterpretationApproverSequence' },
+  '(4008,0112)': { 'tag': '(4008,0112)', 'vr': 'DA', 'vm': '1', 'name': 'InterpretationApprovalDate' },
+  '(4008,0113)': { 'tag': '(4008,0113)', 'vr': 'TM', 'vm': '1', 'name': 'InterpretationApprovalTime' },
+  '(4008,0114)': { 'tag': '(4008,0114)', 'vr': 'PN', 'vm': '1', 'name': 'PhysicianApprovingInterpretation' },
+  '(4008,0115)': { 'tag': '(4008,0115)', 'vr': 'LT', 'vm': '1', 'name': 'InterpretationDiagnosisDescription' },
+  '(4008,0117)': { 'tag': '(4008,0117)', 'vr': 'SQ', 'vm': '1', 'name': 'InterpretationDiagnosisCodeSequence' },
+  '(4008,0118)': { 'tag': '(4008,0118)', 'vr': 'SQ', 'vm': '1', 'name': 'ResultsDistributionListSequence' },
+  '(4008,0119)': { 'tag': '(4008,0119)', 'vr': 'PN', 'vm': '1', 'name': 'DistributionName' },
+  '(4008,011A)': { 'tag': '(4008,011A)', 'vr': 'LO', 'vm': '1', 'name': 'DistributionAddress' },
+  '(4008,0200)': { 'tag': '(4008,0200)', 'vr': 'SH', 'vm': '1', 'name': 'InterpretationID' },
+  '(4008,0202)': { 'tag': '(4008,0202)', 'vr': 'LO', 'vm': '1', 'name': 'InterpretationIDIssuer' },
+  '(4008,0210)': { 'tag': '(4008,0210)', 'vr': 'CS', 'vm': '1', 'name': 'InterpretationTypeID' },
+  '(4008,0212)': { 'tag': '(4008,0212)', 'vr': 'CS', 'vm': '1', 'name': 'InterpretationStatusID' },
+  '(4008,0300)': { 'tag': '(4008,0300)', 'vr': 'ST', 'vm': '1', 'name': 'Impressions' },
+  '(4008,4000)': { 'tag': '(4008,4000)', 'vr': 'ST', 'vm': '1 ', 'name': 'ResultsComments' },
+  '(4010,0001)': { 'tag': '(4010,0001)', 'vr': 'CS', 'vm': '1', 'name': 'LowEnergyDetectors' },
+  '(4010,0002)': { 'tag': '(4010,0002)', 'vr': 'CS', 'vm': '1', 'name': 'HighEnergyDetectors' },
+  '(4010,0004)': { 'tag': '(4010,0004)', 'vr': 'SQ', 'vm': '1', 'name': 'DetectorGeometrySequence' },
+  '(4010,1001)': { 'tag': '(4010,1001)', 'vr': 'SQ', 'vm': '1', 'name': 'ThreatROIVoxelSequence' },
+  '(4010,1004)': { 'tag': '(4010,1004)', 'vr': 'FL', 'vm': '3', 'name': 'ThreatROIBase' },
+  '(4010,1005)': { 'tag': '(4010,1005)', 'vr': 'FL', 'vm': '3', 'name': 'ThreatROIExtents' },
+  '(4010,1006)': { 'tag': '(4010,1006)', 'vr': 'OB', 'vm': '1', 'name': 'ThreatROIBitmap' },
+  '(4010,1007)': { 'tag': '(4010,1007)', 'vr': 'SH', 'vm': '1', 'name': 'RouteSegmentID' },
+  '(4010,1008)': { 'tag': '(4010,1008)', 'vr': 'CS', 'vm': '1', 'name': 'GantryType' },
+  '(4010,1009)': { 'tag': '(4010,1009)', 'vr': 'CS', 'vm': '1', 'name': 'OOIOwnerType' },
+  '(4010,100A)': { 'tag': '(4010,100A)', 'vr': 'SQ', 'vm': '1', 'name': 'RouteSegmentSequence' },
+  '(4010,1010)': { 'tag': '(4010,1010)', 'vr': 'US', 'vm': '1', 'name': 'PotentialThreatObjectID' },
+  '(4010,1011)': { 'tag': '(4010,1011)', 'vr': 'SQ', 'vm': '1', 'name': 'ThreatSequence' },
+  '(4010,1012)': { 'tag': '(4010,1012)', 'vr': 'CS', 'vm': '1', 'name': 'ThreatCategory' },
+  '(4010,1013)': { 'tag': '(4010,1013)', 'vr': 'LT', 'vm': '1', 'name': 'ThreatCategoryDescription' },
+  '(4010,1014)': { 'tag': '(4010,1014)', 'vr': 'CS', 'vm': '1', 'name': 'ATDAbilityAssessment' },
+  '(4010,1015)': { 'tag': '(4010,1015)', 'vr': 'CS', 'vm': '1', 'name': 'ATDAssessmentFlag' },
+  '(4010,1016)': { 'tag': '(4010,1016)', 'vr': 'FL', 'vm': '1', 'name': 'ATDAssessmentProbability' },
+  '(4010,1017)': { 'tag': '(4010,1017)', 'vr': 'FL', 'vm': '1', 'name': 'Mass' },
+  '(4010,1018)': { 'tag': '(4010,1018)', 'vr': 'FL', 'vm': '1', 'name': 'Density' },
+  '(4010,1019)': { 'tag': '(4010,1019)', 'vr': 'FL', 'vm': '1', 'name': 'ZEffective' },
+  '(4010,101A)': { 'tag': '(4010,101A)', 'vr': 'SH', 'vm': '1', 'name': 'BoardingPassID' },
+  '(4010,101B)': { 'tag': '(4010,101B)', 'vr': 'FL', 'vm': '3', 'name': 'CenterOfMass' },
+  '(4010,101C)': { 'tag': '(4010,101C)', 'vr': 'FL', 'vm': '3', 'name': 'CenterOfPTO' },
+  '(4010,101D)': { 'tag': '(4010,101D)', 'vr': 'FL', 'vm': '6-n', 'name': 'BoundingPolygon' },
+  '(4010,101E)': { 'tag': '(4010,101E)', 'vr': 'SH', 'vm': '1', 'name': 'RouteSegmentStartLocationID' },
+  '(4010,101F)': { 'tag': '(4010,101F)', 'vr': 'SH', 'vm': '1', 'name': 'RouteSegmentEndLocationID' },
+  '(4010,1020)': { 'tag': '(4010,1020)', 'vr': 'CS', 'vm': '1', 'name': 'RouteSegmentLocationIDType' },
+  '(4010,1021)': { 'tag': '(4010,1021)', 'vr': 'CS', 'vm': '1-n', 'name': 'AbortReason' },
+  '(4010,1023)': { 'tag': '(4010,1023)', 'vr': 'FL', 'vm': '1', 'name': 'VolumeOfPTO' },
+  '(4010,1024)': { 'tag': '(4010,1024)', 'vr': 'CS', 'vm': '1', 'name': 'AbortFlag' },
+  '(4010,1025)': { 'tag': '(4010,1025)', 'vr': 'DT', 'vm': '1', 'name': 'RouteSegmentStartTime' },
+  '(4010,1026)': { 'tag': '(4010,1026)', 'vr': 'DT', 'vm': '1', 'name': 'RouteSegmentEndTime' },
+  '(4010,1027)': { 'tag': '(4010,1027)', 'vr': 'CS', 'vm': '1', 'name': 'TDRType' },
+  '(4010,1028)': { 'tag': '(4010,1028)', 'vr': 'CS', 'vm': '1', 'name': 'InternationalRouteSegment' },
+  '(4010,1029)': { 'tag': '(4010,1029)', 'vr': 'LO', 'vm': '1-n', 'name': 'ThreatDetectionAlgorithmandVersion' },
+  '(4010,102A)': { 'tag': '(4010,102A)', 'vr': 'SH', 'vm': '1', 'name': 'AssignedLocation' },
+  '(4010,102B)': { 'tag': '(4010,102B)', 'vr': 'DT', 'vm': '1', 'name': 'AlarmDecisionTime' },
+  '(4010,1031)': { 'tag': '(4010,1031)', 'vr': 'CS', 'vm': '1', 'name': 'AlarmDecision' },
+  '(4010,1033)': { 'tag': '(4010,1033)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfTotalObjects' },
+  '(4010,1034)': { 'tag': '(4010,1034)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfAlarmObjects' },
+  '(4010,1037)': { 'tag': '(4010,1037)', 'vr': 'SQ', 'vm': '1', 'name': 'PTORepresentationSequence' },
+  '(4010,1038)': { 'tag': '(4010,1038)', 'vr': 'SQ', 'vm': '1', 'name': 'ATDAssessmentSequence' },
+  '(4010,1039)': { 'tag': '(4010,1039)', 'vr': 'CS', 'vm': '1', 'name': 'TIPType' },
+  '(4010,103A)': { 'tag': '(4010,103A)', 'vr': 'CS', 'vm': '1', 'name': 'DICOSVersion' },
+  '(4010,1041)': { 'tag': '(4010,1041)', 'vr': 'DT', 'vm': '1', 'name': 'OOIOwnerCreationTime' },
+  '(4010,1042)': { 'tag': '(4010,1042)', 'vr': 'CS', 'vm': '1', 'name': 'OOIType' },
+  '(4010,1043)': { 'tag': '(4010,1043)', 'vr': 'FL', 'vm': '3', 'name': 'OOISize' },
+  '(4010,1044)': { 'tag': '(4010,1044)', 'vr': 'CS', 'vm': '1', 'name': 'AcquisitionStatus' },
+  '(4010,1045)': { 'tag': '(4010,1045)', 'vr': 'SQ', 'vm': '1', 'name': 'BasisMaterialsCodeSequence' },
+  '(4010,1046)': { 'tag': '(4010,1046)', 'vr': 'CS', 'vm': '1', 'name': 'PhantomType' },
+  '(4010,1047)': { 'tag': '(4010,1047)', 'vr': 'SQ', 'vm': '1', 'name': 'OOIOwnerSequence' },
+  '(4010,1048)': { 'tag': '(4010,1048)', 'vr': 'CS', 'vm': '1', 'name': 'ScanType' },
+  '(4010,1051)': { 'tag': '(4010,1051)', 'vr': 'LO', 'vm': '1', 'name': 'ItineraryID' },
+  '(4010,1052)': { 'tag': '(4010,1052)', 'vr': 'SH', 'vm': '1', 'name': 'ItineraryIDType' },
+  '(4010,1053)': { 'tag': '(4010,1053)', 'vr': 'LO', 'vm': '1', 'name': 'ItineraryIDAssigningAuthority' },
+  '(4010,1054)': { 'tag': '(4010,1054)', 'vr': 'SH', 'vm': '1', 'name': 'RouteID' },
+  '(4010,1055)': { 'tag': '(4010,1055)', 'vr': 'SH', 'vm': '1', 'name': 'RouteIDAssigningAuthority' },
+  '(4010,1056)': { 'tag': '(4010,1056)', 'vr': 'CS', 'vm': '1', 'name': 'InboundArrivalType' },
+  '(4010,1058)': { 'tag': '(4010,1058)', 'vr': 'SH', 'vm': '1', 'name': 'CarrierID' },
+  '(4010,1059)': { 'tag': '(4010,1059)', 'vr': 'CS', 'vm': '1', 'name': 'CarrierIDAssigningAuthority' },
+  '(4010,1060)': { 'tag': '(4010,1060)', 'vr': 'FL', 'vm': '3', 'name': 'SourceOrientation' },
+  '(4010,1061)': { 'tag': '(4010,1061)', 'vr': 'FL', 'vm': '3', 'name': 'SourcePosition' },
+  '(4010,1062)': { 'tag': '(4010,1062)', 'vr': 'FL', 'vm': '1', 'name': 'BeltHeight' },
+  '(4010,1064)': { 'tag': '(4010,1064)', 'vr': 'SQ', 'vm': '1', 'name': 'AlgorithmRoutingCodeSequence' },
+  '(4010,1067)': { 'tag': '(4010,1067)', 'vr': 'CS', 'vm': '1', 'name': 'TransportClassification' },
+  '(4010,1068)': { 'tag': '(4010,1068)', 'vr': 'LT', 'vm': '1', 'name': 'OOITypeDescriptor' },
+  '(4010,1069)': { 'tag': '(4010,1069)', 'vr': 'FL', 'vm': '1', 'name': 'TotalProcessingTime' },
+  '(4010,106C)': { 'tag': '(4010,106C)', 'vr': 'OB', 'vm': '1', 'name': 'DetectorCalibrationData' },
+  '(4FFE,0001)': { 'tag': '(4FFE,0001)', 'vr': 'SQ', 'vm': '1', 'name': 'MACParametersSequence' },
+  '(50xx,0005)': { 'tag': '(50xx,0005)', 'vr': 'US', 'vm': '1', 'name': 'CurveDimensions' },
+  '(50xx,0010)': { 'tag': '(50xx,0010)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfPoints' },
+  '(50xx,0020)': { 'tag': '(50xx,0020)', 'vr': 'CS', 'vm': '1', 'name': 'TypeOfData' },
+  '(50xx,0022)': { 'tag': '(50xx,0022)', 'vr': 'LO', 'vm': '1', 'name': 'CurveDescription' },
+  '(50xx,0030)': { 'tag': '(50xx,0030)', 'vr': 'SH', 'vm': '1-n', 'name': 'AxisUnits' },
+  '(50xx,0040)': { 'tag': '(50xx,0040)', 'vr': 'SH', 'vm': '1-n', 'name': 'AxisLabels' },
+  '(50xx,0103)': { 'tag': '(50xx,0103)', 'vr': 'US', 'vm': '1', 'name': 'DataValueRepresentation' },
+  '(50xx,0104)': { 'tag': '(50xx,0104)', 'vr': 'US', 'vm': '1-n', 'name': 'MinimumCoordinateValue' },
+  '(50xx,0105)': { 'tag': '(50xx,0105)', 'vr': 'US', 'vm': '1-n', 'name': 'MaximumCoordinateValue' },
+  '(50xx,0106)': { 'tag': '(50xx,0106)', 'vr': 'SH', 'vm': '1-n', 'name': 'CurveRange' },
+  '(50xx,0110)': { 'tag': '(50xx,0110)', 'vr': 'US', 'vm': '1-n', 'name': 'CurveDataDescriptor' },
+  '(50xx,0112)': { 'tag': '(50xx,0112)', 'vr': 'US', 'vm': '1-n', 'name': 'CoordinateStartValue' },
+  '(50xx,0114)': { 'tag': '(50xx,0114)', 'vr': 'US', 'vm': '1-n', 'name': 'CoordinateStepValue' },
+  '(50xx,1001)': { 'tag': '(50xx,1001)', 'vr': 'CS', 'vm': '1', 'name': 'CurveActivationLayer' },
+  '(50xx,2000)': { 'tag': '(50xx,2000)', 'vr': 'US', 'vm': '1', 'name': 'AudioType' },
+  '(50xx,2002)': { 'tag': '(50xx,2002)', 'vr': 'US', 'vm': '1', 'name': 'AudioSampleFormat' },
+  '(50xx,2004)': { 'tag': '(50xx,2004)', 'vr': 'US', 'vm': '1', 'name': 'NumberOfChannels' },
+  '(50xx,2006)': { 'tag': '(50xx,2006)', 'vr': 'UL', 'vm': '1', 'name': 'NumberOfSamples' },
+  '(50xx,2008)': { 'tag': '(50xx,2008)', 'vr': 'UL', 'vm': '1', 'name': 'SampleRate' },
+  '(50xx,200A)': { 'tag': '(50xx,200A)', 'vr': 'UL', 'vm': '1', 'name': 'TotalTime' },
+  '(50xx,200C)': { 'tag': '(50xx,200C)', 'vr': 'OW|OB', 'vm': '1', 'name': 'AudioSampleData' },
+  '(50xx,200E)': { 'tag': '(50xx,200E)', 'vr': 'LT', 'vm': '1 ', 'name': 'AudioComments' },
+  '(50xx,2500)': { 'tag': '(50xx,2500)', 'vr': 'LO', 'vm': '1', 'name': 'CurveLabel' },
+  '(50xx,2600)': { 'tag': '(50xx,2600)', 'vr': 'SQ', 'vm': '1', 'name': 'CurveReferencedOverlaySequence' },
+  '(50xx,2610)': { 'tag': '(50xx,2610)', 'vr': 'US', 'vm': '1', 'name': 'CurveReferencedOverlayGroup' },
+  '(50xx,3000)': { 'tag': '(50xx,3000)', 'vr': 'OW|OB', 'vm': '1', 'name': 'CurveData' },
+  '(5200,9229)': { 'tag': '(5200,9229)', 'vr': 'SQ', 'vm': '1', 'name': 'SharedFunctionalGroupsSequence' },
+  '(5200,9230)': { 'tag': '(5200,9230)', 'vr': 'SQ', 'vm': '1', 'name': 'PerFrameFunctionalGroupsSequence' },
+  '(5400,0100)': { 'tag': '(5400,0100)', 'vr': 'SQ', 'vm': '1', 'name': 'WaveformSequence' },
+  '(5400,0110)': { 'tag': '(5400,0110)', 'vr': 'OB|OW', 'vm': '1', 'name': 'ChannelMinimumValue' },
+  '(5400,0112)': { 'tag': '(5400,0112)', 'vr': 'OB|OW', 'vm': '1', 'name': 'ChannelMaximumValue' },
+  '(5400,1004)': { 'tag': '(5400,1004)', 'vr': 'US', 'vm': '1', 'name': 'WaveformBitsAllocated' },
+  '(5400,1006)': { 'tag': '(5400,1006)', 'vr': 'CS', 'vm': '1', 'name': 'WaveformSampleInterpretation' },
+  '(5400,100A)': { 'tag': '(5400,100A)', 'vr': 'OB|OW', 'vm': '1', 'name': 'WaveformPaddingValue' },
+  '(5400,1010)': { 'tag': '(5400,1010)', 'vr': 'OB|OW', 'vm': '1', 'name': 'WaveformData' },
+  '(5600,0010)': { 'tag': '(5600,0010)', 'vr': 'OF', 'vm': '1', 'name': 'FirstOrderPhaseCorrectionAngle' },
+  '(5600,0020)': { 'tag': '(5600,0020)', 'vr': 'OF', 'vm': '1', 'name': 'SpectroscopyData' },
+  '(60xx,0010)': { 'tag': '(60xx,0010)', 'vr': 'US', 'vm': '1', 'name': 'OverlayRows' },
+  '(60xx,0011)': { 'tag': '(60xx,0011)', 'vr': 'US', 'vm': '1', 'name': 'OverlayColumns' },
+  '(60xx,0012)': { 'tag': '(60xx,0012)', 'vr': 'US', 'vm': '1', 'name': 'OverlayPlanes' },
+  '(60xx,0015)': { 'tag': '(60xx,0015)', 'vr': 'IS', 'vm': '1', 'name': 'NumberOfFramesInOverlay' },
+  '(60xx,0022)': { 'tag': '(60xx,0022)', 'vr': 'LO', 'vm': '1', 'name': 'OverlayDescription' },
+  '(60xx,0040)': { 'tag': '(60xx,0040)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayType' },
+  '(60xx,0045)': { 'tag': '(60xx,0045)', 'vr': 'LO', 'vm': '1', 'name': 'OverlaySubtype' },
+  '(60xx,0050)': { 'tag': '(60xx,0050)', 'vr': 'SS', 'vm': '2', 'name': 'OverlayOrigin' },
+  '(60xx,0051)': { 'tag': '(60xx,0051)', 'vr': 'US', 'vm': '1', 'name': 'ImageFrameOrigin' },
+  '(60xx,0052)': { 'tag': '(60xx,0052)', 'vr': 'US', 'vm': '1', 'name': 'OverlayPlaneOrigin' },
+  '(60xx,0060)': { 'tag': '(60xx,0060)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayCompressionCode' },
+  '(60xx,0061)': { 'tag': '(60xx,0061)', 'vr': 'SH', 'vm': '1', 'name': 'OverlayCompressionOriginator' },
+  '(60xx,0062)': { 'tag': '(60xx,0062)', 'vr': 'SH', 'vm': '1', 'name': 'OverlayCompressionLabel' },
+  '(60xx,0063)': { 'tag': '(60xx,0063)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayCompressionDescription' },
+  '(60xx,0066)': { 'tag': '(60xx,0066)', 'vr': 'AT', 'vm': '1-n', 'name': 'OverlayCompressionStepPointers' },
+  '(60xx,0068)': { 'tag': '(60xx,0068)', 'vr': 'US', 'vm': '1', 'name': 'OverlayRepeatInterval' },
+  '(60xx,0069)': { 'tag': '(60xx,0069)', 'vr': 'US', 'vm': '1', 'name': 'OverlayBitsGrouped' },
+  '(60xx,0100)': { 'tag': '(60xx,0100)', 'vr': 'US', 'vm': '1', 'name': 'OverlayBitsAllocated' },
+  '(60xx,0102)': { 'tag': '(60xx,0102)', 'vr': 'US', 'vm': '1', 'name': 'OverlayBitPosition' },
+  '(60xx,0110)': { 'tag': '(60xx,0110)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayFormat' },
+  '(60xx,0200)': { 'tag': '(60xx,0200)', 'vr': 'US', 'vm': '1', 'name': 'OverlayLocation' },
+  '(60xx,0800)': { 'tag': '(60xx,0800)', 'vr': 'CS', 'vm': '1-n', 'name': 'OverlayCodeLabel' },
+  '(60xx,0802)': { 'tag': '(60xx,0802)', 'vr': 'US', 'vm': '1', 'name': 'OverlayNumberOfTables' },
+  '(60xx,0803)': { 'tag': '(60xx,0803)', 'vr': 'AT', 'vm': '1-n', 'name': 'OverlayCodeTableLocation' },
+  '(60xx,0804)': { 'tag': '(60xx,0804)', 'vr': 'US', 'vm': '1', 'name': 'OverlayBitsForCodeWord' },
+  '(60xx,1001)': { 'tag': '(60xx,1001)', 'vr': 'CS', 'vm': '1', 'name': 'OverlayActivationLayer' },
+  '(60xx,1100)': { 'tag': '(60xx,1100)', 'vr': 'US', 'vm': '1', 'name': 'OverlayDescriptorGray' },
+  '(60xx,1101)': { 'tag': '(60xx,1101)', 'vr': 'US', 'vm': '1', 'name': 'OverlayDescriptorRed' },
+  '(60xx,1102)': { 'tag': '(60xx,1102)', 'vr': 'US', 'vm': '1', 'name': 'OverlayDescriptorGreen' },
+  '(60xx,1103)': { 'tag': '(60xx,1103)', 'vr': 'US', 'vm': '1', 'name': 'OverlayDescriptorBlue' },
+  '(60xx,1200)': { 'tag': '(60xx,1200)', 'vr': 'US', 'vm': '1-n', 'name': 'OverlaysGray' },
+  '(60xx,1201)': { 'tag': '(60xx,1201)', 'vr': 'US', 'vm': '1-n', 'name': 'OverlaysRed' },
+  '(60xx,1202)': { 'tag': '(60xx,1202)', 'vr': 'US', 'vm': '1-n', 'name': 'OverlaysGreen' },
+  '(60xx,1203)': { 'tag': '(60xx,1203)', 'vr': 'US', 'vm': '1-n', 'name': 'OverlaysBlue' },
+  '(60xx,1301)': { 'tag': '(60xx,1301)', 'vr': 'IS', 'vm': '1', 'name': 'ROIArea' },
+  '(60xx,1302)': { 'tag': '(60xx,1302)', 'vr': 'DS', 'vm': '1', 'name': 'ROIMean' },
+  '(60xx,1303)': { 'tag': '(60xx,1303)', 'vr': 'DS', 'vm': '1', 'name': 'ROIStandardDeviation' },
+  '(60xx,1500)': { 'tag': '(60xx,1500)', 'vr': 'LO', 'vm': '1', 'name': 'OverlayLabel' },
+  '(60xx,3000)': { 'tag': '(60xx,3000)', 'vr': 'OB|OW', 'vm': '1', 'name': 'OverlayData' },
+  '(60xx,4000)': { 'tag': '(60xx,4000)', 'vr': 'LT', 'vm': '1', 'name': 'OverlayComments' },
+  '(7FE0,0010)': { 'tag': '(7FE0,0010)', 'vr': 'OW|OB', 'vm': '1', 'name': 'PixelData' },
+  '(7FE0,0020)': { 'tag': '(7FE0,0020)', 'vr': 'OW', 'vm': '1', 'name': 'CoefficientsSDVN' },
+  '(7FE0,0030)': { 'tag': '(7FE0,0030)', 'vr': 'OW', 'vm': '1', 'name': 'CoefficientsSDHN' },
+  '(7FE0,0040)': { 'tag': '(7FE0,0040)', 'vr': 'OW', 'vm': '1', 'name': 'CoefficientsSDDN' },
+  '(7Fxx,0010)': { 'tag': '(7Fxx,0010)', 'vr': 'OW|OB', 'vm': '1', 'name': 'VariablePixelData' },
+  '(7Fxx,0011)': { 'tag': '(7Fxx,0011)', 'vr': 'US', 'vm': '1', 'name': 'VariableNextDataGroup' },
+  '(7Fxx,0020)': { 'tag': '(7Fxx,0020)', 'vr': 'OW', 'vm': '1', 'name': 'VariableCoefficientsSDVN' },
+  '(7Fxx,0030)': { 'tag': '(7Fxx,0030)', 'vr': 'OW', 'vm': '1', 'name': 'VariableCoefficientsSDHN' },
+  '(7Fxx,0040)': { 'tag': '(7Fxx,0040)', 'vr': 'OW', 'vm': '1', 'name': 'VariableCoefficientsSDDN' },
+  '(FFFA,FFFA)': { 'tag': '(FFFA,FFFA)', 'vr': 'SQ', 'vm': '1', 'name': 'DigitalSignaturesSequence' },
+  '(FFFC,FFFC)': { 'tag': '(FFFC,FFFC)', 'vr': 'OB', 'vm': '1', 'name': 'DataSetTrailingPadding' },
+  '(FFFE,E000)': { 'tag': '(FFFE,E000)', 'vr': '', 'vm': '1', 'name': 'Item' },
+  '(FFFE,E00D)': { 'tag': '(FFFE,E00D)', 'vr': '', 'vm': '1', 'name': 'ItemDelimitationItem' },
+  '(FFFE,E0DD)': { 'tag': '(FFFE,E0DD)', 'vr': '', 'vm': '1', 'name': 'SequenceDelimitationItem' }
+}
+
diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index a0dbc70b..d8a7de18 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -9,7 +9,7 @@
     />
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath+'#toolbar=0'" width="100%" height="100%" frameborder="0" /> -->
-    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <!--    <pdf-->
     <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
     <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
@@ -40,7 +40,8 @@ export default {
   },
   data() {
     return {
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
new file mode 100644
index 00000000..c863b242
--- /dev/null
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -0,0 +1,511 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    v-loading="btnLoading"
+    class="downloadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <div class="top">
+      <span>{{ $t('download:top:title') }}</span>
+      <div class="btnBox">
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom"
+          @click.stop="getIRReadingDownloadStudyInfo('dicom')"
+        >
+          {{ $t('download:button:downloadDicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('noneDicom')"
+        >
+          {{ $t('download:button:downloadNonedicom') }}
+        </el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          v-if="hasDicom || hasNonedicom"
+          @click.stop="getIRReadingDownloadStudyInfo('all')"
+        >
+          {{ $t('download:button:downloadAll') }}
+        </el-button>
+      </div>
+    </div>
+    <div class="tip">
+      <i class="el-icon-warning-outline"></i>
+      <div v-html="$t('download:tip:message')"></div>
+    </div>
+    <!--上传列表@selection-change="handleSelectionChange"-->
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 85 }"
+      height="100"
+      :data="list"
+      :loading="loading"
+      class="dicomFiles-table"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!-- <el-table-column
+        type="selection"
+        width="55"
+        :selectable="handleSelectable"
+      /> -->
+      <el-table-column type="index" width="40" />
+      <!--受试者-->
+      <el-table-column
+        :label="$t('download:table:subjectCode')"
+        min-width="130"
+        prop="SubjectCode"
+        show-overflow-tooltip
+      />
+      <!--任务名称-->
+      <el-table-column
+        :label="$t('download:table:taskName')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="TaskBlindName"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        :label="$t('download:table:studyType')"
+        min-width="130"
+        show-overflow-tooltip
+        prop="IsDicom"
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <span>{{ $fd('IsDicom', scope.row.IsDicom) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('download:table:orginalStudyListNum')"
+        min-width="150"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              (scope.row.IsDicom &&
+                scope.row.DicomStudyList &&
+                scope.row.DicomStudyList.length >= 1) ||
+              (!scope.row.IsDicom &&
+                scope.row.NoneDicomStudyList &&
+                scope.row.NoneDicomStudyList.length >= 1)
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row)"
+          >
+            <span>{{
+              scope.row.IsDicom
+                ? scope.row.DicomStudyList.length
+                : scope.row.NoneDicomStudyList.length
+            }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            icon="el-icon-view"
+            :title="$t('download:button:preview')"
+            @click.stop="preview(scope.row)"
+          />
+          <!--下载--->
+          <el-button
+            circle
+            icon="el-icon-download"
+            :title="$t('download:button:download')"
+            @click.stop="getIRReadingDownloadStudyInfo('one', scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :modelList="modelList"
+      :bodyPart="bodyPart"
+      :IsDicom="IsDicom"
+      :visitTaskId="modelTaskId"
+    />
+  </el-dialog>
+</template>
+<script>
+import {
+  getSubjectImageDownloadSelectList,
+  getIRReadingDownloadStudyInfo,
+  downloadImageSuccess,
+} from '@/api/load.js'
+import studyView from '@/components/uploadDicomAndNonedicom/study-view.vue'
+import store from '@/store'
+import { downLoadFile } from '@/utils/stream.js'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'downloadDicomAndNonedicom',
+  components: {
+    'study-view': studyView,
+  },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    TaskId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+  },
+  data() {
+    return {
+      title: null,
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      btnLoading: false,
+      hasDicom: false,
+      hasNonedicom: false,
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '1000px',
+        title: '',
+        appendToBody: true,
+      },
+      modelList: [],
+      IsDicom: true,
+      open: null,
+      downloadId: null,
+      IsReadingTaskViewInOrder: 0, // 阅片规则
+      bodyPart: [],
+      modelTaskId: null,
+    }
+  },
+  async mounted() {
+    this.getList()
+    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    beforeClose() {
+      this.$emit('update:visible', false)
+    },
+    // 获取列表
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.TaskId) {
+          this.searchData.VisitTaskId = this.TaskId
+        }
+        this.loading = true
+        let res = await getSubjectImageDownloadSelectList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+          this.hasDicom = this.list.some((item) => item.IsDicom)
+          this.hasNonedicom = this.list.some((item) => !item.IsDicom)
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 获取下载文件信息
+    async getIRReadingDownloadStudyInfo(type, row) {
+      try {
+        let data = {
+          SubjectId: this.SubjectId || this.list[0].SubjectId,
+          TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
+          SubjectCode: this.SubjectCode || this.list[0].SubjectCode,
+          SubjectVisitTaskList: [],
+          DicomStudyIdList: [],
+          NoneDicomStudyIdList: [],
+        }
+        if (type === 'dicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              item.IsDicom &&
+              item.DicomStudyList &&
+              item.DicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.DicomStudyList.map((d) => d.Id)
+              data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'noneDicom' || type === 'all') {
+          this.list.forEach((item) => {
+            if (
+              !item.IsDicom &&
+              item.NoneDicomStudyList &&
+              item.NoneDicomStudyList.length > 0
+            ) {
+              data.SubjectVisitTaskList.push({
+                SubjectvisitId: item.SourceSubjectVisitId,
+                TaskId: item.VisitTaskId,
+              })
+              let arr = item.NoneDicomStudyList.map((d) => d.Id)
+              data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+            }
+          })
+        }
+        if (type === 'one') {
+          if (
+            row.IsDicom &&
+            row.DicomStudyList &&
+            row.DicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.DicomStudyList.map((d) => d.Id)
+            data.DicomStudyIdList = [...data.DicomStudyIdList, ...arr]
+          }
+          if (
+            !row.IsDicom &&
+            row.NoneDicomStudyList &&
+            row.NoneDicomStudyList.length > 0
+          ) {
+            data.SubjectVisitTaskList.push({
+              SubjectvisitId: row.SourceSubjectVisitId,
+              TaskId: row.VisitTaskId,
+            })
+            let arr = row.NoneDicomStudyList.map((d) => d.Id)
+            data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
+          }
+        }
+        this.btnLoading = true
+        let res = await getIRReadingDownloadStudyInfo(data)
+        this.btnLoading = false
+        if (res.IsSuccess) {
+          this.downloadId = res.OtherInfo.PreDownloadId
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder
+          this.downloadImage(res.Result)
+        }
+      } catch (err) {
+        this.btnLoading = false
+        console.log(err)
+      }
+    },
+    // 打包下载
+    async downloadImage(data) {
+      try {
+        let { files, name, fileType } = this.formatDownloadFile(data)
+        let res = await downLoadFile(files, name, 'zip')
+        if (res && this.downloadId) {
+          this.downloadImageSuccess()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 格式化下载文件路径
+    formatDownloadFile(list) {
+      let files = [],
+        name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
+      if (this.IsReadingTaskViewInOrder === 1) {
+        name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
+      }
+      if (this.IsReadingTaskViewInOrder === 0) {
+        name = `${list[0].TaskBlindName}.zip`
+      }
+      list.forEach((data) => {
+        if (data.StudyList && data.StudyList.length > 0) {
+          let StudyList = data.StudyList
+          StudyList.forEach((study) => {
+            if (study.SeriesList.length > 0) {
+              study.SeriesList.forEach((series) => {
+                if (series.InstancePathList.length > 0) {
+                  series.InstancePathList.forEach((instance) => {
+                    let fileName = instance.Path.split('/').pop()
+                    let obj = {
+                      name: `${data.SubjectCode}/${
+                        data.TaskBlindName
+                      }/${this.$fd('IsDicom', true)}/${
+                        study.StudyCode
+                      }/${fileName}`,
+                      url: this.OSSclientConfig.basePath + instance.Path,
+                    }
+                    if (this.IsReadingTaskViewInOrder === 0) {
+                      obj = {
+                        name: `${data.TaskBlindName}/${this.$fd(
+                          'IsDicom',
+                          true
+                        )}/${fileName}`,
+                        url: this.OSSclientConfig.basePath + instance.Path,
+                      }
+                    }
+                    files.push(obj)
+                  })
+                }
+              })
+            }
+          })
+        }
+        if (data.NoneDicomStudyList && data.NoneDicomStudyList.length > 0) {
+          let NoneDicomStudyList = data.NoneDicomStudyList
+          // 多文件
+          NoneDicomStudyList.forEach((study) => {
+            if (study.FileList.length > 0) {
+              study.FileList.forEach((item) => {
+                let obj = {
+                  name: `${data.SubjectCode}/${data.TaskBlindName}/${this.$fd(
+                    'IsDicom',
+                    false
+                  )}/${study.StudyCode}/${item.FileName}`,
+                  url: this.OSSclientConfig.basePath + item.Path,
+                }
+                if (this.IsReadingTaskViewInOrder === 0) {
+                  obj = {
+                    name: `${data.TaskBlindName}/${this.$fd(
+                      'IsDicom',
+                      false
+                    )}/${item.FileName}`,
+                    url: this.OSSclientConfig.basePath + item.Path,
+                  }
+                }
+                files.push(obj)
+              })
+            }
+          })
+        }
+      })
+      return { files, name }
+    },
+    // 影像下载成功确认
+    async downloadImageSuccess() {
+      try {
+        let params = {
+          TrialImageDownloadId: this.downloadId,
+        }
+        await downloadImageSuccess(params)
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    handleOpenDialog(item) {
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      if (item.IsDicom) {
+        this.modelList = item.DicomStudyList
+      } else {
+        this.modelList = item.NoneDicomStudyList
+        this.modelList.forEach((data) => {
+          data.SourceSubjectVisitId = item.SourceSubjectVisitId
+        })
+      }
+      this.modelTaskId = item.VisitTaskId
+      this.IsDicom = item.IsDicom
+      this.model_cfg.visible = true
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    preview(row) {
+      if (!row.IsDicom) {
+        this.handlePreviewNoneDicomFiles(row)
+      } else {
+        this.handleViewReadingImages(row)
+      }
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/feedBack/index.vue b/src/components/feedBack/index.vue
index 2077ce06..4c92febc 100644
--- a/src/components/feedBack/index.vue
+++ b/src/components/feedBack/index.vue
@@ -52,7 +52,7 @@
             class="el-icon-warning-outline"
             style="color: #f56c6c; font-size: 24px"
           ></i>
-          <span>{{ $t("feedBack:imgfail:tip") }}</span>
+          <span>{{ $t('feedBack:imgfail:tip') }}</span>
         </p>
         <!-- 问题反馈 -->
         <el-form-item
@@ -140,7 +140,7 @@
       <div slot="footer" v-if="type !== 'detail' || isImgfail">
         <!-- 取消 -->
         <el-button size="small" @click.stop="cancel">
-          {{ $t("feedBack:button:cancel") }}
+          {{ $t('feedBack:button:cancel') }}
         </el-button>
         <!-- 保存 -->
         <el-button
@@ -149,21 +149,21 @@
           @click.stop="save"
           :loading="loading"
         >
-          {{ $t("feedBack:button:save") }}
+          {{ $t('feedBack:button:save') }}
         </el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import uploadImage from "./uploadImage.vue";
+import uploadImage from './uploadImage.vue'
 import {
   addOrUpdateUserFeedBack,
   getUserFeedBackInfo,
   batchUpdateFeedBackState,
-} from "@/api/trials.js";
+} from '@/api/trials.js'
 export default {
-  name: "FB",
+  name: 'FB',
   components: { uploadImage },
   data() {
     return {
@@ -195,131 +195,131 @@ export default {
         QuestionType: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
         ],
         QuestionDescription: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
               if (value.length < 5) {
                 callback(
-                  new Error(this.$t("feedBack:ruleMessage:lengthLimitMin5"))
-                );
+                  new Error(this.$t('feedBack:ruleMessage:lengthLimitMin5'))
+                )
               }
-              callback();
+              callback()
             },
-            trigger: "blur",
+            trigger: 'blur',
           },
         ],
       },
       isUpload: false,
-    };
+    }
   },
   computed: {
     level() {
-      if (this.hasPermi(["role:dev", "role:admin"])) {
-        return 9;
+      if (this.hasPermi(['role:dev', 'role:admin'])) {
+        return 9
       }
-      if (this.hasPermi(["role:pm"])) {
-        return 8;
+      if (this.hasPermi(['role:pm', 'role:apm'])) {
+        return 8
       }
-      if (this.hasPermi(["role:ir", "role:crc"])) {
-        return 7;
+      if (this.hasPermi(['role:ir', 'role:crc'])) {
+        return 7
       }
-      return 0;
+      return 0
     },
     QuestionTypeOptions() {
       if (this.level > 7) {
         return [
           ...this.$d.FeedBackTypeToCRC.filter((item) => item.value > 0),
           ...this.$d.FeedBackTypeToIR,
-        ];
+        ]
       }
-      if (this.hasPermi(["role:ir"])) {
-        return this.$d.FeedBackTypeToIR;
+      if (this.hasPermi(['role:ir'])) {
+        return this.$d.FeedBackTypeToIR
       }
-      if (this.hasPermi(["role:crc"])) {
-        return this.$d.FeedBackTypeToCRC;
+      if (this.hasPermi(['role:crc'])) {
+        return this.$d.FeedBackTypeToCRC
       }
-      return [];
+      return []
     },
   },
   methods: {
     open(data) {
-      let { type, trialId, Id, visitTaskId, SubjectVisitId } = data;
-      this.type = type;
-      this.trialId = trialId;
-      this.Id = Id;
-      this.visitTaskId = visitTaskId;
-      this.SubjectVisitId = SubjectVisitId;
+      let { type, trialId, Id, visitTaskId, SubjectVisitId } = data
+      this.type = type
+      this.trialId = trialId
+      this.Id = Id
+      this.visitTaskId = visitTaskId
+      this.SubjectVisitId = SubjectVisitId
       if (visitTaskId) {
-        this.isImgfail = true;
+        this.isImgfail = true
       }
-      this.setTypeOption();
+      this.setTypeOption()
       if (!Id) {
-        this.title = this.setTitle();
+        this.title = this.setTitle()
       }
       if (Id || visitTaskId) {
-        this.getInfo(Id, visitTaskId);
+        this.getInfo(Id, visitTaskId)
       }
-      this.visible = true;
+      this.visible = true
     },
     cancel() {
-      this.visible = false;
-      this.$emit("closed");
+      this.visible = false
+      this.$emit('closed')
     },
     async save() {
       try {
-        let validate = await this.$refs.feedBackForm.validate();
-        if (!validate) return;
+        let validate = await this.$refs.feedBackForm.validate()
+        if (!validate) return
         if (this.trialId) {
-          this.form.TrialId = this.trialId;
+          this.form.TrialId = this.trialId
         }
         if (this.visitTaskId) {
-          this.form.VisitTaskId = this.visitTaskId;
+          this.form.VisitTaskId = this.visitTaskId
         }
         if (this.SubjectVisitId) {
-          this.form.SubjectVisitId = this.SubjectVisitId;
+          this.form.SubjectVisitId = this.SubjectVisitId
         }
         if (this.Id) {
-          this.form.Id = this.Id;
+          this.form.Id = this.Id
         }
-        this.loading = true;
-        let res = await addOrUpdateUserFeedBack(this.form);
-        this.loading = false;
+        this.loading = true
+        let res = await addOrUpdateUserFeedBack(this.form)
+        this.loading = false
         if (res.IsSuccess) {
-          this.$emit("success");
-          this.$message.success(this.$t("feedBack:save:success"));
-          this.cancel();
+          this.$emit('success')
+          this.$message.success(this.$t('feedBack:save:success'))
+          this.cancel()
         }
       } catch (err) {
-        this.loading = false;
-        console.log(err);
+        this.loading = false
+        console.log(err)
       }
     },
     // 修改状态
     async changeState() {
-      if (this.isImgfail) return;
+      if (this.isImgfail) return
       try {
         let data = {
           IdList: [this.Id],
           State: this.form.State,
-        };
-        let res = await batchUpdateFeedBackState(data);
+        }
+        let res = await batchUpdateFeedBackState(data)
         if (res.IsSuccess) {
-          this.$message.success(this.$t("feedBack:changeState:success"));
-          this.$emit("success");
+          this.$message.success(this.$t('feedBack:changeState:success'))
+          this.$emit('success')
           // this.cancel();
-          this.getInfo(this.Id, this.visitTaskId);
+          this.getInfo(this.Id, this.visitTaskId)
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 获取反馈详情
@@ -328,56 +328,56 @@ export default {
         let data = {
           Id,
           visitTaskId,
-        };
-        let res = await getUserFeedBackInfo(data);
+        }
+        let res = await getUserFeedBackInfo(data)
         if (res.IsSuccess && res.Result) {
-          this.form = res.Result;
-          this.Id = res.Result.Id;
+          this.form = res.Result
+          this.form.ScreenshotList = this.form.ScreenshotList || []
+          this.Id = res.Result.Id
           if (res.Result.State > 0) {
-            this.isStateChange = false;
+            this.isStateChange = false
           }
           if (res.Result.VisitTaskId) {
-            this.visitTaskId = res.Result.VisitTaskId;
+            this.visitTaskId = res.Result.VisitTaskId
           }
           if (res.Result.SubjectVisitId) {
-            this.SubjectVisitId = res.Result.SubjectVisitId;
+            this.SubjectVisitId = res.Result.SubjectVisitId
           }
-          let code = this.$fd("UserType", res.Result.UserTypeEnum);
-          this.title = this.setTitle(code, res.Result.FeedBackFullName);
+          let code = this.$fd('UserType', res.Result.UserTypeEnum)
+          this.title = this.setTitle(code, res.Result.FeedBackFullName)
           if (visitTaskId) {
-            code = `${res.Result.SubjectCode}-${res.Result.SubjectVisitName}`;
-            this.title = this.setTitle(code, res.Result.FeedBackFullName);
+            code = `${res.Result.SubjectCode}-${res.Result.SubjectVisitName}`
+            this.title = this.setTitle(code, res.Result.FeedBackFullName)
           }
-          this.$refs.uploadImage.initFileList(res.Result.ScreenshotList);
+          this.$refs.uploadImage.initFileList(res.Result.ScreenshotList)
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     setTypeOption() {
-      if (!this.trialId) return (this.options = []);
-      if (this.hasPermi(["role:ir"]))
-        return (this.option = this.$d.FeedBackTypeToIR);
-      if (this.hasPermi(["role:crc"]))
-        return (this.option = this.$d.FeedBackTypeToCRC);
+      if (!this.trialId) return (this.options = [])
+      if (this.hasPermi(['role:ir']))
+        return (this.option = this.$d.FeedBackTypeToIR)
+      if (this.hasPermi(['role:crc']))
+        return (this.option = this.$d.FeedBackTypeToCRC)
     },
     setTitle(code, name) {
-      console.log(code, name);
-      if (this.hasPermi(["role:pm"]) && this.visitTaskId) {
-        return `${this.$t("feedBack:form:title:pm2")}(${code}/${name})`;
+      if (this.hasPermi(['role:pm']) && this.visitTaskId) {
+        return `${this.$t('feedBack:form:title:pm2')}(${code}/${name})`
       }
-      if (this.hasPermi(["role:pm", "role:dev", "role:admin"])) {
-        return `${this.$t("feedBack:form:title:pm")}(${code},${name})`;
+      if (this.hasPermi(['role:pm', 'role:dev', 'role:admin'])) {
+        return `${this.$t('feedBack:form:title:pm')}(${code},${name})`
       }
-      if (this.hasPermi(["role:ir", "role:crc"]) && this.type === "detail") {
-        return `${this.$t("feedBack:form:detail:title")}`;
+      if (this.hasPermi(['role:ir', 'role:crc']) && this.type === 'detail') {
+        return `${this.$t('feedBack:form:detail:title')}`
       }
-      if (this.hasPermi(["role:ir", "role:crc"])) {
-        return `${this.$t("feedBack:form:title")}`;
+      if (this.hasPermi(['role:ir', 'role:crc'])) {
+        return `${this.$t('feedBack:form:title')}`
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .tip {
diff --git a/src/components/feedBack/uploadImage.vue b/src/components/feedBack/uploadImage.vue
index 798ef8b9..852215ef 100644
--- a/src/components/feedBack/uploadImage.vue
+++ b/src/components/feedBack/uploadImage.vue
@@ -58,14 +58,14 @@
   </div>
 </template>
 <script>
-const type = "Statement of Work";
+const type = 'Statement of Work'
 export default {
-  name: "UploadImage",
+  name: 'UploadImage',
   props: {
     path: {
       required: true,
       default: () => {
-        return [];
+        return []
       },
     },
     disabled: {
@@ -78,14 +78,14 @@ export default {
     },
     trialId: {
       type: String,
-      default: "",
+      default: '',
     },
   },
   data() {
     return {
       fileList: [],
       btnDisabled: false,
-    };
+    }
   },
   methods: {
     remove(file, fileList) {
@@ -93,115 +93,113 @@ export default {
     },
     fileToBlob(file) {
       // 创建 FileReader 对象
-      const reader = new FileReader();
+      const reader = new FileReader()
       return new Promise((resolve) => {
         // FileReader 添加 load 事件
-        reader.addEventListener("load", (e) => {
-          let blob;
-          if (typeof e.target.result === "object") {
-            blob = new Blob([e.target.result]);
+        reader.addEventListener('load', (e) => {
+          let blob
+          if (typeof e.target.result === 'object') {
+            blob = new Blob([e.target.result])
           } else {
-            blob = e.target.result;
+            blob = e.target.result
           }
-          resolve(blob);
-        });
+          resolve(blob)
+        })
         // FileReader 以 ArrayBuffer 格式 读取 File 对象中数据
-        reader.readAsArrayBuffer(file);
-      });
+        reader.readAsArrayBuffer(file)
+      })
     },
     // 上传oss
     async uploadToOSS(name, file) {
       try {
-        let defaultPath = "/System/FeedBack/";
+        let defaultPath = '/System/FeedBack/'
         if (this.trialId) {
-          defaultPath = `/${this.trialId}/FeedBack/`;
+          defaultPath = `/${this.trialId}/FeedBack/`
         }
-        let res = await this.OSSclient.put(`${defaultPath}${name}`, file);
-        return res;
+        let res = await this.OSSclient.put(`${defaultPath}${name}`, file)
+        return res
       } catch (err) {
-        console.log(err);
-        return false;
+        console.log(err)
+        return false
       }
     },
     initFileList(list) {
       if (list && list.length > 0) {
-        this.fileList = [];
+        this.fileList = []
         list.forEach((item, index) => {
-          let name = item.split("/");
+          let name = item.split('/')
           this.fileList.push({
             name: name[name.length - 1],
             path: item,
             fullPath: this.OSSclientConfig.basePath + item,
             url: this.OSSclientConfig.basePath + item,
             uid: `${name[name.length - 1]}${index}`,
-          });
-        });
-        console.log(this.fileList);
+          })
+        })
       }
     },
     async uploadFile(param) {
-      var fileName = param.file.name;
-      this.$emit("update:isUpload", true);
-      this.btnDisabled = true;
+      var fileName = param.file.name
+      this.$emit('update:isUpload', true)
+      this.btnDisabled = true
       this.fileList.push({
         url: param.file.url,
         path: fileName,
         uid: param.file.uid,
-      });
-      let file = await this.fileToBlob(param.file);
-      let res = await this.uploadToOSS(fileName, file);
-      this.btnDisabled = false;
-      let index = this.fileList.findIndex(
-        (item) => item.uid === param.file.uid
-      );
+      })
+      let file = await this.fileToBlob(param.file)
+      let res = await this.uploadToOSS(fileName, file)
+      this.btnDisabled = false
+      let index = this.fileList.findIndex((item) => item.uid === param.file.uid)
       if (!res) {
         if (index >= 0) {
-          this.fileList.splice(index, 1);
+          this.fileList.splice(index, 1)
         }
-        return this.$emit("update:isUpload", false);
+        return this.$emit('update:isUpload', false)
       }
-      this.fileList[index].url = this.OSSclientConfig.basePath + res.name;
-      this.fileList[index].path = res.name;
-      this.$emit("update:path", [...this.path, res.name]);
-      this.$emit("update:isUpload", false);
-      return false;
+      let name = this.$getObjectName(res.url)
+      this.fileList[index].url = this.OSSclientConfig.basePath + name
+      this.fileList[index].path = name
+      this.$emit('update:path', [...this.path, res.name])
+      this.$emit('update:isUpload', false)
+      return false
     },
     beforeUpload(file, fileList) {
-      const isValidFile = this.fileValid(file.name, ["png", "jpg", "jpeg"]);
+      const isValidFile = this.fileValid(file.name, ['png', 'jpg', 'jpeg'])
       if (isValidFile) {
         // this.fileList = [];
       } else {
-        this.$alert(this.$t("feedBack:uploadImg:format"));
-        return false;
+        this.$alert(this.$t('feedBack:uploadImg:format'))
+        return false
       }
     },
     handlePreview(file) {
-      file.fullPath ? window.open(file.fullPath, "_blank") : "";
+      file.fullPath ? window.open(file.fullPath, '_blank') : ''
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`Upload is currently limited to 1 file`);
+      this.$message.warning(`Upload is currently limited to 1 file`)
     },
     fileValid(fileName, typeArr) {
       var extendName = fileName
-        .substring(fileName.lastIndexOf(".") + 1)
-        .toLocaleLowerCase();
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) > -1) {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
     },
     handlePictureCardPreview(file) {
-      this.$refs[file.url].$viewer.show();
+      this.$refs[file.url].$viewer.show()
     },
     handleRemove(file) {
-      let index = this.fileList.findIndex((item) => item.uid === file.uid);
-      this.fileList.splice(index, 1);
-      let arr = this.fileList.map((item) => item.path);
-      this.$emit("update:path", arr);
+      let index = this.fileList.findIndex((item) => item.uid === file.uid)
+      this.fileList.splice(index, 1)
+      let arr = this.fileList.map((item) => item.path)
+      this.$emit('update:path', arr)
     },
   },
-};
+}
 </script>
 <style>
 .upload-container .el-upload--text {
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
new file mode 100644
index 00000000..64a22362
--- /dev/null
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -0,0 +1,1576 @@
+<template>
+  <div>
+    <div>
+      <span>{{ $t('upload:dicom:title') }}</span>
+      <div class="tip">
+        <i class="el-icon-warning-outline"></i>
+        <div
+          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
+        ></div>
+      </div>
+    </div>
+    <!--检查列表-->
+    <el-table :data="list" style="width: 100%" height="300" :loading="loading">
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:dicom:table:subjectCode')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:dicom:table:taskBlindName')"
+      />
+      <!--原始检查数-->
+      <el-table-column
+        prop="OrginalStudyList"
+        :label="$t('upload:dicom:table:orginalStudyListNum')"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              scope.row.OrginalStudyList &&
+              scope.row.OrginalStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
+          >
+            <span>{{ scope.row.OrginalStudyList.length }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <!--后处理检查数-->
+      <el-table-column
+        prop="UploadStudyList"
+        :label="$t('upload:dicom:table:uploadStudyListNum')"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-if="
+              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'UploadStudyList', true)"
+          >
+            <span>{{ scope.row.UploadStudyList.length }}</span>
+          </el-button>
+          <span v-else>0</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <div class="btnBox">
+            <!--上传--->
+            <form
+              id="inputForm"
+              :ref="`uploadForm_${scope.row.Id}`"
+              enctype="multipart/form-data"
+            >
+              <div class="form-group" style="margin-right: 10px">
+                <div
+                  :id="`directoryInputWrapper_${scope.row.Id}`"
+                  class="btn btn-link file-input"
+                >
+                  <el-button
+                    circle
+                    icon="el-icon-upload2"
+                    :disabled="btnLoading"
+                    :loading="btnLoading"
+                    :title="$t('upload:dicom:button:upload')"
+                  />
+                  <input
+                    :title="$t('upload:dicom:button:upload')"
+                    type="file"
+                    :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`"
+                    :disabled="btnLoading"
+                    webkitdirectory
+                    multiple
+                    @change="
+                      ($event) => beginScanFiles($event, scope.row.VisitTaskId)
+                    "
+                  />
+                </div>
+              </div>
+            </form>
+            <!--预览--->
+            <el-button
+              circle
+              icon="el-icon-view"
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0
+              "
+              @click.stop="handleViewReadingImages(scope.row)"
+              :title="$t('upload:dicom:button:preview')"
+            />
+            <!--删除--->
+            <el-button
+              circle
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0 ||
+                scope.row.ReadingTaskState === 2
+              "
+              icon="el-icon-delete"
+              :title="$t('upload:dicom:button:delete')"
+              @click.stop="remove(scope.row)"
+            />
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="margin: 10px 0" class="top">
+      <span>{{ $t('upload:dicom:uploadTitle') }}</span>
+      <div class="btnBox">
+        <span style="margin-right: 10px">
+          {{ $store.state.trials.uploadTip }}
+        </span>
+        <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
+          <div class="form-group">
+            <div id="directoryInputWrapper" class="btn btn-link file-input">
+              <el-button
+                type="primary"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+                size="mini"
+              >
+                {{ $t('upload:dicom:button:batchUpload') }}
+              </el-button>
+              <input
+                type="file"
+                name="file"
+                ref="pathClear"
+                :disabled="btnLoading"
+                webkitdirectory
+                multiple
+                title=""
+                @change="beginScanFiles($event)"
+              />
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+    <!--上传列表-->
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 80 }"
+      height="100"
+      :data="uploadQueues"
+      class="dicomFiles-table"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column min-width="200" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br />
+              {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br />
+              {{ $t('trials:uploadedDicoms:table:studyDate') }}
+            </div>
+            <span>{{ $t('trials:uploadDicomList:table:studyInfo') }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <div>
+                <span v-if="scope.row.dicomInfo.accNumber"
+                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.modality.length > 0">
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.seriesList.length"
+                  >{{ scope.row.seriesList.length }} Series,</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.fileList.length"
+                  >{{ scope.row.fileList.length }} Instances</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+
+            <div>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.bodyPart">
+                  {{ scope.row.dicomInfo.bodyPart }},
+                </span>
+                <span v-else style="color: #f44336">N/A, </span>
+              </div>
+              <div style="display: inline-block">
+                <span v-if="scope.row.dicomInfo.description">
+                  {{ scope.row.dicomInfo.description }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+            </div>
+            <div>
+              {{ scope.row.dicomInfo.studyTime }}
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column min-width="130" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip placement="top">
+            <div slot="content">
+              {{ $t('trials:uploadDicomList:table:pId') }}<br />
+              {{ $t('trials:uploadDicomList:table:patientName') }}<br />
+              {{ $t('trials:uploadDicomList:table:pInfo') }}
+            </div>
+            <span>{{ $t('trials:uploadDicomList:table:patientInfo') }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <div style="line-height: 15px">
+            <div>
+              <span v-if="scope.row.dicomInfo.patientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.patientId }}</span
+              >
+              <span v-else style="color: #f44336">N/A</span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientName
+                    ? scope.row.dicomInfo.patientName
+                    : 'N/A'
+                }}
+              </span>
+            </div>
+            <div>
+              <span
+                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientSex
+                    ? scope.row.dicomInfo.patientSex
+                    : 'N/A'
+                }},
+              </span>
+
+              <span
+                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientAge
+                    ? scope.row.dicomInfo.patientAge
+                    : 'N/A'
+                }},
+              </span>
+
+              <span
+                :class="[
+                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
+                {{
+                  scope.row.dicomInfo.patientBirthDate
+                    ? scope.row.dicomInfo.patientBirthDate
+                    : 'N/A'
+                }}
+              </span>
+            </div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        min-width="150"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-progress
+            color="#409eff"
+            :percentage="
+              (
+                (scope.row.dicomInfo.uploadFileSize * 100) /
+                scope.row.dicomInfo.fileSize
+              ).toFixed(2) * 1
+            "
+          />
+          <span>
+            {{ $t('trials:uploadDicomList:table:uploadNow')
+            }}{{ scope.row.dicomInfo.failedFileCount }}/{{
+              scope.row.dicomInfo.fileCount
+            }}
+            ({{
+              (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
+            }}MB/{{
+              (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
+            }}MB)
+          </span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:status')"
+        min-width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <span
+            v-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              !scope.row.dicomInfo.isInit
+            "
+          >
+            {{ $t('trials:uploadDicomList:table:status1') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              scope.row.dicomInfo.isInit &&
+              btnLoading
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #2cc368"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount ===
+              scope.row.dicomInfo.fileCount
+            "
+            >{{ $t('trials:uploadDicomList:table:status3') }}</span
+          >
+          <span
+            style="color: #f66"
+            v-else-if="
+              scope.row.uploadState.record &&
+              scope.row.uploadState.record.fileCount === 0
+            "
+            >{{ $t('trials:uploadDicomList:table:status5') }}</span
+          >
+          <span style="color: #f66" v-else>{{
+            $t('trials:uploadDicomList:table:Failed')
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:record')"
+        min-width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-tooltip placement="top" v-if="scope.row.uploadState.record">
+            <div slot="content">
+              <div style="max-height: 500px; overflow-y: auto">
+                {{ $t('trials:uploadDicomList:table:Existed') }}:
+                <div v-if="scope.row.uploadState.record.Existed.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Existed"
+                    :key="item"
+                    style="font-size: 12px; color: #baa72a"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+                {{ $t('trials:uploadDicomList:table:Uploaded') }}:
+                <div v-if="scope.row.uploadState.record.Uploaded.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    :key="item"
+                    style="font-size: 12px; color: #24b837"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+                <br />
+                {{ $t('trials:uploadDicomList:table:Failed') }}:
+                <div v-if="scope.row.uploadState.record.Failed.length">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Failed"
+                    :key="item"
+                    style="font-size: 12px; color: #f66"
+                  >
+                    {{ item }}
+                  </div>
+                </div>
+                <div v-else>&nbsp;</div>
+              </div>
+            </div>
+            <el-button size="mini" style="cursor: pointer">
+              <span style="font-size: 12px; color: #baa72a">{{
+                scope.row.uploadState.record.Existed.length
+              }}</span>
+              /
+              <span style="font-size: 12px; color: #24b837">{{
+                scope.row.uploadState.record.Uploaded.length
+              }}</span>
+              /
+              <span style="font-size: 12px; color: #f66">{{
+                scope.row.uploadState.record.Failed.length
+              }}</span>
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :IsDicom="true"
+      :bodyPart="bodyPart"
+      :modelList="modelList"
+      :isUpload="openIsUpload"
+      :TrialModality="TrialModality"
+      @getList="getList"
+    />
+  </div>
+</template>
+<script>
+import { dicomUploadInProgress } from '@/api/trials'
+import {
+  preArchiveDicomStudy,
+  addOrUpdateArchiveTaskStudy,
+} from '@/api/load.js'
+import studyView from './study-view.vue'
+import {
+  getSubjectImageUploadList,
+  deleteTaskStudy,
+  verifyIRStudyAllowUpload,
+} from '@/api/load.js'
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
+var config = {
+  maxWebWorkers: 4,
+  startWebWorkersOnDemand: true,
+  taskConfiguration: {
+    decodeTask: {
+      initializeCodecsOnStartup: false,
+    },
+  },
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+import { convertBytes } from '@/utils/dicom-character-set'
+import { parseDicom } from '@/utils/parseDicom.js'
+import { dcmUpload } from '@/utils/dcmUpload/dcmUpload'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+export default {
+  name: 'dicomFile',
+  props: {
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    TaskId: {
+      type: String,
+      default: '',
+    },
+    isUpload: {
+      type: Boolean,
+      default: false,
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
+  },
+  components: {
+    'study-view': studyView,
+  },
+  data() {
+    return {
+      list: [],
+      StudyInstanceUidList: [],
+      SopInstanceUidList: [],
+      UploadStudyList: [],
+      // 检查数弹框
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '1000px',
+        title: '',
+        appendToBody: true,
+      },
+      modelList: [],
+
+      VisitTaskId: null,
+      hasOtherStudy: false,
+
+      scanState: '', // 当前上传队列上传状态
+      form: {
+        SiteName: '',
+        SubjectName: '',
+        VisitName: '',
+        SubjectId: '',
+        VisitNum: null,
+      },
+      isScan: false,
+      uploadQueues: [], // 上传队列
+      studyErrorList: [],
+      warningArr: [],
+      selectArr: [],
+      btnLoading: false,
+      myInterval: [],
+      isClose: false,
+      trialId: null,
+      subjectVisitId: null,
+      errStudyUidList: [],
+      open: null,
+      bodyPart: [],
+      openIsUpload: false,
+      TrialModality: [],
+    }
+  },
+  created() {
+    this.getList()
+  },
+  async mounted() {
+    this.trialId = this.$route.query.trialId
+    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.uploadQueues = []
+    this.OSSclient.close()
+  },
+  beforeDestroy() {
+    this.myInterval.forEach((v) => {
+      clearInterval(v)
+    })
+    this.myInterval = []
+    store.dispatch('trials/setUnLock', false)
+    this.isClose = true
+    this.OSSclient.close()
+  },
+  methods: {
+    // 获取列表
+    async getList() {
+      try {
+        let params = {
+          SubjectId: this.SubjectId,
+          TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId,
+          SubjectCode: this.SubjectCode,
+        }
+        if (this.TaskId) {
+          params.VisitTaskId = this.TaskId
+        }
+        this.loading = true
+        let res = await getSubjectImageUploadList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.TrialModality = res.OtherInfo.TrialModality.split('|')
+          this.StudyInstanceUidList = []
+          this.SopInstanceUidList = []
+          this.UploadStudyList = []
+          this.list = res.Result
+          res.Result.forEach((item) => {
+            if (item.OrginalStudyList && Array.isArray(item.OrginalStudyList)) {
+              item.OrginalStudyList.forEach((data) => {
+                data.SubjectId = item.SubejctId
+                data.VisitTaskId = item.VisitTaskId
+                data.SourceSubjectVisitId = item.SourceSubjectVisitId
+                this.subjectVisitId = item.SourceSubjectVisitId
+                this.StudyInstanceUidList.push(data)
+              })
+            }
+            if (item.UploadStudyList && Array.isArray(item.UploadStudyList)) {
+              item.UploadStudyList.forEach((data) => {
+                data.SopInstanceUidList &&
+                  this.SopInstanceUidList.push(...data.SopInstanceUidList)
+                data.VisitTaskId = item.VisitTaskId
+                this.UploadStudyList.push(data)
+              })
+            }
+          })
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+      }
+    },
+    // 删除
+    async remove(item) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('trials:uploadImage:confirm:delMessage'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+        if (confirm !== 'confirm') return
+        let params = {
+          VisitTaskId: item.VisitTaskId,
+          IsDicom: true,
+        }
+        let res = await deleteTaskStudy(params)
+        if (res.IsSuccess) {
+          this.getList()
+          this.$emit('update:isUpload', true)
+          this.$message.success(
+            this.$t('trials:uploadImage:message:delSuccess')
+          )
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 当选择项发生变化时收集待上传文件数据
+    handleSelectionChange(selection) {
+      selection.sort((n1, n2) => {
+        return n1.studyIndex - n2.studyIndex
+      })
+      this.selectArr = selection
+    },
+    // 根据是否上传状态决定CheckBox 是否可以勾选
+    handleSelectable(row) {
+      if (row.uploadState.selected || this.btnLoading) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 打开弹窗
+    handleOpenDialog(item, list, isUpload = false) {
+      this.openIsUpload = isUpload
+      this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
+      this.modelList = item[list]
+      this.model_cfg.visible = true
+    },
+    // 校验上传数据
+    async verifyIRStudyAllowUpload(list) {
+      try {
+        let data = {
+          StudyInstanceUidList: list || [],
+          TrialId: this.$route.query.trialId,
+          SubjectCode: this.SubjectCode,
+          SubjectId: this.SubjectId,
+        }
+        if (this.VisitTaskId) {
+          data.VisitTaskId = this.VisitTaskId
+        }
+        let res = await verifyIRStudyAllowUpload(data)
+        if (res.IsSuccess) {
+          return res.Result
+        }
+        return false
+      } catch (err) {
+        console.log(err)
+        return false
+      }
+    },
+    // 扫描待上传文件
+    async beginScanFiles(e, id = null) {
+      this.VisitTaskId = id
+      this.hasOtherStudy = false
+      var files = e.target.files
+      if (files.length > 0) {
+        var checkFiles = [...files]
+        let max = checkFiles.some((item) => item.size > 20 * 1024 * 1024 * 1024)
+        if (max)
+          return this.$message.warning(
+            this.$t('trials:uploadDicomList:message:maxFileSize')
+          )
+        let StudyInstanceUidList = [],
+          confirmMessage = null
+        for (let i = 0; i < checkFiles.length; i++) {
+          let item = checkFiles[i]
+          var dicom = await parseDicom(item, 'StudyInstanceUid')
+          if (!dicom.StudyInstanceUid) continue
+          let has = true,
+            has2 = false,
+            has3 = false
+
+          if (!this.VisitTaskId) {
+            has = this.StudyInstanceUidList.some(
+              (item) => item.StudyInstanceUid === dicom.StudyInstanceUid
+            )
+            if (!has)
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:hasNotStudyUid'
+              )
+          } else {
+            has2 = this.StudyInstanceUidList.some((item) => {
+              return (
+                item.StudyInstanceUid === dicom.StudyInstanceUid &&
+                item.VisitTaskId !== this.VisitTaskId
+              )
+            })
+            has3 = this.UploadStudyList.some((item) => {
+              return (
+                item.StudyInstanceUid === dicom.StudyInstanceUid &&
+                item.VisitTaskId !== this.VisitTaskId
+              )
+            })
+            if (has2 || has3)
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:visitTaskIdNormal'
+              )
+          }
+
+          if (!has || has2 || has3) {
+            this.hasOtherStudy = true
+            checkFiles.splice(i, 1)
+            i--
+          } else {
+            if (!~StudyInstanceUidList.indexOf(dicom.StudyInstanceUid)) {
+              StudyInstanceUidList.push(dicom.StudyInstanceUid)
+            }
+          }
+        }
+        this.errStudyUidList = []
+        let res = await this.verifyIRStudyAllowUpload(StudyInstanceUidList)
+        if (res) {
+          res.forEach((item) => {
+            if (!item.IsAllowUpload && !item.IsAllowReUpload) {
+              this.errStudyUidList.push(item.StudyInstanceUid)
+            }
+          })
+        }
+        if (this.errStudyUidList && this.errStudyUidList.length > 0) {
+          for (let i = 0; i < checkFiles.length; i++) {
+            let item = checkFiles[i]
+            var dicom = await parseDicom(item, 'StudyInstanceUid')
+            if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid)) {
+              this.hasOtherStudy = true
+              checkFiles.splice(i, 1)
+              i--
+              confirmMessage = this.$t(
+                'upload:dicom:confirmMessage:uploadOtherSubject'
+              )
+            }
+          }
+        }
+        if (this.hasOtherStudy) {
+          this.$confirm(confirmMessage, {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          })
+        }
+
+        var scope = this
+        scope.scanState = ''
+        scope.isScan = false
+        var p = new Promise(function (resolve) {
+          resolve()
+        })
+        var validFilesCount = 0
+        for (var i = 0; i < checkFiles.length; ++i) {
+          ;(function (index) {
+            p = p.then(function () {
+              if (
+                checkFiles[index].name.toUpperCase().indexOf('DICOMDIR') === -1
+              ) {
+                validFilesCount = validFilesCount + 1
+                return scope.parseDicomFile(checkFiles[index])
+              }
+            })
+          })(i)
+        }
+        p.then(function (result) {
+          scope.uploadQueues.forEach((v, i) => {
+            scope.$refs.dicomFilesTable.toggleRowSelection(v, true)
+          })
+          scope.scanState = 'finished'
+          scope.isScan = true
+          scope.beginUploadQueues()
+        })
+      }
+    },
+    // 按序列UUID本地归档
+    parseDicomFile(file) {
+      var scope = this
+      return new Promise(function (resolve, reject) {
+        if (scope.scanState === 'cancelling') {
+          resolve()
+          return
+        }
+        var reader = new FileReader()
+        reader.onload = function (e) {
+          try {
+            var data = dicomParser.parseDicom(new Uint8Array(e.target.result))
+            var instanceUid = data.string('x00080018')
+            if (!instanceUid) return resolve()
+            var modality = data.string('x00080060') || ''
+            var studyUid = data.string('x0020000d')
+            if (!studyUid) return resolve()
+            var pixelDataElement = data.elements.x7fe00010
+            var studyIndex = 0
+            while (
+              studyIndex < scope.uploadQueues.length &&
+              scope.uploadQueues[studyIndex].dicomInfo.studyUid !== studyUid &&
+              (pixelDataElement || modality === 'SR') &&
+              modality != ''
+            ) {
+              ++studyIndex
+            }
+            if (studyIndex >= scope.uploadQueues.length) {
+              var date = data.string('x00080020')
+              var time = data.string('x00080030')
+              var studyTime = ''
+              if (date) {
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`
+              }
+              if (time) {
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`
+              }
+              if (date) {
+                studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              }
+              const patientNameElement = data.elements.x00100010
+              const patientNameBytes = new Uint8Array(
+                data.byteArray.buffer,
+                patientNameElement ? patientNameElement.dataOffset : 0,
+                patientNameElement ? patientNameElement.length : 0
+              )
+              const patientNameStr = convertBytes(
+                data.string('x00080005'),
+                patientNameBytes
+              )
+              scope.uploadQueues.push({
+                studyIndex: studyIndex,
+                seriesList: [],
+                fileList: [],
+                dicomInfo: {
+                  studyId: data.string('x00200010'),
+                  studyUid: studyUid,
+                  patientId: data.string('x00100020'),
+                  patientName: patientNameStr,
+                  patientAge: data.string('x00101010')
+                    ? data.string('x00101010')
+                    : '',
+                  patientSex: data.string('x00100040')
+                    ? data.string('x00100040')
+                    : '',
+                  patientBirthDate: data.string('x00100030'),
+                  hospitalName: data.string('x00080080'),
+                  accNumber: data.string('x00080050'),
+                  bodyPart: data.string('x00180015') || '',
+                  modality: [],
+                  institutionName: data.string('x00080080'),
+                  description: data.string('x00081030'),
+                  //0008,0032
+                  acquisitionTime: data.string('x00080032'),
+                  acquisitionNumber: data.string('x00200012'),
+                  triggerTime: data.string('x00181060'),
+                  studyTime: studyTime,
+                  VisitInfo: {},
+                  SubjectInfo: {},
+                  failedFileCount: 0,
+                  uploadFileSize: 0,
+                  fileSize: 0,
+                  fileCount: 0,
+                  isInit: false,
+                  visitTaskId:
+                    scope.VisitTaskId ||
+                    scope.StudyInstanceUidList.find(
+                      (item) => item.StudyInstanceUid === studyUid
+                    ).VisitTaskId,
+                },
+
+                uploadState: {
+                  selected: false,
+                  stateCode: '',
+                  beginUploadTime: {},
+                  progressValue: 0,
+                },
+              })
+            }
+            var modality = scope.uploadQueues[studyIndex].dicomInfo.modality
+            var currentModality = data.string('x00080060')
+            if (!(modality.indexOf(currentModality) > -1)) {
+              modality.push(currentModality)
+            }
+            var fileList = scope.uploadQueues[studyIndex].fileList
+            var instanceUid = data.string('x00080018')
+            var instanceIndex = 0
+            while (
+              instanceIndex < fileList.length &&
+              fileList[instanceIndex].instanceUid !== instanceUid &&
+              (pixelDataElement || modality === 'SR')
+            ) {
+              ++instanceIndex
+            }
+            if (instanceIndex >= fileList.length) {
+              fileList.push({
+                instanceUid: instanceUid,
+                file: file,
+              })
+            }
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size
+              },
+              0
+            )
+
+            var seriesUid = data.string('x0020000e')
+            var seriesList = scope.uploadQueues[studyIndex].seriesList
+            var seriesItem = seriesList.find(function (item) {
+              return item.seriesUid === seriesUid
+            })
+            if (!seriesItem && (pixelDataElement || modality === 'SR')) {
+              var date = data.string('x00080021')
+              var time = data.string('x00080031')
+              var seriesTime = ''
+              if (date) {
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`
+              }
+              if (time) {
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`
+              }
+              if (date) {
+                seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              }
+              const seriesDescriptionElement = data.elements.x0008103e
+              const seriesDescriptionBytes = new Uint8Array(
+                data.byteArray.buffer,
+                seriesDescriptionElement
+                  ? seriesDescriptionElement.dataOffset
+                  : 0,
+                seriesDescriptionElement ? seriesDescriptionElement.length : 0
+              )
+              const seriesDescriptionStr = convertBytes(
+                data.string('x00080005'),
+                seriesDescriptionBytes
+              )
+              seriesItem = {
+                seriesUid: seriesUid,
+                seriesNumber: data.intString('x00200011') || 1,
+                modality: data.string('x00080060') || '',
+                description: seriesDescriptionStr,
+                seriesTime: seriesTime,
+                sliceThickness: data.string('x00180050') || '',
+                imagePositionPatient: data.string('x00200032') || '',
+                imageOrientationPatient: data.string('x00200037') || '',
+                sequenceName: data.string('x00180024') || '',
+                protocolName: data.string('x00181030') || '',
+                imagerPixelSpacing: data.string('x00181164') || '',
+                instanceList: [],
+              }
+              seriesList.push(seriesItem)
+            }
+            var instanceList = seriesItem.instanceList
+            var instanceItem = instanceList.find(function (item) {
+              return item.instanceUid === instanceUid
+            })
+            if (!instanceItem) {
+              var date = data.string('x00080023')
+              var time = data.string('x00080033')
+              var instanceTime = ''
+              if (date) {
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`
+              }
+              if (time) {
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`
+              }
+              if (date) {
+                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              }
+              instanceItem = {
+                instanceUid: instanceUid,
+                instanceNumber: data.intString('x00200013') || 1,
+                frameCount: data.intString('x00280008') || 1,
+                instanceTime: instanceTime,
+                imageRows: data.uint16('x00280010') || 0,
+                imageColumns: data.uint16('x00280011') || 0,
+                sliceLocation: data.intString('x00201041') || 0,
+                sliceThickness: data.string('x00180050') || '',
+                numberOfFrames: data.intString('x00280008') || 0,
+                pixelSpacing: data.string('x00280030') || '',
+                imagerPixelSpacing: data.string('x00181164') || '',
+                frameOfReferenceUID: data.string('x00200052') || '',
+                windowCenter: data.string('x00281050') || '',
+                windowWidth: data.string('x00281051') || '',
+                modality: data.string('x00080060') || '',
+                file: file,
+                FileSize: file.size,
+              }
+              instanceList.push(instanceItem)
+            }
+            resolve()
+          } catch (error) {
+            console.log(error)
+            resolve()
+          }
+        }
+        reader.onerror = function (e) {
+          resolve()
+        }
+        reader.readAsArrayBuffer(file)
+      })
+    },
+    // 上传之前校验基本信息及检查是否已上传
+    beginUploadQueues() {
+      this.scanState = 'uploading'
+      this.studyErrorList = []
+      // console.log(this.uploadQueues, this.selectArr)
+      this.warningArr = []
+      for (let i = 0; i < this.selectArr.length; ++i) {
+        const index = this.selectArr[i].studyIndex
+        this.uploadQueues[index].uploadState.stateCode = 'uploading'
+        this.verifyBasicInfos(index)
+      }
+      if (this.warningArr.length) {
+        this.warning_cfg.visible = true
+        this.btnLoading = false
+      } else {
+        this.verifyStudy()
+      }
+    },
+    // 校验影像中检查时间、性别是否与受试者匹配
+    verifyBasicInfos(index) {
+      var warnings = []
+      if (
+        this.uploadQueues[index].dicomInfo.patientSex &&
+        this.form.SubjectSex
+      ) {
+        if (
+          this.uploadQueues[index].dicomInfo.patientSex.substr(0, 1) !==
+          this.form.SubjectSex.substr(0, 1)
+        ) {
+          warnings.push(
+            this.$t('trials:uploadDicomList:message:genderConsistent')
+          )
+        }
+      }
+      if (warnings.length > 0) {
+        this.warningArr.push({
+          index: this.uploadQueues[index].studyIndex + 1,
+          accNumber: this.uploadQueues[index].dicomInfo.accNumber,
+          warnings: warnings,
+        })
+      }
+    },
+    // 校验该检查是否上传过
+    async verifyStudy() {
+      this.btnLoading = true
+      var studyList = []
+      this.selectArr.forEach((item) => {
+        item.dicomInfo.uploadFileSize = 0
+        if (!item.uploadState.selected) {
+          studyList.push({
+            studyInstanceUid: item.dicomInfo.studyUid,
+            studyDate: item.dicomInfo.studyTime,
+          })
+        }
+      })
+      this.uploadCount = this.selectArr.length
+      this.uploadedCount = 0
+      for (let i = 0; i < this.selectArr.length; i++) {
+        const index = this.selectArr[i].studyIndex
+        if (!this.uploadQueues[index].uploadState.selected) {
+          await this.archiveStudy(index)
+        }
+      }
+      this.$set(this, 'uploadQueues', [
+        ...this.uploadQueues.filter((v) => {
+          return (
+            !v.uploadState.record ||
+            (v.uploadState.record && !!v.uploadState.record.Failed.length)
+          )
+        }),
+      ])
+      this.$nextTick(() => {
+        this.selectArr = []
+        this.uploadQueues.forEach((v, i) => {
+          if (v.uploadState.record) {
+            v.uploadState.selected = false
+            this.$refs.dicomFilesTable.toggleRowSelection(v, true)
+          }
+          v.studyIndex = i
+        })
+        this.$refs.pathClear.value = ''
+        this.list.forEach((item) => {
+          this.$refs[`pathClear_${item.VisitTaskId}`].value = ''
+        })
+        this.btnLoading = false
+        if (this.studyErrorList.length > 0) {
+          let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList')
+          msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
+          this.$confirm(msg, this.$t('trials:hotkeys:message:tip'), {
+            confirmButtonText: this.$t(
+              'trials:uploadDicomFiles2:button:reupload'
+            ),
+          }).then(() => {
+            this.beginUploadQueues()
+          })
+        }
+      })
+    },
+    // 上传影像并归档
+    archiveStudy(index, config) {
+      var scope = this
+      return new Promise(function (resolve, reject) {
+        try {
+          preArchiveDicomStudy({
+            trialId: scope.trialId,
+            subjectId: scope.SubjectId,
+            subjectVisitId: scope.subjectVisitId,
+            fileSize: scope.uploadQueues[index].dicomInfo.fileSize,
+            fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
+            IsDicomReUpload:
+              scope.uploadQueues[index].uploadState.AllowReUpload,
+          })
+            .then(async (res) => {
+              scope.uploadQueues[index].dicomInfo.failedFileCount = 0
+              scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
+              let dicomInfo = scope.uploadQueues[index].dicomInfo
+              let seriesNum = scope.uploadQueues[index].seriesList.length
+              let fileNum = scope.uploadQueues[index].fileList.length
+              let seriesList = scope.uploadQueues[index].seriesList
+              dicomInfo.seriesNum = seriesNum
+              dicomInfo.fileNum = fileNum
+              dicomInfo.subjectId = scope.SubjectId
+              dicomInfo.subjectVisitId = scope.subjectVisitId
+              let t = setInterval(() => {
+                dicomUploadInProgress({
+                  trialId: scope.trialId,
+                  studyInstanceUid: dicomInfo.studyUid,
+                  VisitTaskId: dicomInfo.visitTaskId,
+                }).then((res) => {
+                  console.log(dicomInfo.visitTaskId)
+                })
+              }, 5000)
+              scope.myInterval.push(t)
+              let Record = {
+                Failed: [],
+                Existed: [],
+                Uploaded: [],
+                FileCount: 0,
+              }
+              let params = {
+                trialId: scope.trialId,
+                subjectId: scope.SubjectId,
+                subjectVisitId: scope.subjectVisitId,
+                studyMonitorId: res.Result,
+                failedFileCount: 0,
+                RecordPath: null,
+                study: {
+                  studyId: dicomInfo.studyId,
+                  studyInstanceUid: dicomInfo.studyUid,
+                  studyTime: dicomInfo.studyTime,
+                  description: dicomInfo.description,
+                  seriesCount: dicomInfo.seriesNum,
+                  instanceCount: dicomInfo.fileNum,
+                  institutionName: dicomInfo.institutionName,
+                  patientId: dicomInfo.patientId,
+                  patientName: '',
+                  patientAge: '',
+                  patientSex: dicomInfo.patientSex,
+                  accessionNumber: dicomInfo.accNumber,
+                  patientBirthDate: '',
+                  acquisitionTime: dicomInfo.acquisitionTime,
+                  acquisitionNumber: dicomInfo.acquisitionNumber,
+                  triggerTime: dicomInfo.triggerTime,
+                  bodyPartExamined: '',
+                  seriesList: [],
+                },
+              }
+              let arr = []
+              for (let i = 0; i < seriesList.length; i++) {
+                let v = seriesList[i]
+                let instanceList = []
+                let ImageResizePath
+                for (let ii = 0; ii < v.instanceList.length; ii++) {
+                  arr.push(
+                    (function () {
+                      return new Promise(async (resolve1) => {
+                        try {
+                          let o = v.instanceList[ii]
+                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
+                          if (o.isReUpload) {
+                            dicomInfo.failedFileCount++
+                            dicomInfo.uploadFileSize += o.file.size
+                            Record.Existed.push(name)
+                            Record.FileCount++
+                          } else if (o.myPath) {
+                            instanceList.push({
+                              studyInstanceUid: dicomInfo.studyUid,
+                              seriesInstanceUid: v.seriesUid,
+                              sopInstanceUid: o.instanceUid,
+                              instanceNumber: o.instanceNumber,
+                              instanceTime: o.instanceTime,
+                              imageRows: o.imageRows,
+                              imageColumns: o.imageColumns,
+                              sliceLocation: o.sliceLocation,
+                              sliceThickness: o.sliceThickness,
+                              numberOfFrames: o.numberOfFrames,
+                              pixelSpacing: o.pixelSpacing,
+                              imagerPixelSpacing: o.imagerPixelSpacing,
+                              frameOfReferenceUID: o.frameOfReferenceUID,
+                              windowCenter: o.windowCenter,
+                              windowWidth: o.windowWidth,
+                              path: o.myPath,
+                              FileSize: o.FileSize,
+                            })
+                            Record.Uploaded.push(name)
+                            dicomInfo.failedFileCount++
+                            Record.FileCount++
+                          } else {
+                            let path = `/${params.trialId}/Image/${
+                              params.subjectId
+                            }/${params.subjectVisitId}/${
+                              dicomInfo.visitTaskId
+                            }/${scope.getGuid(
+                              dicomInfo.studyUid +
+                                v.seriesUid +
+                                o.instanceUid +
+                                params.trialId
+                            )}`
+                            if (scope.isClose) return
+                            let res = await dcmUpload(
+                              {
+                                path: path,
+                                file: o.file,
+                                speed: true,
+                              },
+                              null,
+                              (percentage, checkpoint, lastPer) => {
+                                dicomInfo.uploadFileSize +=
+                                  checkpoint.size * (percentage - lastPer)
+                                if (
+                                  dicomInfo.uploadFileSize > dicomInfo.fileSize
+                                ) {
+                                  dicomInfo.uploadFileSize = dicomInfo.fileSize
+                                }
+                              }
+                            )
+                            if (!res || !res.url) {
+                              params.failedFileCount++
+                            } else {
+                              if (ii === 0 && o.modality !== 'SR') {
+                                try {
+                                  let fileId =
+                                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
+                                      o.file
+                                    )
+                                  let blob = await scope.dicomToPng(
+                                    fileId,
+                                    o.imageColumns,
+                                    o.imageRows
+                                  )
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let OSSclient = scope.OSSclient
+                                  let seriesRes = await OSSclient.put(
+                                    thumbnailPath,
+                                    blob
+                                  )
+                                  if (seriesRes && seriesRes.url) {
+                                    ImageResizePath = scope.$getObjectName(
+                                      seriesRes.url
+                                    )
+                                  }
+                                } catch (e) {
+                                  console.log(e)
+                                }
+                              }
+                            }
+                            if (res && res.url) {
+                              instanceList.push({
+                                studyInstanceUid: dicomInfo.studyUid,
+                                seriesInstanceUid: v.seriesUid,
+                                sopInstanceUid: o.instanceUid,
+                                instanceNumber: o.instanceNumber,
+                                instanceTime: o.instanceTime,
+                                imageRows: o.imageRows,
+                                imageColumns: o.imageColumns,
+                                sliceLocation: o.sliceLocation,
+                                sliceThickness: o.sliceThickness,
+                                numberOfFrames: o.numberOfFrames,
+                                pixelSpacing: o.pixelSpacing,
+                                imagerPixelSpacing: o.imagerPixelSpacing,
+                                frameOfReferenceUID: o.frameOfReferenceUID,
+                                windowCenter: o.windowCenter,
+                                windowWidth: o.windowWidth,
+                                path: scope.$getObjectName(res.url),
+                                FileSize: o.FileSize,
+                              })
+                              o.myPath = scope.$getObjectName(res.url)
+                              Record.Uploaded.push(name)
+                              dicomInfo.failedFileCount++
+                              Record.FileCount++
+                            } else {
+                              Record.Failed.push(name)
+                              Record.FileCount++
+                            }
+                          }
+                          resolve1()
+                        } catch (e) {
+                          console.log(e)
+                          resolve1()
+                        }
+                      })
+                    })()
+                  )
+                  if (
+                    (arr.length >= 10 || ii === v.instanceList.length - 1) &&
+                    !scope.isClose
+                  ) {
+                    await Promise.all(arr)
+                    arr = []
+                  }
+                }
+                params.study.seriesList.push({
+                  studyInstanceUid: dicomInfo.studyUid,
+                  seriesInstanceUid: v.seriesUid,
+                  seriesNumber: v.seriesNumber,
+                  seriesTime: v.seriesTime,
+                  sliceThickness: v.sliceThickness,
+                  imagePositionPatient: v.imagePositionPatient,
+                  imageOrientationPatient: v.imageOrientationPatient,
+                  sequenceName: v.sequenceName,
+                  protocolName: v.protocolName,
+                  imagerPixelSpacing: v.imagerPixelSpacing,
+                  acquisitionTime: dicomInfo.acquisitionTime,
+                  acquisitionNumber: dicomInfo.acquisitionNumber,
+                  triggerTime: dicomInfo.triggerTime,
+                  modality: v.modality,
+                  description: v.description,
+                  instanceCount: v.instanceList.length,
+                  bodyPartExamined: dicomInfo.bodyPart,
+                  instanceList: instanceList,
+                  ImageResizePath: ImageResizePath,
+                })
+              }
+              let text = JSON.stringify(Record)
+              let logJsonBlob = scope.generateTxtFile(text)
+              let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              let logRes
+              try {
+                logRes = await scope.OSSclient.put(
+                  logJsonObjectName,
+                  logJsonBlob
+                )
+              } catch (e) {
+                scope.uploadQueues[index].uploadState.record = Record
+                scope.studyErrorList.push(dicomInfo.accNumber)
+                clearInterval(t)
+                resolve()
+              }
+              for (let i = 0; i < seriesList.length; i++) {
+                let v = seriesList[i]
+                let o = params.study.seriesList.find((o) => {
+                  return o.seriesInstanceUid === v.seriesUid
+                })
+                if (o && !o.ImageResizePath) {
+                  let fileId =
+                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
+                      v.instanceList[0].file
+                    )
+                  let blob = await scope.dicomToPng(
+                    fileId,
+                    v.instanceList[0].imageColumns,
+                    v.instanceList[0].imageRows
+                  )
+                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let OSSclient = scope.OSSclient
+                  try {
+                    let seriesRes = await OSSclient.put(thumbnailPath, blob)
+                    if (seriesRes && seriesRes.url) {
+                      o.ImageResizePath = scope.$getObjectName(seriesRes.url)
+                    }
+                  } catch (e) {
+                    console.log(e)
+                  }
+                }
+              }
+              if (logRes && logRes.url) {
+                params.study.instanceCount = dicomInfo.failedFileCount
+                params.RecordPath = scope.$getObjectName(logRes.url)
+                if (scope.isClose) return false
+                console.log(params)
+                params.VisitTaskId = dicomInfo.visitTaskId
+                addOrUpdateArchiveTaskStudy(params)
+                  .then((res) => {
+                    if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
+                      scope.$message.success(
+                        scope.$t('trials:uploadDicomList:label:uploaded')
+                      )
+                    } else {
+                      scope.studyErrorList.push(dicomInfo.accNumber)
+                    }
+                    scope.uploadQueues[index].uploadState.record = Record
+                    scope.getList()
+                    scope.$emit('update:isUpload', true)
+                    if (
+                      scope.$route.path !==
+                      '/trials/trials-panel/visit/crc-question'
+                    ) {
+                      scope.$emit('getList')
+                    }
+                    clearInterval(t)
+                    resolve()
+                  })
+                  .catch((res) => {
+                    scope.uploadQueues[index].uploadState.record = Record
+                    scope.studyErrorList.push(dicomInfo.accNumber)
+                    clearInterval(t)
+                    resolve()
+                  })
+              } else {
+                scope.uploadQueues[index].uploadState.record = Record
+                scope.studyErrorList.push(dicomInfo.accNumber)
+                clearInterval(t)
+                resolve()
+              }
+            })
+            .catch((err) => {
+              console.log(err)
+              let Record = {
+                Failed: [],
+                Existed: [],
+                Uploaded: [],
+                FileCount: 0,
+              }
+              let fileList = scope.uploadQueues[index].fileList
+              fileList.forEach((v) => {
+                Record.Failed.push(v.webkitRelativePath)
+              })
+              scope.uploadQueues[index].uploadState.record = Record
+              scope.studyErrorList.push(dicomInfo.accNumber)
+              resolve()
+            })
+        } catch (e) {
+          console.log(e)
+          resolve()
+        }
+      })
+    },
+    dicomToPng(imageId, width, height) {
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let canvas = document.createElement('canvas')
+          canvas.width = width
+          canvas.height = height
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image)
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
+          } else {
+            resolve()
+          }
+        })
+      }).catch((reason) => {
+        reason()
+      })
+    },
+    canvasToBlob(canvas) {
+      return new Promise((resolve) => {
+        canvas.toBlob((blob) => {
+          resolve(blob)
+        })
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
+    // 预览阅片影像
+    handleViewReadingImages(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      var token = getToken()
+      let trialId = this.$route.query.trialId
+      const routeData = this.$router.resolve({
+        path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btnBox,
+.form-group {
+  display: flex;
+  align-items: center;
+}
+#inputForm .file-input {
+  position: relative;
+  overflow: hidden;
+  display: inline-block;
+}
+#inputForm .file-input input[type='file'] {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0;
+  cursor: pointer;
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
new file mode 100644
index 00000000..fb364a44
--- /dev/null
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :fullscreen="true"
+    :close-on-click-modal="false"
+    :before-close="beforeClose"
+    :append-to-body="true"
+    class="uploadDicomAndNonedicom"
+  >
+    <span slot="title">{{ title }}</span>
+    <el-tabs type="border-card" v-model="activeName">
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:dicom')"
+        name="dicom"
+      >
+        <dicomFile
+          v-if="activeName === 'dicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :TaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+        />
+      </el-tab-pane>
+      <el-tab-pane
+        :label="$t('uploadDicomAndNonedicom:label:nonedicom')"
+        name="nonedicom"
+      >
+        <nonedicomFile
+          v-if="activeName === 'nonedicom'"
+          :SubjectId="SubjectId"
+          :SubjectCode="SubjectCode"
+          :Criterion="Criterion"
+          :VisitTaskId="VisitTaskId"
+          :isUpload.sync="isUpload"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+<script>
+import dicomFile from './dicomFile.vue'
+import nonedicomFile from './nonedicomFile.vue'
+import store from '@/store'
+export default {
+  name: 'uploadDicomAndNonedicom',
+  components: { dicomFile, nonedicomFile },
+  props: {
+    visible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      title: '',
+      activeName: 'dicom',
+      isUpload: false,
+    }
+  },
+  mounted() {
+    this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
+    store.dispatch('trials/setUnLock', true)
+  },
+  methods: {
+    beforeClose() {
+      if (
+        this.$route.path !== '/trials/trials-panel/reading/readingTask' &&
+        this.isUpload
+      ) {
+        return window.location.reload()
+      }
+      this.$emit('update:visible', false)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-tabs--left .el-tabs__header.is-left {
+  margin-right: 0;
+}
+.uploadDicomAndNonedicom {
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
+    color: #909399;
+  }
+  ::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
+    color: #428bca;
+    background-color: #fff;
+    border-right-color: #dcdfe6;
+    border-left-color: #dcdfe6;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
new file mode 100644
index 00000000..e0154c1e
--- /dev/null
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -0,0 +1,919 @@
+<template>
+  <div class="nonedicomFile">
+    <div class="top">
+      <span>{{ $t('upload:nonedicom:title') }}</span>
+      <div class="tip">
+        <i class="el-icon-warning-outline"></i>
+        <div v-html="$t('upload:nonedicom:tip:message')"></div>
+      </div>
+    </div>
+    <!--检查列表-->
+    <el-table
+      :data="list"
+      style="width: 100%"
+      v-adaptive="{ bottomOffset: 60 }"
+      :loading="loading"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }"
+    >
+      <!--受试者-->
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:nonedicom:table:subject')"
+      />
+      <!--任务名称-->
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:nonedicom:table:taskName')"
+        sortable="custom"
+      />
+      <!--检查类型-->
+      <el-table-column
+        prop="Modality"
+        :label="$t('upload:nonedicom:table:molityType')"
+        sortable="custom"
+      >
+      </el-table-column>
+      <!--检查部位-->
+      <el-table-column
+        prop="BodyPart"
+        :label="$t('upload:nonedicom:table:bodyPart')"
+        sortable="custom"
+      />
+      <!--原文件数-->
+      <el-table-column
+        prop="FileCount"
+        :label="$t('upload:nonedicom:table:fileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.FileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table :data="scope.row.FileList" height="300" size="small">
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : ''
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.FileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.FileCount }}</span>
+        </template>
+      </el-table-column>
+      <!--后处理文件数-->
+      <el-table-column
+        prop="UploadedFileCount"
+        :label="$t('upload:nonedicom:table:uploadFileCount')"
+      >
+        <template slot-scope="scope">
+          <el-popover
+            v-if="scope.row.UploadedFileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table
+              :data="scope.row.UploadedFileList"
+              height="300"
+              size="small"
+            >
+              <!-- 文件名称 -->
+              <el-table-column
+                prop="FileName"
+                :label="$t('trials:audit:table:nonDicomsFileName')"
+                width="200"
+              />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : ''
+                  }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('common:action:action')" width="120">
+                <template slot-scope="files">
+                  <!-- 预览 -->
+                  <viewer
+                    :ref="files.row.Path"
+                    style="margin: 0 10px"
+                    :images="[`${OSSclientConfig.basePath}${files.row.Path}`]"
+                  >
+                    <el-button
+                      circle
+                      icon="el-icon-view"
+                      :title="$t('upload:nonedicom:button:preview')"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="previewFile(files.row)"
+                    />
+                    <img
+                      v-show="false"
+                      crossorigin="anonymous"
+                      :src="`${OSSclientConfig.basePath}${files.row.Path}`"
+                      alt="Image"
+                    />
+                  </viewer>
+                </template>
+              </el-table-column>
+            </el-table>
+            <div slot="reference" class="name-wrapper">
+              <el-button type="text">
+                {{ scope.row.UploadedFileCount }}
+              </el-button>
+            </div>
+          </el-popover>
+          <span v-else>{{ scope.row.UploadedFileCount }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <!--预览--->
+          <el-button
+            circle
+            :disabled="scope.row.UploadedFileCount <= 0"
+            icon="el-icon-view"
+            :title="$t('upload:nonedicom:button:preview')"
+            @click.stop="handlePreviewNoneDicomFiles(scope.row)"
+          />
+          <!--上传--->
+          <el-button
+            circle
+            icon="el-icon-upload2"
+            :title="$t('upload:nonedicom:button:upload')"
+            @click.native.prevent="handleUpload(scope.row)"
+          />
+          <!--删除--->
+          <el-button
+            :disabled="
+              scope.row.UploadedFileCount <= 0 ||
+              scope.row.ReadingTaskState === 2
+            "
+            circle
+            icon="el-icon-delete"
+            :title="$t('upload:nonedicom:button:delete')"
+            @click.stop="remove(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 预览单个图像 -->
+    <el-dialog
+      v-if="imgObj.visible"
+      :visible.sync="imgObj.visible"
+      :title="$t('upload:nonedicom:dialogTitle:preview')"
+      append-to-body
+      width="565px"
+    >
+      <div
+        v-loading="imgObj.loading"
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <el-image
+          :src="`${OSSclientConfig.basePath}${imgObj.url}`"
+          crossorigin="anonymous"
+          fit="fit"
+          style="height: 500px; width: 500px"
+          @error="imgObj.loading = false"
+          @load="imgObj.loading = false"
+        />
+      </div>
+    </el-dialog>
+    <!-- 上传非dicom文件 -->
+    <el-dialog
+      v-if="uploadVisible"
+      :visible.sync="uploadVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadNonDicoms:dialogTitle:upload')"
+      width="800px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+      @close="resetFileDiaolg"
+    >
+      <!-- 多文件上传 -->
+      <form id="inputForm" ref="uploadForm">
+        <el-divider content-position="left">{{
+          $t('trials:uploadNonDicoms:label:fileType')
+        }}</el-divider>
+        <div class="form-group">
+          <div class="upload" style="margin-right: 10px">
+            <input
+              multiple="multiple"
+              webkitdirectory=""
+              directory
+              accept="*/*"
+              type="file"
+              name="uploadFolder"
+              class="select-file"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
+            </div>
+          </div>
+          <div class="upload">
+            <input
+              class="select-file"
+              multiple=""
+              :accept="faccept.join(',')"
+              type="file"
+              name="uploadFile"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
+            <div class="btn-select">
+              {{ $t('trials:uploadNonDicoms:button:select') }}
+            </div>
+          </div>
+          <!-- <span style="margin-left: 10px">{{
+            $store.state.trials.uploadTip
+          }}</span> -->
+        </div>
+      </form>
+      <!-- 文件列表 -->
+      <el-table
+        ref="filesTable"
+        :data="fileList"
+        class="dicomFiles-table"
+        height="300"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="(row, index) => row.status !== 2 && !btnLoading"
+        />
+        <el-table-column type="index" width="50" />
+        <!-- 文件名称 -->
+        <el-table-column
+          prop="name"
+          :label="$t('trials:uploadNonDicoms:table:fileName')"
+          min-width="100"
+        />
+        <!-- 文件大小 -->
+        <el-table-column
+          prop="size"
+          :label="$t('trials:uploadNonDicoms:table:fileSize')"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.size && scope.row.size > 0
+                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                : ''
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 文件类型 -->
+        <el-table-column
+          prop="type"
+          :label="$t('trials:uploadNonDicoms:table:fileType')"
+        />
+        <!-- 上传状态 -->
+        <el-table-column
+          prop="status"
+          :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0"
+              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-progress
+              color="#409eff"
+              :percentage="
+                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+              "
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('common:action:action')">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              icon="el-icon-delete"
+              circle
+              :disabled="btnLoading"
+              :title="$t('trials:crcUpload:action:delete')"
+              @click="handleRemoveFile(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="selectArr.length == 0"
+          :loading="btnLoading"
+          @click="beginUpload"
+        >
+          {{ $t('trials:uploadNonDicoms:action:upload') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getIRUploadTaskNoneDicomStudyList,
+  deleteTaskStudy,
+} from '@/api/load.js'
+import { preArchiveStudy, uploadNoneDicomFile } from '@/api/trials'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
+let defaultSearchData = () => {
+  return {
+    SubjectId: null,
+    TrialReadingCriterionId: null,
+    SubjectCode: null,
+    Asc: false,
+    SortField: 'TaskBlindName',
+  }
+}
+export default {
+  name: 'nonedicomFile',
+  props: {
+    SubjectId: {
+      type: String,
+      default: '',
+    },
+    SubjectCode: {
+      type: String,
+      default: '',
+    },
+    Criterion: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    VisitTaskId: {
+      type: String,
+      default: '',
+    },
+    isUpload: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      imgObj: { url: '', visible: false, loading: false },
+      uploadVisible: false,
+      fileList: [],
+      selectArr: [],
+      successFileList: [],
+      isFail: false,
+      faccept: ['.jpg', '.jpeg', '.png', '.bmp', '.zip'],
+      fCount: 0,
+      btnLoading: false,
+      currentRow: {},
+      studyMonitorId: null,
+      open: null,
+    }
+  },
+  watch: {
+    isFail() {
+      if (this.isFail) {
+        this.$confirm(
+          this.$t('trials:visit:crcUpload:nomDicomFiles:failUpload'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+          .then(() => {
+            this.beginUpload()
+          })
+          .catch((err) => {
+            this.btnLoading = false
+            console.log(err)
+          })
+      }
+    },
+    btnLoading() {
+      store.dispatch('trials/setUnLock', this.btnLoading)
+    },
+  },
+  created() {
+    this.getList()
+  },
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+  },
+  methods: {
+    async getList() {
+      try {
+        this.searchData.SubjectId = this.SubjectId
+        this.searchData.TrialReadingCriterionId =
+          this.Criterion.TrialReadingCriterionId
+        this.searchData.SubjectCode = this.SubjectCode
+        if (this.VisitTaskId) {
+          this.searchData.VisitTaskId = this.VisitTaskId
+        }
+        this.loading = true
+        let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (err) {
+        this.loading = false
+        console.log(err)
+      }
+    },
+    // 扫描待上传文件
+    beginScanFiles(e) {
+      var files = [...e.target.files]
+      var sameFiles = []
+      files.forEach((file) => {
+        var extendName = file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (
+          this.faccept.indexOf(extendName) !== -1 &&
+          this.fileList.findIndex((v) => v.name === file.name) > -1
+        ) {
+          sameFiles.push(file.name)
+        }
+      })
+      var scope = this
+      if (sameFiles.length > 0) {
+        const h = this.$createElement
+        var msg = this.$t(
+          'trials:uploadNonDicoms:message:exsitSameFile'
+        ).replace('xxx', sameFiles.join(', '))
+        this.$msgbox({
+          message: h('div', { style: 'maxHeight:300px;overflow: auto;' }, [
+            h('p', null, msg),
+            h(
+              'p',
+              null,
+              this.$t('trials:uploadNonDicoms:message:isContinueUpload')
+            ),
+          ]),
+          type: 'warning',
+          showCancelButton: true,
+        })
+          .then(() => {
+            scope.pendingUploadQuene(files)
+          })
+          .catch(() => {
+            scope.resetUploadForm()
+          })
+      } else {
+        scope.pendingUploadQuene(files)
+      }
+    },
+    pendingUploadQuene(files) {
+      for (var i = 0; i < files.length; ++i) {
+        const fileName = files[i].name
+        var extendName = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (this.faccept.indexOf(extendName) !== -1) {
+          files[i].id = `${files[i].lastModified}${files[i].name}`
+          let obj = {
+            name: files[i].name,
+            size: files[i].size,
+            type: extendName.split('.')[1],
+            status: 0,
+            file: files[i],
+            id: `${files[i].lastModified}${files[i].name}`,
+            fileType: files[i].type,
+            uploadFileSize: 0,
+          }
+          this.fileList.push(obj)
+          this.$refs.filesTable.toggleRowSelection(obj, true)
+        }
+      }
+      this.resetUploadForm()
+    },
+    handleRemoveFile(row) {
+      this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          this.fileList.splice(
+            this.fileList.findIndex((item) => item.id === row.id),
+            1
+          )
+          let flag = this.successFileList.some((item) => item.id === row.id)
+          if (flag) {
+            this.successFileList.splice(
+              this.successFileList.findIndex((item) => item.id === row.id),
+              1
+            )
+          }
+        })
+        .catch(() => {})
+    },
+    resetUploadForm() {
+      this.$nextTick(() => {
+        this.$refs.uploadForm.reset()
+      })
+    },
+    // 打开上传文件弹窗
+    handleUpload(row) {
+      this.fileList = []
+      this.uploadVisible = true
+      this.fCount = 0
+      this.currentRow = { ...row }
+    },
+    resetFileDiaolg() {
+      this.btnLoading = false
+      this.uploadVisible = false
+      this.selectArr = []
+      this.successFileList = []
+      this.OSSclient.close()
+    },
+    // 预览文件
+    previewFile(row) {
+      // window.open(row.FullFilePath, '_blank')
+      // this.imgObj.url = row.FullFilePath || row.Path
+      // this.imgObj.loading = true
+      // this.imgObj.visible = true
+      this.$refs[row.Path].$viewer.show()
+    },
+    // 预览单个检查下非Dicom文件
+    handlePreviewNoneDicomFiles(row) {
+      if (this.open) {
+        this.open.close()
+      }
+      let trialId = this.$route.query.trialId
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+      })
+      this.open = window.open(routeData.href, '_blank')
+    },
+    // 删除
+    async remove(item) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t('upload:nonedicom:confirm:delMessage'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+        if (confirm !== 'confirm') return
+        let params = {
+          VisitTaskId: item.VisitTaskId,
+          IsDicom: false,
+          NoneDicomStudyId: item.Id,
+        }
+        let res = await deleteTaskStudy(params)
+        if (res.IsSuccess) {
+          this.getList()
+          this.$emit('update:isUpload', true)
+          this.$message.success(
+            this.$t('trials:uploadImage:message:delSuccess')
+          )
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 获取待上传文件信息
+    handleSelectionChange(selection) {
+      this.selectArr = selection
+    },
+    // 开始上传文件
+    async beginUpload() {
+      this.btnLoading = true
+      this.isFail = false
+      const fileMaxSize = 1024 * 1024 * 1024 * 2 // 1G
+      var currentFilesSize = 0
+      this.selectArr.forEach((item) => {
+        currentFilesSize += item.size
+      })
+      if (currentFilesSize / fileMaxSize > 1) {
+        // 'Upload file size cannot exceed 1G'
+        this.$alert(this.$t('trials:uploadNonDicoms:message:uploadSize'))
+        this.btnLoading = false
+      } else {
+        this.selectArr.forEach((item) => (item.status = 0))
+        let num = this.selectArr.length > 6 ? 6 : this.selectArr.length
+        let funArr = []
+        let res = await preArchiveStudy({
+          subjectVisitId: this.currentRow.SourceSubjectVisitId,
+          isDicom: false,
+          FileCount: this.selectArr.length,
+        })
+        if (res.IsSuccess) {
+          this.studyMonitorId = res.Result
+          for (let i = 0; i < num; i++) {
+            funArr.push(this.handleUploadTask(this.selectArr, i))
+          }
+          if (funArr.length > 0) {
+            let res = await Promise.all(funArr)
+          }
+        } else {
+          this.isFail = true
+        }
+      }
+    },
+    // 并发上传
+    async handleUploadTask(arr, index) {
+      if (!this.uploadVisible) return
+      let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
+      file.status = 1
+      let path = `/${this.$route.query.trialId}/TaskImage/${
+        this.currentRow.SubjectId
+      }/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
+      file.curPath = path
+      const fileData = await this.fileToBlob(file.file)
+      let res = await this.fileToOss(path, fileData, file)
+      if (res) {
+        file.status = 2
+        this.successFileList.push({
+          fileName: file.name,
+          filePath: this.$getObjectName(res.url),
+          fileFize: file.size,
+          fileType: file.fileType,
+        })
+        let flag = arr.every((item) => item.status === 2)
+        if (flag) {
+          let RecordPath = await this.uploadRecord(arr)
+          return this.submitFile(this.successFileList, RecordPath)
+        }
+      } else {
+        file.status = 3
+      }
+      let flag = arr.every((item) => item.status > 1)
+      if (flag) {
+        let failFileList = arr.filter((item) => item.status === 3)
+        if (failFileList && failFileList.length > 0) {
+          let RecordPath = await this.uploadRecord(arr)
+          this.$refs.filesTable.clearSelection()
+          failFileList.forEach((row) => {
+            row.uploadFileSize = 0
+            this.$refs.filesTable.toggleRowSelection(row)
+          })
+          this.isFail = true
+          this.submitFile(this.successFileList, RecordPath, true)
+          return false
+        }
+      }
+      let ind = arr.findIndex((item) => item.status === 0)
+      if (ind >= 0) {
+        return this.handleUploadTask(arr, ind)
+      } else {
+        return false
+      }
+    },
+    // file上传到oss
+    async fileToOss(path, file, item) {
+      try {
+        let res = await this.OSSclient.multipartUpload(
+          {
+            path,
+            file,
+            speed: true,
+          },
+          (percentage, checkpoint, lastPer) => {
+            item.uploadFileSize += checkpoint.size * (percentage - lastPer)
+            if (item.uploadFileSize > file.fileSize) {
+              item.uploadFileSize = file.fileSize
+            }
+          }
+        )
+        if (res) {
+          return res
+        } else {
+          return false
+        }
+      } catch (err) {
+        console.log(err)
+        return false
+      }
+    },
+    // 非Dicom文件上传归档
+    submitFile(uploadedFileList, RecordPath, isReLoad = false) {
+      if (!this.uploadVisible) return
+      this.btnLoading = true
+      var params = {
+        trialId: this.$route.query.trialId,
+        subjectVisitId: this.currentRow.SourceSubjectVisitId,
+        noneDicomStudyId: this.currentRow.Id,
+        studyMonitorId: this.studyMonitorId,
+        VisitTaskId: this.currentRow.VisitTaskId,
+        uploadedFileList: uploadedFileList,
+      }
+      if (RecordPath) {
+        params.RecordPath = RecordPath.path
+        params.FailedFileCount = RecordPath.Record.Failed.length
+      }
+      uploadNoneDicomFile(params)
+        .then((res) => {
+          if (!isReLoad) {
+            this.resetFileDiaolg()
+          }
+          this.getList()
+          this.$emit('update:isUpload', true)
+          // 刷新父组件列表
+          this.$emit('getList')
+          this.$message.success(
+            this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully')
+          )
+        })
+        .catch(() => {
+          this.btnLoading = false
+        })
+    },
+    // 上传提交记录
+    uploadRecord(arr) {
+      return new Promise(async (resolve) => {
+        try {
+          let Record = {
+            Failed: [],
+            Existed: [],
+            Uploaded: [],
+            FileCount: arr.length,
+          }
+          arr.forEach((item) => {
+            let file = this.fileList.find((data) => data.id === item.id)
+            if (file.status === 2) {
+              Record.Uploaded.push(file.curPath)
+            }
+            if (file.status === 3) {
+              Record.Failed.push(file.curPath)
+            }
+          })
+          let text = JSON.stringify(Record)
+          let logJsonBlob = this.generateTxtFile(text)
+          let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
+          let logRes
+          try {
+            logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
+            if (logRes && logRes.url) {
+              resolve({ path: this.$getObjectName(logRes.url), Record })
+            } else {
+              resolve(false)
+            }
+          } catch (e) {
+            resolve(false)
+          }
+        } catch (err) {
+          console.log(err)
+          resolve(false)
+        }
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.top {
+  margin: 10px 0;
+}
+.upload {
+  display: inline-block;
+  height: 30px;
+  width: 90px;
+  padding: 2px 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+  .select-file {
+    height: 30px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    width: 90px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin-top: 5px;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
new file mode 100644
index 00000000..aa957a97
--- /dev/null
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -0,0 +1,291 @@
+<template>
+  <div v-if="model_cfg.visible">
+    <base-model :config="model_cfg">
+      <div slot="dialog-body">
+        <el-table :data="modelList" style="width: 100%" height="300">
+          <!--检查编号-->
+          <el-table-column
+            prop="StudyCode"
+            :label="$t('trials:uploadImage:table:StudyCode')"
+          />
+          <!--检查类型-->
+          <el-table-column
+            prop="ModalityForEdit"
+            :label="$t('trials:uploadImage:table:ModalityForEdit')"
+            v-if="IsDicom"
+          />
+          <!--检查模态-->
+          <el-table-column
+            prop="Modalities"
+            :label="$t('trials:uploadImage:table:Modalities')"
+            v-if="IsDicom"
+          />
+          <!--检查部位-->
+          <el-table-column
+            prop="BodyPartForEdit"
+            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+            v-if="IsDicom"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                $fd(
+                  'Bodypart',
+                  scope.row.BodyPartForEdit,
+                  'Code',
+                  { Bodypart: bodyPart },
+                  'Name'
+                )
+              }}</span>
+            </template>
+          </el-table-column>
+          <!--序列数量-->
+          <el-table-column
+            prop="SeriesCount"
+            :label="$t('trials:uploadImage:table:SeriesCount')"
+            v-if="IsDicom"
+          />
+          <!--图像数量-->
+          <el-table-column
+            prop="InstanceCount"
+            :label="$t('trials:uploadImage:table:InstanceCount')"
+            v-if="IsDicom"
+          />
+          <!--检查时间-->
+          <el-table-column
+            prop="StudyTime"
+            :label="$t('trials:uploadImage:table:StudyTime')"
+            v-if="IsDicom"
+            min-width="130"
+          />
+          <!--检查模态-->
+          <el-table-column
+            prop="Modality"
+            :label="$t('trials:uploadImage:table:Modalities')"
+            v-if="!IsDicom"
+          />
+          <!--检查部位-->
+          <el-table-column
+            prop="BodyPart"
+            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
+            v-if="!IsDicom"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                $fd(
+                  'Bodypart',
+                  scope.row.BodyPart,
+                  'Code',
+                  { Bodypart: bodyPart },
+                  'Name'
+                )
+              }}</span>
+            </template>
+          </el-table-column>
+          <!--文件数量-->
+          <el-table-column
+            prop="FileCount"
+            :label="$t('trials:uploadImage:table:FileCount')"
+            v-if="!IsDicom"
+          />
+          <!--检查时间-->
+          <el-table-column
+            prop="ImageDate"
+            :label="$t('trials:uploadImage:table:StudyTime')"
+            v-if="!IsDicom"
+            min-width="130"
+          />
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            width="80"
+          >
+            <template slot-scope="scope">
+              <!--预览--->
+              <el-button
+                circle
+                icon="el-icon-view"
+                :title="$t('trials:uploadImage:button:preview')"
+                v-if="!isUpload"
+                @click.stop="preview(scope.row)"
+              />
+              <!--编辑--->
+              <el-button
+                circle
+                icon="el-icon-edit-outline"
+                :title="$t('trials:uploadImage:button:edit')"
+                v-else
+                @click.stop="openEdit(scope.row)"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </base-model>
+    <!--新增检查部位-->
+    <base-model v-if="editModality_model.visible" :config="editModality_model">
+      <template slot="dialog-body">
+        <el-form
+          ref="editModalityform"
+          :inline="true"
+          :model="form"
+          class="demo-form-inline"
+          :rules="rules"
+        >
+          <el-form-item
+            :label="$t('trials:uploadImage:form:ModalityForEdit')"
+            prop="Modality"
+            label-width="150px"
+          >
+            <el-select v-model="form.Modality" placeholder="">
+              <el-option
+                v-for="item in TrialModality"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </template>
+      <template slot="dialog-footer">
+        <el-button
+          type="primary"
+          @click="updateTaskStudyModality"
+          :loading="loading"
+        >
+          {{ $t('common:button:confirm') }}
+        </el-button>
+        <el-button
+          @click="editModality_model.visible = false"
+          :loading="loading"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+      </template>
+    </base-model>
+  </div>
+</template>
+<script>
+import baseModel from '@/components/BaseModel'
+import { getToken } from '@/utils/auth'
+import { updateTaskStudyModality } from '@/api/load.js'
+export default {
+  name: 'studyView',
+  props: {
+    model_cfg: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
+    bodyPart: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    modelList: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    TrialModality: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
+    visitTaskId: {
+      type: String,
+    },
+    IsDicom: {
+      required: true,
+      type: Boolean,
+      default: true,
+    },
+    isUpload: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+  },
+  components: {
+    'base-model': baseModel,
+  },
+  data() {
+    return {
+      form: {
+        Modality: null,
+        TaskStudyId: null,
+      },
+      editModality_model: {
+        visible: false,
+        title: this.$t('trials:uploadImage:button:edit'),
+        width: '500px',
+        appendToBody: true,
+      },
+      rules: {
+        Modality: [
+          {
+            required: true,
+            message: this.$t('trials:uploadImage:format:notModality'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      loading: false,
+    }
+  },
+  methods: {
+    // 预览
+    preview(row) {
+      let routeData = null
+      if (this.IsDicom) {
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}`,
+        })
+      } else {
+        let trialId = this.$route.query.trialId
+        var token = getToken()
+        routeData = this.$router.resolve({
+          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+        })
+      }
+      window.open(routeData.href, '_blank')
+    },
+    // 打开编辑
+    openEdit(row) {
+      this.form.TaskStudyId = row.Id
+      this.form.Modality = row.ModalityForEdit
+      this.editModality_model.visible = true
+    },
+    // 修改检查类型
+    async updateTaskStudyModality() {
+      try {
+        let validate = await this.$refs.editModalityform.validate()
+        if (!validate) return false
+        this.loading = true
+        let res = await updateTaskStudyModality(this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.modelList.some((item) => {
+            if (this.form.TaskStudyId === item.Id) {
+              item.ModalityForEdit = this.form.Modality
+            }
+            return this.form.TaskStudyId === item.Id
+          })
+          this.editModality_model.visible = false
+          this.$emit('getList')
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/components/uploadImage/index.vue b/src/components/uploadImage/index.vue
index 1d6d6067..d00de1f0 100644
--- a/src/components/uploadImage/index.vue
+++ b/src/components/uploadImage/index.vue
@@ -102,7 +102,6 @@
 import uploadList from "./components/upload-list.vue";
 import studyView from "./components/study-view.vue";
 import { getSubjectImageUploadList, deleteTaskStudy } from "@/api/load.js";
-import { downloadImage } from "@/utils/uploadZip.js";
 import store from "@/store";
 export default {
   name: "uploadImage",
@@ -591,7 +590,7 @@ export default {
         files.push(obj);
       }
       store.dispatch("trials/setUnLock", true);
-      let res = await downloadImage(zipName, files);
+      // let res = await downloadImage(zipName, files);
       store.dispatch("trials/setUnLock", false);
     },
   },
diff --git a/src/main.js b/src/main.js
index 7b1423e2..4cbcdfbc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,25 +28,22 @@ Vue.use(permission)
 
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
-
-Vue.use(Viewer)
 Viewer.setDefaults({
-  Options: {
-    'inline': true,
-    'button': true,
-    'navbar': true,
-    'title': true,
-    'toolbar': true,
-    'tooltip': true,
-    'movable': true,
-    'zoomable': true,
-    'rotatable': true,
-    'scalable': true,
-    'transition': true,
-    'keyboard': true,
-    'url': 'data-source'
+  // navbar: true, //底部缩略图
+  toolbar: {
+    zoomIn: true,
+    zoomOut: true,
+    reset: true,
+    prev: true,
+    next: true,
+    rotateLeft: true,
+    rotateRight: true,
+    flipHorizontal: true,
+    flipVertical: true,
   }
 })
+Vue.use(Viewer)
+
 
 import hasPermi from './directive/permission'
 Vue.use(hasPermi)
@@ -148,6 +145,12 @@ Vue.config.productionTip = false
 Vue.prototype.$upload = () => {
   _vm.$forceUpdate()
 }
+Vue.prototype.$guid = () => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
 Vue.prototype.fileToBlob = (file) => {
   // 创建 FileReader 对象
   const reader = new FileReader()
@@ -252,6 +255,19 @@ async function VueInit() {
     } catch (e) {
     }
   }
+  Vue.prototype.$company = (isShort = true) => {
+    let companyName = null
+    if (localStorage.getItem('CompanyInfo')) {
+      let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
+      let isZh = zzSessionStorage.getItem('lang') === 'zh' || _vm.$i18n.locale == 'zh'
+      if (isZh) {
+        companyName = isShort ? CompanyInfo.CompanyShortNameCN : CompanyInfo.CompanyNameCN
+      } else {
+        companyName = isShort ? CompanyInfo.CompanyShortName : CompanyInfo.CompanyName
+      }
+    }
+    return companyName;
+  }
   Vue.prototype.$updateDictionary = function () {
     Vue.prototype.$d = function (code) {
       var dictInfo = res.Result
@@ -296,7 +312,8 @@ async function VueInit() {
     data: {
       unlock: {
         my_username: null,
-        my_password: null
+        my_password: null,
+        view: false
       }
     },
     render: h => h(App)
@@ -368,7 +385,7 @@ async function VueInit() {
   // process.env.VUE_APP_LOGOUT_FOR_TIME
   // eval(process.env.VUE_APP_LOCK_FOR_PERMISSION)
   // process.env.VUE_APP_LOCK_FOR_TIME
-  window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
+  // window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
     if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
@@ -440,7 +457,8 @@ async function VueInit() {
                 _vm.$message.success(_vm.$t("env:lock:msgBox:lockSuccess"))
                 _vm.unlock = {
                   my_username: null,
-                  my_password: null
+                  my_password: null,
+                  view: false
                 }
                 isOpen = false
                 count = 0;
@@ -504,16 +522,21 @@ async function VueInit() {
             ]),
             h('el-form-item', {
               props: { label: _vm.$t("env:lock:msgBox:form:Password") },
+              attrs: {
+                style: "position: relative;"
+              }
             }, [
               h('input', {
                 props: {
                   value: _vm.unlock.my_password
                 },
+                ref: "unlock_my_password_input",
                 attrs: {
                   id: 'my_password',
                   class: 'el-input__inner',
-                  type: 'password',
-                  autocomplete: 'new-password'
+                  type: _vm.unlock.view ? 'text' : 'password',
+                  autocomplete: 'new-password',
+                  style: "padding-right:25px"
                 },
                 on: {
                   change: (event) => {
@@ -523,7 +546,24 @@ async function VueInit() {
                     _vm.unlock.my_password = event.target.value
                   }
                 }
-              })
+              }),
+              h('i', {
+                attrs: {
+                  id: 'my_password_view',
+                  class: "el-icon-view",
+                  style: "cursor: pointer;position: absolute;top:35%;right:10px"
+                },
+                on: {
+                  click: (event) => {
+                    _vm.unlock.view = !_vm.unlock.view
+                    if (_vm.unlock.view) {
+                      _vm.$refs['unlock_my_password_input'].type = "text"
+                    } else {
+                      _vm.$refs['unlock_my_password_input'].type = "password"
+                    }
+                  },
+                }
+              }),
             ])
           ])
         ])
diff --git a/src/permission.js b/src/permission.js
index 20d84cf6..f2a95bc1 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -6,11 +6,12 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
+import WHITELIST from "./utils/whiteList"
 // import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const whiteList = WHITELIST
 store.state.trials.whiteList = whiteList;
 router.beforeEach(async (to, from, next) => {
   NProgress.start()
@@ -25,15 +26,15 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
         await this.$store.dispatch('user/logout')
-        OSSclient()
+        await OSSclient()
       }
       if (to.path === '/ReviewersResearchForm') {
-        OSSclient()
+        await OSSclient()
       }
       next()
       NProgress.done()
     } else {
-      OSSclient()
+      await OSSclient()
       const hasGetUserInfo = store.getters.userId
       if (hasGetUserInfo) {
         next()
@@ -66,7 +67,7 @@ router.beforeEach(async (to, from, next) => {
       } else {
         // 在免登录whiteList中，直接进入
         if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
-          OSSclient()
+          await OSSclient()
         }
         next()
       }
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index efe3cbc4..4a411426 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -35,26 +35,50 @@ const getDefaultState = () => {
   }
 }
 function getQuestions(questions) {
+  const criterionType = parseInt(localStorage.getItem('CriterionType'))
   questions.forEach(item => {
-    if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
       item.TableQuestions.Answers.forEach(answerObj => {
-        answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
-        answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
-        answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
-        answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
         answerObj.isDicomReading = answerObj.IsDicomReading === 'True'
-        var isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
-        isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
-        answerObj.isLymphLesion = isLymphLesion
-        answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
-        var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
-        answerObj.lesionNum = lesionNum
+
         if (answerObj.RowId) {
-          var idx = item.TableQuestions.Questions.findIndex(i => i.QuestionMark === 11)
-          if (idx > -1) {
+          if (criterionType === 10) {
             // pcwg
+            var lesionNum = getQuestionAnswer(item.TableQuestions.Questions, 11, answerObj)
+            answerObj.lesionNum = lesionNum
             answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionNum)) ? 1 : 2
+          } else if (criterionType === 19) {
+            // ivus
+            answerObj.area1 = getQuestionAnswer(item.TableQuestions.Questions, 1001, answerObj)
+            answerObj.area2 = getQuestionAnswer(item.TableQuestions.Questions, 1002, answerObj)
+            const v = getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
+            answerObj.diff = v
+            answerObj.saveTypeEnum = isNaN(parseFloat(v)) ? 1 : 2
+          } else if (criterionType === 20) {
+            // oct
+            if (item.LesionType === 101) {
+              answerObj.l1 = getQuestionAnswer(item.TableQuestions.Questions, 1011, answerObj)
+              answerObj.l2 = getQuestionAnswer(item.TableQuestions.Questions, 1012, answerObj)
+              answerObj.l3 = getQuestionAnswer(item.TableQuestions.Questions, 1013, answerObj)
+              const min = getQuestionAnswer(item.TableQuestions.Questions, 1014, answerObj)
+              answerObj.min = min
+              const mean = getQuestionAnswer(item.TableQuestions.Questions, 1015, answerObj)
+              answerObj.mean = mean
+              answerObj.saveTypeEnum = (isNaN(parseFloat(min)) || isNaN(parseFloat(mean))) ? 1 : 2
+            } else if (item.LesionType === 103) {
+              const angle = getQuestionAnswer(item.TableQuestions.Questions, 1016, answerObj)
+              answerObj.angle = angle
+              answerObj.saveTypeEnum = isNaN(parseFloat(angle)) ? 1 : 2
+            }
           } else {
+            answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
+            answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
+            answerObj.lesionLength = getQuestionAnswer(item.TableQuestions.Questions, 0, answerObj)
+            answerObj.lesionShort = getQuestionAnswer(item.TableQuestions.Questions, 1, answerObj)
+            let isLymphLesion = getQuestionAnswer(item.TableQuestions.Questions, 2, answerObj)
+            isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+            answerObj.isLymphLesion = isLymphLesion
+            answerObj.lesionState = getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
             answerObj.saveTypeEnum = isNaN(parseInt(answerObj.lesionState)) ? 1 : 2
           }
         } else {
@@ -70,7 +94,7 @@ function getQuestions(questions) {
 }
 function findQuestionAndRemoveLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
       var idx = questions[i].TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(obj.rowIndex))
       if (idx > -1) {
         questions[i].TableQuestions.Answers.splice(idx, 1)
@@ -86,7 +110,7 @@ function findQuestionAndRemoveLesion(questions, obj) {
 function findQuestionAndUpdateLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
     var item = questions[i]
-    if (item.Type === 'table' && item.Id === obj.questionId) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
       var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
       item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
       item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
@@ -115,10 +139,10 @@ function findQuestionAndUpdateLesion(questions, obj) {
 }
 function findQuestionAndAddLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
       var sourceObj = {}
       questions[i].TableQuestions.Questions.forEach(item => {
-        sourceObj[item.Id] = ''
+        sourceObj[item.Id] = null
       })
       var targetObj = Object.assign(sourceObj, obj.lesionObj)
       targetObj.IsCurrentTaskAdd = 'True'
@@ -811,9 +835,16 @@ const actions = {
               // }
               series.InstanceInfoList.forEach(instance => {
                 if (instance.NumberOfFrames && instance.NumberOfFrames > 1) {
-                  for (let i = 0; i < instance.NumberOfFrames; i++) {
-                    const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
-                    imageIds.push(imageId)
+                  if (study.IsCriticalSequence && instance.KeyFramesList.length > 0) {
+                    instance.KeyFramesList.map(i => {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    })
+                  } else {
+                    for (let i = 0; i < instance.NumberOfFrames; i++) {
+                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+                      imageIds.push(imageId)
+                    }
                   }
                   instance.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${0}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                 } else {
@@ -1053,7 +1084,10 @@ const actions = {
     return new Promise(resolve => {
       var isReadingTaskViewInOrder = localStorage.getItem('isReadingTaskViewInOrder')
       if (parseInt(isReadingTaskViewInOrder) === 2) {
-        if (!state.lastCanvasTaskId) state.lastCanvasTaskId = taskId
+        if (!state.lastCanvasTaskId) {
+          console.log('setLastCanvasTaskId')
+          state.lastCanvasTaskId = taskId
+        }
       } else {
         state.lastCanvasTaskId = taskId
       }
diff --git a/src/store/modules/trials.js b/src/store/modules/trials.js
index b66e3bd5..cb52300b 100644
--- a/src/store/modules/trials.js
+++ b/src/store/modules/trials.js
@@ -9,7 +9,7 @@ const getDefaultState = () => {
     studyListQuery: null,
     unlock: false,
     config: {},
-    uploadTip: null,
+    uploadTip: '0.00KB/s',
     timer: null,
     whiteList: [],
     checkTaskId: null
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 70ef429f..a2cf9be9 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -97,6 +97,7 @@ const actions = {
           zzSessionStorage.setItem('my_username', username.trim())
           zzSessionStorage.setItem('my_password', md5(password))
           zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail)
+          localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
           if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
             try {
diff --git a/src/utils/dcmUpload/dcmUpload.js b/src/utils/dcmUpload/dcmUpload.js
index 56ab4599..9230c62d 100644
--- a/src/utils/dcmUpload/dcmUpload.js
+++ b/src/utils/dcmUpload/dcmUpload.js
@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import { anonymization } from './anonymization'
-export const dcmUpload = async function (name, file, config) {
+export const dcmUpload = async function (data, config, progressFn) {
   return new Promise(async resolve => {
     try {
       // let blob = await encoder(file, config)
-      let blob = await fileToBlob(file)
+      let blob = await fileToBlob(data.file)
       if (config) {
-        blob = await anonymization(file, config)
+        blob = await anonymization(data.file, config)
       }
-      let res = await Vue.prototype.OSSclient.put(name, blob.blob)
+      let res = await Vue.prototype.OSSclient.multipartUpload(Object.assign(data, { file: blob.blob }), progressFn)
       resolve({
         ...res,
         image: blob.pixelDataElement
@@ -19,7 +19,7 @@ export const dcmUpload = async function (name, file, config) {
 
 
     } catch (e) {
-      console.log(file, 'warning')
+      console.log(data.file, 'warning')
       resolve(false)
       console.log(e)
     }
diff --git a/src/utils/encrypt/crypto.js b/src/utils/encrypt/crypto.js
new file mode 100644
index 00000000..474fbfdd
--- /dev/null
+++ b/src/utils/encrypt/crypto.js
@@ -0,0 +1,44 @@
+// crypto.js
+import CryptoJS from 'crypto-js';
+import { JSEncrypt } from "jsencrypt";
+import { getPublicKey } from "@/api/user.js"
+export const Crypto = {
+    AES: {
+        encrypt: function (plaintext, secretKey) {
+            return CryptoJS.AES.encrypt(plaintext, CryptoJS.enc.Utf8.parse(secretKey), {
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7,
+                iv: ''
+            }).ciphertext.toString(CryptoJS.enc.Base64);
+        },
+        decrypt: function (ciphertext, secretKey) {
+            const bytes = CryptoJS.AES.decrypt(ciphertext, secretKey);
+            return bytes.toString(CryptoJS.enc.Utf8);
+        }
+    }
+};
+export const Encrypt = {
+    encrypt: async function (plaintext) {
+        let PublicKey = null;
+        if (sessionStorage.getItem('PublicKey')) {
+            PublicKey = atob(sessionStorage.getItem('PublicKey'));
+        } else {
+            try {
+                let res = await getPublicKey();
+                if (res.IsSuccess) {
+                    PublicKey = atob(res.Result)
+                    sessionStorage.setItem('PublicKey', res.Result)
+                } else {
+                    return false;
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        }
+        let encryptor = new JSEncrypt()
+        encryptor.setPublicKey(PublicKey)
+        return encryptor.encrypt(plaintext)
+
+    },
+
+};
diff --git a/src/utils/encrypt/index.js b/src/utils/encrypt/index.js
new file mode 100644
index 00000000..606451aa
--- /dev/null
+++ b/src/utils/encrypt/index.js
@@ -0,0 +1,30 @@
+import { Encrypt, Crypto } from "./crypto";
+export const encryptConfig = async (config) => {
+    let secretKey = randomRange(32, 32);
+    let encryptSecretKey = await Encrypt.encrypt(secretKey); // 密钥进行非对称加密
+    if (encryptSecretKey) {
+        config.headers['X-Encrypted-Key'] = encryptSecretKey;
+    }
+    if (config.data && Object.prototype.toString.call(config.data) === '[object Object]') {
+        Object.keys(config.data).forEach(async key => {
+            config.data[key] = Crypto.AES.encrypt(config.data[key], secretKey)
+            console.log(config.data[key], 'KEY')
+            // config.data[key] = await Encrypt.encrypt(config.data[key])
+        })
+    }
+    return config;
+}
+const randomRange = (min, max, charStr) => {
+    var returnStr = "",
+        range;
+    if (typeof max == 'string') {
+        charStr = max;
+    }
+    range = ((max && typeof max == 'number') ? Math.round(Math.random() * (max - min)) + min : min);
+    charStr = charStr || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    for (var i = 0; i < range; i++) {
+        var index = Math.round(Math.random() * (charStr.length - 1));
+        returnStr += charStr.substring(index, index + 1);
+    }
+    return returnStr;
+}
\ No newline at end of file
diff --git a/src/utils/multipartUpload/aws.js b/src/utils/multipartUpload/aws.js
new file mode 100644
index 00000000..62ab0401
--- /dev/null
+++ b/src/utils/multipartUpload/aws.js
@@ -0,0 +1,457 @@
+const {
+    CreateMultipartUploadCommand,
+    UploadPartCommand,
+    CompleteMultipartUploadCommand,
+    ListMultipartUploadsCommand,//bucket中正在上传的文件列表
+    ListPartsCommand,//列出文件已上传的分片
+    GetObjectCommand,//获取文件
+} = require("@aws-sdk/client-s3");
+import SparkMD5 from "./spark-md5.min.js";
+import store from "@/store";
+let timer = null,  // 网速定时器
+    bytesReceivedPerSecond = {}; // 时间节点上传文件总量
+export function AWSclose() {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+        store.state.trials.uploadTip = '0KB/s'
+    }
+    bytesReceivedPerSecond = {};
+}
+//查询文件是否存在于bucket或者正在上传
+export async function exist(s3, bucket, fileInformation, progressFn, changeStatus) {
+    // 拿到上传到的file
+    const File = fileInformation.file;
+    // 拿到上传的size
+    const uploadFileSize = File.size; // 这里拿到的单位是字节(uploadFileSize/ 1024 / 1024
+    // = 多少兆)
+    // 设置每一片的大小,shardSize 指定上传的每个分片的大小，范围为100 KB~5 GB。
+    // 分片标准为5MB,文件总大小大于5GB分片为20MB
+    let shardSize = 5 * 1024 * 1024;
+    if (uploadFileSize < shardSize) {
+        shardSize = uploadFileSize;
+    }
+    if (uploadFileSize > 5 * 1024 * 1024 * 1024) {
+        shardSize = 20 * 1024 * 1024;
+    }
+    fileInformation = Object.assign({
+        shardSize,
+        sharding: []
+    }, fileInformation)
+    if (fileInformation.speed) {
+        setTimer();
+    }
+    // 1、查询该文件是否已上传到bucket
+    //判断sharding里面是否有东西，有东西证明已经上传过分片了，不需要再进行检测
+    if (fileInformation.sharding.length === 0) {
+        let existBucket = await existInBucket({ s3, bucket, fileInformation: fileInformation });
+        if (existBucket === 'true') {
+            progressFn(1, fileInformation.file, 0);
+            changeStatus(fileInformation.path, 'success');//直接告诉前端，状态
+            return;
+        } else if (existBucket === 'same key') {
+            console.log(fileInformation.path + "  bucket中存在同名不同内容的文件");
+        } else if (existBucket === 'not exist') {
+            console.log(fileInformation.path + "  bucket中不存在该文件");
+        }
+        //2、查询该文件是否存在上传事件
+        let upload = await existUpload({ s3, bucket: bucket, fileInformation: fileInformation });
+        if (upload.code === 0) {
+            //存在该上传事件并且已经上传了多个分片
+            console.log(fileInformation.path + "  存在上传事件，并已经上传多个分片");
+            //将分片存入sharding
+            const uploadId = upload.uploadId;
+            let parts = upload.parts;
+            let SIZE = 0;
+            for (let i = 0; i < parts.length; i++) {
+                SIZE += parts[i].Size;
+                fileInformation.sharding.push({ ETag: parts[i].ETag, PartNumber: parts[i].PartNumber, Size: parts[i].Size, UploadId: uploadId });
+            }
+            progressFn(SIZE / uploadFileSize, { fileSize: uploadFileSize }, 0);//告诉前端，加入分片
+            //重新上传
+            await uploadFile({ fileInformation: fileInformation, uploadId: uploadId, bucket, changeStatus, getSuspend, progressFn });
+        } else if (upload.code === 1) {
+            // //重名但是不同文件
+            console.log('err 重名文件')
+            changeStatus(fileInformation.path, 'same key');
+        } else if (upload.code === 2) {
+            //没有上传事件
+            console.log(fileInformation.path + "  不存在上传事件");
+            //建立分段上传事件
+            const connect = await createMultipartUpload({ s3, bucket: bucket, key: fileInformation.path, type: fileInformation.file.type });
+            //上传整个文件
+            await uploadFile({ s3, fileInformation: fileInformation, uploadId: connect.UploadId, bucket: bucket, changeStatus, progressFn });
+        }
+    } else {
+        //分片组里面有东西
+        //重新上传
+        await uploadFile({ s3, fileInformation: fileInformation, uploadId: fileInformation.sharding[0].UploadId, bucket, changeStatus, progressFn });
+    }
+}
+
+//上传文件未上传的所有分片
+async function uploadFile({ s3, fileInformation, uploadId, bucket, changeStatus, progressFn }) {//   file:上传文件,   uploadId  parts:已上传的分片
+    const chunkCount = Math.ceil(fileInformation.file.size / fileInformation.shardSize)//总分片数
+    //循环切片并上传
+    for (let i = 0; i < chunkCount; i++) {
+        let start = i * fileInformation.shardSize;//文件分片开始位置
+        let end = Math.min(fileInformation.file.size, start + fileInformation.shardSize)//文件分片结束位置
+        let _chunkFile = fileInformation.file.slice(start, end);//切片文件 即 待上传文件分片
+        //判断parts中是否存在该分片
+        let res1 = fileInformation.sharding.filter((part) => {
+            return part.PartNumber === (i + 1);
+        });
+        if (res1.length === 0) {
+            //不包含该分片
+            const upload = await uploadPart({ s3, f: _chunkFile, uploadId: uploadId, key: fileInformation.path, bucket: bucket, num: i + 1 });//将分片上传
+            //判断sharding中是否存在该分片，如果不存在的话，才判错
+            let res2 = fileInformation.sharding.filter((part) => {
+                return part.PartNumber === (i + 1);
+            });
+            if (res2.length === 0) {
+                if (upload !== 'err') {//上传分片成功，并且没有暂停上传
+                    //判断是否存在该分片
+                    //判断parts中是否存在该分片
+                    let res3 = fileInformation.sharding.filter((part) => {
+                        return part.PartNumber === (i + 1);
+                    });
+                    if (res3.length === 0) {
+                        let LASTSIZE = fileInformation.sharding.reduce((sum, item) => sum + item.Size, 0)
+                        fileInformation.sharding.push({ ETag: upload.ETag, PartNumber: i + 1, Size: _chunkFile.size, UploadId: uploadId });//上传成功，存到sharding
+                        let SIZE = fileInformation.sharding.reduce((sum, item) => sum + item.Size, 0)
+                        let lastPercentage = LASTSIZE / fileInformation.file.size, percentage = SIZE / fileInformation.file.size;
+                        progressFn(percentage, fileInformation.file, lastPercentage);
+                        if (fileInformation.speed) {
+                            let time = new Date().getTime();
+                            let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+                            let bytesTime = timeList.find(item => time - item < 1000);
+                            if (bytesTime) {
+                                bytesReceivedPerSecond[bytesTime] += fileInformation.file.size * (percentage - lastPercentage);
+                            } else {
+                                console.log("未查询到时间")
+                                if (timeList.length > 0) {
+                                    bytesReceivedPerSecond[timeList[timeList.length - 1]] += fileInformation.file.size * (percentage - lastPercentage);
+                                } else {
+                                    bytesReceivedPerSecond[time] = fileInformation.file.size * (percentage - lastPercentage);
+                                }
+                            }
+                        }
+                    }
+                } else if (upload === 'err') {
+                    changeStatus(fileInformation.path, 'err');
+                    return;
+                }
+            }
+
+        }
+    }//for
+    if (fileInformation.sharding.length === chunkCount) {
+        //合并分片
+        const complete = await completeMultipartUpload({ s3, bucket: bucket, key: fileInformation.path, sharding: fileInformation.sharding, uploadId: uploadId });
+        if (complete !== 'err') {
+            changeStatus(fileInformation.path, 'success');//通知前端，上传成功
+        } else {
+            changeStatus(fileInformation.path, 'err');//通知前端，上传失败
+        }
+
+    }
+}
+
+// 判断该文件是否已经存在于bucket
+// bucket   file:上传文件
+// 返回值  'same key':同名不同文件 'not exist':不存在该文件  'true':该文件已存在bucket中
+async function existInBucket({ s3, bucket, fileInformation }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    //getObject 每次最多传回767448b的数据，所以要分段请求
+    let bucketFileUniArray = [];
+    // 分段
+    let count = Math.ceil(fileInformation.file.size / 767448);
+    if (count > 4) {
+        count = 4;
+    }
+    for (let i = 0; i < count; i++) {
+        const obj = await getObject({ s3, bucket: bucket, fileInformation: fileInformation, count: i });
+        if (obj !== 'err') {
+            //获取文件的文件体 计算某个分片的md5
+            const fileBody = obj.Body;
+            let fileUnitArray = await fileBody.transformToByteArray();
+            bucketFileUniArray = [...bucketFileUniArray, ...fileUnitArray];
+        } else {
+            return 'not exist';
+        }
+    }
+    let bucketFileBufferArray = new Uint8Array(bucketFileUniArray);
+    // 将传入文件的fileReader 转成  arrayBuffer
+    let fileArrayBuff = null;
+    fileArrayBuff = await new Promise((resolve) => {
+        let fileReader = new FileReader();
+        fileReader.readAsArrayBuffer(fileInformation.file.slice(0, count * 767448));
+        fileReader.onload = (e) => {
+            resolve(e.target.result);
+        };
+    });
+    if (fileArrayBuff.byteLength > count * 767448) {
+        fileArrayBuff = fileArrayBuff.slice(0, count * 767448);
+    }
+    let bodyMD5 = await getMD5({ arrayBuffer: bucketFileBufferArray.buffer });
+    let fileMD5 = await getMD5({ arrayBuffer: fileArrayBuff });
+    if (bodyMD5 === fileMD5) {
+        //证明是同一个文件 秒传
+        return 'true';
+    } else {
+        return 'same key';
+    }
+}
+
+//判断该文件是否正在上传
+// bucket:bucket   file:上传文件
+//返回值 'not exist upload':不存在上传事件  'same key':同名不同文件
+async function existUpload({ s3, bucket, fileInformation }) {
+    //判断该文件是否有上传事件
+    const listUploads = await listMultipartUploadsCommand({ s3, bucket: bucket, key: fileInformation.path });
+    if (listUploads !== 'err') {
+        if (listUploads.Uploads !== undefined && listUploads.Uploads.length > 0) {
+            //存在上传事件 获取上传的第一个分片的eTag，计算传入文件md5，相比较是否相同
+            const uploads = listUploads.Uploads;
+            for (const one in uploads) {//可能存在多个连接
+                let uploadOne = uploads[one];
+                const uploadId = uploadOne.UploadId;//UploadId
+                const key = uploadOne.Key;//key
+                //查询该文件已上传分片
+                const listParts = await listPartsCommand({ s3, bucket: bucket, key: key, uploadId: uploadId });
+                if (listParts !== 'err') {
+                    if (listParts.Parts !== undefined && listParts.Parts.length !== 0) {
+                        //存在分片
+                        let etag = listParts.Parts[0].ETag;
+                        //计算文件的第一个分片的md5
+                        let fileSlice = null;
+                        if (fileInformation.file.size > fileInformation.shardSize) {
+                            fileSlice = fileInformation.file.slice(0, fileInformation.shardSize);
+                        } else {
+                            fileSlice = fileInformation.file;
+                        }
+                        let fileMD5 = await new Promise((resolve) => {
+                            const fileReader = new FileReader();
+                            var spark = new SparkMD5.ArrayBuffer();
+                            fileReader.readAsArrayBuffer(fileSlice);
+                            fileReader.onload = (e) => {
+                                spark.append(e.target.result);
+                                var m = spark.end();
+                                resolve(m);
+                            };
+                        });
+                        if (etag.split('"')[1] === fileMD5) {
+                            //是同一个文件上传
+                            return {
+                                code: 0,
+                                message: 'true',
+                                uploadId: uploadId,
+                                key: key,
+                                parts: listParts.Parts
+                            }
+                        } else {
+                            //同名不同文件
+                            continue;
+                        }
+                    } else {
+                        //该文件有进行上传，但没有上传完成一个分片
+                        continue;
+                    }
+                } else {
+                    //有连接，没上传分片
+                    continue;
+                }
+            }//for
+            return {
+                code: 1,
+                message: 'same key'
+            }
+        } else {
+            //无连接
+            return {
+                code: 2,
+                message: 'not exist upload'
+            };
+        }
+    } else {
+        //无连接
+        return {
+            code: 2,
+            message: 'not exist upload'
+        };
+    }
+}
+
+//计算arrayBuffer的md5值
+async function getMD5({ arrayBuffer }) {
+    return await new Promise((resolve) => {
+        const spark = new SparkMD5.ArrayBuffer();
+        spark.append(arrayBuffer);
+        const m = spark.end();
+        resolve(m);
+    });
+}
+
+//建立文件上传事件
+async function createMultipartUpload({ s3, bucket, key, type }) {//bucket:bucket  key:文件名 type：文件类型
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        ContentType: type
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new CreateMultipartUploadCommand(params));
+        } catch (err) {
+            console.log('建立上传事件失败：', err.message)
+            return 'err';
+        }
+    }
+    return res();
+}
+
+//上传一个分片
+async function uploadPart({ s3, f, uploadId, key, bucket, num }) { //f:文件分片，num：分片标号
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        PartNumber: num,
+        UploadId: uploadId,
+        Body: f,
+        // ContentDisposition: "attachment; filename=hahaha.dcm"
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new UploadPartCommand(params));
+        } catch (err) {
+            console.log('上传分片第 ' + num + ' 片错误信息', err.message)
+            return 'err';
+        }
+    }
+    return res();
+}
+//将分片合并
+async function completeMultipartUpload({ s3, bucket, key, sharding, uploadId }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    let parts = [];
+    for (let i = 0; i < sharding.length; i++) {
+        parts.push({
+            "ETag": sharding[i].ETag,
+            "PartNumber": sharding[i].PartNumber,
+        })
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        MultipartUpload: {
+            Parts: parts
+        },
+        UploadId: uploadId
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new CompleteMultipartUploadCommand(params))
+        } catch (err) {
+            console.log("合并分片失败: ", err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+
+//查询某个文件已经上传的所有分片
+async function listPartsCommand({ s3, bucket, key, uploadId }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Key: key,
+        UploadId: uploadId
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new ListPartsCommand(params));
+        } catch (err) {
+            console.log("查询该文件已上传分片失败: " + err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+//查询该文件是否存在上传事件
+async function listMultipartUploadsCommand({ s3, bucket, key }) {
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    const params = {
+        Bucket: bucket,
+        Delimiter: '',
+        MaxUploads: 1000,
+        Prefix: key
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new ListMultipartUploadsCommand(params));
+        } catch (err) {
+            console.log("查询 " + key + " 文件是否存在上传事件失败: " + err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+//获取文件
+async function getObject({ s3, bucket, fileInformation, count }) {
+    //一次请求最多 767448
+    if (s3 === null) {
+        return console.log("未创建s3客户端，请先调用init事件");
+    }
+    let byte1 = ((count + 1) * 767448 - 1) > fileInformation.file.size ? fileInformation.file.size : ((count + 1) * 767448 - 1);
+    let byte2 = (count * 767448) > fileInformation.file.size ? fileInformation.file.size : (count * 767448);
+    let range = "bytes=" + byte2 + "-" + byte1;
+    const params = {
+        Bucket: bucket,
+        Key: fileInformation.path,
+        Range: range
+    };
+    const res = async () => {
+        try {
+            return await s3.send(new GetObjectCommand(params));
+        } catch (err) {
+            console.log('获取 ' + fileInformation.path + ' 文件失败：', err.message);
+            return 'err';
+        }
+    }
+    return res();
+}
+function setTimer() {
+    if (timer) return false;
+    timer = setInterval(() => {
+        let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+        if (timeList.length > 0) {
+            let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
+            let unit = 'KB/s';
+            if (totalBytes > 1024) {
+                totalBytes = totalBytes / 1024;
+                unit = "MB/s";
+            }
+            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+        }
+        if (timeList.length >= 5) {
+            delete bytesReceivedPerSecond[timeList[0]]
+        }
+        let time = new Date().getTime();
+        bytesReceivedPerSecond[time] = 0;
+    }, 1000)
+}
+
diff --git a/src/utils/multipartUpload/oss.js b/src/utils/multipartUpload/oss.js
new file mode 100644
index 00000000..106071ae
--- /dev/null
+++ b/src/utils/multipartUpload/oss.js
@@ -0,0 +1,161 @@
+import moment from "moment";
+import store from "@/store";
+let savaData = {},
+    checkData = {}, // 当前上传的节点文件和上一次提交进度
+    timer = null,  // 网速定时器
+    bytesReceivedPerSecond = {}; // 时间节点上传文件总量
+export function OSSclose() {
+    if (timer) {
+        clearInterval(timer);
+        timer = null;
+        store.state.trials.uploadTip = '0KB/s'
+    }
+    bytesReceivedPerSecond = {};
+    savaData = {};
+    checkData = {};
+    saveFinishedData(savaData);
+}
+export async function customerHttp(OSSclient, data, progressFn) {
+    // 拿到上传到的file
+    const uploadFile = data.file;
+    // 拿到上传的size
+    const uploadFileSize = uploadFile.size; // 这里拿到的单位是字节(uploadFileSize/ 1024 / 1024
+    // = 多少兆)
+    // 设置每一片的大小,partSize 指定上传的每个分片的大小，范围为100 KB~5 GB。
+    // 分片标准为5MB,文件总大小大于5GB分片为20MB
+    let partSize = 5 * 1024 * 1024;
+    if (uploadFileSize < partSize) {
+        partSize = uploadFileSize;
+    }
+    if (uploadFileSize > 5 * 1024 * 1024 * 1024) {
+        partSize = 20 * 1024 * 1024;
+    }
+    // 设置所有的文件上传所有的唯一的saveFileId
+    const saveFileId = `${uploadFileSize}_${data.path}`;
+    if (data.speed) {
+        setTimer();
+    }
+    initPage();
+    let res = await multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data, progressFn);
+    return res;
+}
+
+async function multipartUpload(OSSclient, partSize, saveFileId, uploadFile, data, progressFn) {
+    try {
+        // object-name目前我是用的uploadFile.name,其实也是要根据你们的项目而定,
+        // 有没有具体的规定, 要不要加项目名, 要不要加对应的环境;
+        // 上传的参数
+        const uploadParams = {
+            partSize,
+            progress: (percentage, checkpoint) => {
+                savaData[saveFileId] = checkpoint;
+                if (!checkData[saveFileId]) {
+                    checkData[saveFileId] = 0
+                }
+                if (data.speed) {
+                    let time = new Date().getTime();
+                    let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+                    let bytesTime = timeList.find(item => time - item < 1000);
+                    if (bytesTime) {
+                        bytesReceivedPerSecond[bytesTime] += data.file.size * (percentage - checkData[saveFileId]);
+                    } else {
+                        // console.log("未查询到时间")
+                        if (timeList.length > 0) {
+                            bytesReceivedPerSecond[timeList[timeList.length - 1]] += data.file.size * (percentage - checkData[saveFileId]);
+                        } else {
+                            bytesReceivedPerSecond[time] = data.file.size * (percentage - checkData[saveFileId]);
+                        }
+                    }
+                }
+                savaData["lastSaveTime"] = new Date();
+                progressFn(percentage, data.file, checkData[saveFileId])
+                checkData[saveFileId] = percentage;
+                if (percentage === 1) {
+                    delete checkData[saveFileId]
+                }
+                // 在上传过程中,把已经上传的数据存储下来
+                saveFinishedData(savaData);
+            },
+            // headers: {
+            //     "Content-Disposition": `attachment; filename=hahaha.dcm`,
+            //     "Cache-Control": "public, no-cache"
+            // }
+        };
+        // 断点续传
+        await resumeUpload(uploadParams, saveFileId);
+        const res = await OSSclient.multipartUpload(
+            data.path,
+            uploadFile,
+            uploadParams
+        );
+        if (res.res.status === 200) {
+            // 重新去掉某个缓存进行设置
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
+        } else if (res.res.status === 404) {
+            delete savaData[saveFileId];
+            saveFinishedData(savaData);
+        }
+        return res;
+    } catch (e) {
+        console.log(e);
+        delete savaData[saveFileId];
+        saveFinishedData(savaData);
+        // 捕获超时异常。
+        if (e.code === "ConnectionTimeoutError") {
+            console.log("TimeoutError");
+            // do ConnectionTimeoutError operation
+        }
+        return false;
+    }
+}
+async function resumeUpload(uploadParams, saveFileId) {
+    if (localStorage.getItem("upload-function-name")) {
+        const obj = JSON.parse(localStorage.getItem("upload-function-name"));
+        if (Object.keys(obj).includes(saveFileId)) {
+            uploadParams.checkpoint = obj[saveFileId];
+        }
+    }
+}
+// 存储到内存
+function saveFinishedData(finishedData) {
+    localStorage.setItem(
+        "upload-function-name",
+        JSON.stringify(finishedData)
+    );
+}
+function initPage() {
+    // 判断是不是有缓存
+    const localData = localStorage.getItem("upload-function-name");
+    if (!localData) return;
+    savaData = JSON.parse(localData);
+    // 当前时间 > 存储时间(1000 * 60 * 60表示1h,意思就是这些数据你要存多久,
+    // 可以是1h也可以是多少天,随意)
+    if (
+        moment(new Date()).diff(moment(savaData.lastSaveTime)) >
+        1000 * 60 * 60
+    ) {
+        localStorage.removeItem("upload-function-name");
+    }
+}
+function setTimer() {
+    if (timer) return false;
+    timer = setInterval(() => {
+        // console.log(Object.assign({}, bytesReceivedPerSecond))
+        let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
+        if (timeList.length > 0) {
+            let totalBytes = timeList.reduce((sum, bytes) => sum + bytesReceivedPerSecond[bytes], 0) / (5 * 1024);
+            let unit = 'KB/s';
+            if (totalBytes > 1024) {
+                totalBytes = totalBytes / 1024;
+                unit = "MB/s";
+            }
+            store.state.trials.uploadTip = totalBytes.toFixed(2) + unit;
+        }
+        if (timeList.length >= 5) {
+            delete bytesReceivedPerSecond[timeList[0]]
+        }
+        let time = new Date().getTime();
+        bytesReceivedPerSecond[time] = 0;
+    }, 1000)
+}
\ No newline at end of file
diff --git a/src/utils/multipartUpload/spark-md5.min.js b/src/utils/multipartUpload/spark-md5.min.js
new file mode 100644
index 00000000..2ef527dd
--- /dev/null
+++ b/src/utils/multipartUpload/spark-md5.min.js
@@ -0,0 +1 @@
+(function(factory){if(typeof exports==="object"){module.exports=factory()}else if(typeof define==="function"&&define.amd){define(factory)}else{var glob;try{glob=window}catch(e){glob=self}glob.SparkMD5=factory()}})(function(undefined){"use strict";var add32=function(a,b){return a+b&4294967295},hex_chr=["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"];function cmn(q,a,b,x,s,t){a=add32(add32(a,q),add32(x,t));return add32(a<<s|a>>>32-s,b)}function md5cycle(x,k){var a=x[0],b=x[1],c=x[2],d=x[3];a+=(b&c|~b&d)+k[0]-680876936|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[1]-389564586|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[2]+606105819|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[3]-1044525330|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[4]-176418897|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[5]+1200080426|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[6]-1473231341|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[7]-45705983|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[8]+1770035416|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[9]-1958414417|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[10]-42063|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[11]-1990404162|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[12]+1804603682|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[13]-40341101|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[14]-1502002290|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[15]+1236535329|0;b=(b<<22|b>>>10)+c|0;a+=(b&d|c&~d)+k[1]-165796510|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[6]-1069501632|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[11]+643717713|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[0]-373897302|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[5]-701558691|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[10]+38016083|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[15]-660478335|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[4]-405537848|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[9]+568446438|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[14]-1019803690|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[3]-187363961|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[8]+1163531501|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[13]-1444681467|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[2]-51403784|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[7]+1735328473|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[12]-1926607734|0;b=(b<<20|b>>>12)+c|0;a+=(b^c^d)+k[5]-378558|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[8]-2022574463|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[11]+1839030562|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[14]-35309556|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[1]-1530992060|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[4]+1272893353|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[7]-155497632|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[10]-1094730640|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[13]+681279174|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[0]-358537222|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[3]-722521979|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[6]+76029189|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[9]-640364487|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[12]-421815835|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[15]+530742520|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[2]-995338651|0;b=(b<<23|b>>>9)+c|0;a+=(c^(b|~d))+k[0]-198630844|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[7]+1126891415|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[14]-1416354905|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[5]-57434055|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[12]+1700485571|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[3]-1894986606|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[10]-1051523|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[1]-2054922799|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[8]+1873313359|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[15]-30611744|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[6]-1560198380|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[13]+1309151649|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[4]-145523070|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[11]-1120210379|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[2]+718787259|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[9]-343485551|0;b=(b<<21|b>>>11)+c|0;x[0]=a+x[0]|0;x[1]=b+x[1]|0;x[2]=c+x[2]|0;x[3]=d+x[3]|0}function md5blk(s){var md5blks=[],i;for(i=0;i<64;i+=4){md5blks[i>>2]=s.charCodeAt(i)+(s.charCodeAt(i+1)<<8)+(s.charCodeAt(i+2)<<16)+(s.charCodeAt(i+3)<<24)}return md5blks}function md5blk_array(a){var md5blks=[],i;for(i=0;i<64;i+=4){md5blks[i>>2]=a[i]+(a[i+1]<<8)+(a[i+2]<<16)+(a[i+3]<<24)}return md5blks}function md51(s){var n=s.length,state=[1732584193,-271733879,-1732584194,271733878],i,length,tail,tmp,lo,hi;for(i=64;i<=n;i+=64){md5cycle(state,md5blk(s.substring(i-64,i)))}s=s.substring(i-64);length=s.length;tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(i=0;i<length;i+=1){tail[i>>2]|=s.charCodeAt(i)<<(i%4<<3)}tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(state,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=n*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(state,tail);return state}function md51_array(a){var n=a.length,state=[1732584193,-271733879,-1732584194,271733878],i,length,tail,tmp,lo,hi;for(i=64;i<=n;i+=64){md5cycle(state,md5blk_array(a.subarray(i-64,i)))}a=i-64<n?a.subarray(i-64):new Uint8Array(0);length=a.length;tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(i=0;i<length;i+=1){tail[i>>2]|=a[i]<<(i%4<<3)}tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(state,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=n*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(state,tail);return state}function rhex(n){var s="",j;for(j=0;j<4;j+=1){s+=hex_chr[n>>j*8+4&15]+hex_chr[n>>j*8&15]}return s}function hex(x){var i;for(i=0;i<x.length;i+=1){x[i]=rhex(x[i])}return x.join("")}if(hex(md51("hello"))!=="5d41402abc4b2a76b9719d911017c592"){add32=function(x,y){var lsw=(x&65535)+(y&65535),msw=(x>>16)+(y>>16)+(lsw>>16);return msw<<16|lsw&65535}}if(typeof ArrayBuffer!=="undefined"&&!ArrayBuffer.prototype.slice){(function(){function clamp(val,length){val=val|0||0;if(val<0){return Math.max(val+length,0)}return Math.min(val,length)}ArrayBuffer.prototype.slice=function(from,to){var length=this.byteLength,begin=clamp(from,length),end=length,num,target,targetArray,sourceArray;if(to!==undefined){end=clamp(to,length)}if(begin>end){return new ArrayBuffer(0)}num=end-begin;target=new ArrayBuffer(num);targetArray=new Uint8Array(target);sourceArray=new Uint8Array(this,begin,num);targetArray.set(sourceArray);return target}})()}function toUtf8(str){if(/[\u0080-\uFFFF]/.test(str)){str=unescape(encodeURIComponent(str))}return str}function utf8Str2ArrayBuffer(str,returnUInt8Array){var length=str.length,buff=new ArrayBuffer(length),arr=new Uint8Array(buff),i;for(i=0;i<length;i+=1){arr[i]=str.charCodeAt(i)}return returnUInt8Array?arr:buff}function arrayBuffer2Utf8Str(buff){return String.fromCharCode.apply(null,new Uint8Array(buff))}function concatenateArrayBuffers(first,second,returnUInt8Array){var result=new Uint8Array(first.byteLength+second.byteLength);result.set(new Uint8Array(first));result.set(new Uint8Array(second),first.byteLength);return returnUInt8Array?result:result.buffer}function hexToBinaryString(hex){var bytes=[],length=hex.length,x;for(x=0;x<length-1;x+=2){bytes.push(parseInt(hex.substr(x,2),16))}return String.fromCharCode.apply(String,bytes)}function SparkMD5(){this.reset()}SparkMD5.prototype.append=function(str){this.appendBinary(toUtf8(str));return this};SparkMD5.prototype.appendBinary=function(contents){this._buff+=contents;this._length+=contents.length;var length=this._buff.length,i;for(i=64;i<=length;i+=64){md5cycle(this._hash,md5blk(this._buff.substring(i-64,i)))}this._buff=this._buff.substring(i-64);return this};SparkMD5.prototype.end=function(raw){var buff=this._buff,length=buff.length,i,tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],ret;for(i=0;i<length;i+=1){tail[i>>2]|=buff.charCodeAt(i)<<(i%4<<3)}this._finish(tail,length);ret=hex(this._hash);if(raw){ret=hexToBinaryString(ret)}this.reset();return ret};SparkMD5.prototype.reset=function(){this._buff="";this._length=0;this._hash=[1732584193,-271733879,-1732584194,271733878];return this};SparkMD5.prototype.getState=function(){return{buff:this._buff,length:this._length,hash:this._hash.slice()}};SparkMD5.prototype.setState=function(state){this._buff=state.buff;this._length=state.length;this._hash=state.hash;return this};SparkMD5.prototype.destroy=function(){delete this._hash;delete this._buff;delete this._length};SparkMD5.prototype._finish=function(tail,length){var i=length,tmp,lo,hi;tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(this._hash,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=this._length*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(this._hash,tail)};SparkMD5.hash=function(str,raw){return SparkMD5.hashBinary(toUtf8(str),raw)};SparkMD5.hashBinary=function(content,raw){var hash=md51(content),ret=hex(hash);return raw?hexToBinaryString(ret):ret};SparkMD5.ArrayBuffer=function(){this.reset()};SparkMD5.ArrayBuffer.prototype.append=function(arr){var buff=concatenateArrayBuffers(this._buff.buffer,arr,true),length=buff.length,i;this._length+=arr.byteLength;for(i=64;i<=length;i+=64){md5cycle(this._hash,md5blk_array(buff.subarray(i-64,i)))}this._buff=i-64<length?new Uint8Array(buff.buffer.slice(i-64)):new Uint8Array(0);return this};SparkMD5.ArrayBuffer.prototype.end=function(raw){var buff=this._buff,length=buff.length,tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],i,ret;for(i=0;i<length;i+=1){tail[i>>2]|=buff[i]<<(i%4<<3)}this._finish(tail,length);ret=hex(this._hash);if(raw){ret=hexToBinaryString(ret)}this.reset();return ret};SparkMD5.ArrayBuffer.prototype.reset=function(){this._buff=new Uint8Array(0);this._length=0;this._hash=[1732584193,-271733879,-1732584194,271733878];return this};SparkMD5.ArrayBuffer.prototype.getState=function(){var state=SparkMD5.prototype.getState.call(this);state.buff=arrayBuffer2Utf8Str(state.buff);return state};SparkMD5.ArrayBuffer.prototype.setState=function(state){state.buff=utf8Str2ArrayBuffer(state.buff,true);return SparkMD5.prototype.setState.call(this,state)};SparkMD5.ArrayBuffer.prototype.destroy=SparkMD5.prototype.destroy;SparkMD5.ArrayBuffer.prototype._finish=SparkMD5.prototype._finish;SparkMD5.ArrayBuffer.hash=function(arr,raw){var hash=md51_array(new Uint8Array(arr)),ret=hex(hash);return raw?hexToBinaryString(ret):ret};return SparkMD5});
diff --git a/src/utils/oss.js b/src/utils/oss.js
index 742d587d..af37bd6c 100644
--- a/src/utils/oss.js
+++ b/src/utils/oss.js
@@ -3,30 +3,39 @@ const router = require('@/router');
 const Minio = require('minio')
 const stream = require('stream')
 import Vue from 'vue'
+import { customerHttp, OSSclose } from "@/utils/multipartUpload/oss"
+import { exist, AWSclose } from "@/utils/multipartUpload/aws"
 const { GetObjectStoreToken } = require('../api/user.js')
+const {
+  S3Client,
+} = require("@aws-sdk/client-s3");
 
 Vue.prototype.OSSclientConfig = {
 }
 
-function blobToBuffer(blob, fileName) {
-  return new Promise((resolve, reject) => {
-    const file = new File([blob], fileName);
-    resolve(file)
-  })
-}
 
 async function ossGenerateSTS() {
-  let res = await GetObjectStoreToken()
+  let res = null;
+  if (localStorage.getItem('stsToken')) {
+    res = JSON.parse(localStorage.getItem('stsToken'))
+  } else {
+    res = await GetObjectStoreToken()
+    localStorage.setItem('stsToken', JSON.stringify(res))
+  }
+
+  // res.Result.ObjectStoreUse = 'AWS';
   Vue.prototype.OSSclientConfig = { ...res.Result[res.Result.ObjectStoreUse] }
   Vue.prototype.OSSclientConfig.ObjectStoreUse = res.Result.ObjectStoreUse;
   Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint
   switch (res.Result.ObjectStoreUse) {
     case 'AliyunOSS':
       Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
       Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
       let OSSclient = new OSS(Vue.prototype.OSSclientConfig)
       Vue.prototype.OSSclient = {
-        put: function (objectName, object) {
+        put: async function (objectName, object) {
+          OSSclient = await RefreshClient(OSSclient)
           return new Promise(async (resolve, reject) => {
             try {
               let _vm = router.default.app
@@ -49,6 +58,46 @@ async function ossGenerateSTS() {
               reject()
             }
           })
+        },
+        multipartUpload: async (data, progress) => {
+          OSSclient = await RefreshClient(OSSclient)
+          return new Promise(async (resolve, reject) => {
+            try {
+              const { file, path } = data;
+              if (!file || !path) return reject('file and path be required');
+              let config = await getSTSToken(Vue.prototype.OSSclientConfig.expiration);
+              if (config) {
+                Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+                Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+                Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+                Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+                Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+                Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+                OSSclient = new OSS(Vue.prototype.OSSclientConfig);
+              }
+              let _vm = router.default.app
+              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+                var objectItem = data.path.split('/')
+                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+                data.path = objectItem.join('/')
+              }
+              let res = await customerHttp(OSSclient, data, progress);
+              if (res) {
+                resolve({
+                  name: data.path,
+                  url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(res.name)
+                })
+              } else {
+                reject()
+              }
+            } catch (err) {
+              console.log(err)
+              reject(err)
+            }
+          })
+        },
+        close: () => {
+          OSSclose();
         }
       }
       break
@@ -86,49 +135,121 @@ async function ossGenerateSTS() {
               console.log(e)
             }
           })
+        },
+        close: () => {
+          return false
         }
       }
       break
     case 'AWS':
-      let aws = new Minio.Client(Vue.prototype.OSSclientConfig);
+      Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+      let aws = new S3Client({
+        endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+        region: Vue.prototype.OSSclientConfig.region,
+        s3ForcePathStyle: true,
+        signatureVersion: 'v4',
+        forcePathStyle: true,
+        // SessionToken: '',
+        credentials: {
+          accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+          secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+          sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+        }
+      });
       Vue.prototype.OSSclient = {
-        put: function (objectName, object) {
-          return new Promise(async (resolve, reject) => {
-            try {
-              var name = objectName.split('/')[objectName.split('/').length - 1]
-              let _vm = router.default.app
-              if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
-                var objectItem = objectName.split('/')
-                objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
-                objectName = objectItem.join('/')
-              }
-              const reader = new FileReader();
-              reader.onload = (ex) => {
-                const bufferStream = new stream.PassThrough()
-                bufferStream.end(Buffer.from(ex.target.result))
-                aws.putObject(Vue.prototype.OSSclientConfig.bucketName, objectName, bufferStream, function (err, etag) {
-                  if (err) {
-                    console.log(err)
-                    reject()
-                  } else {
-                    console.log(objectName);
-                    resolve({
-                      name: objectName,
-                      url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(objectName)
-                    })
-                  }
-                })
-              };
-              reader.readAsArrayBuffer(object);
-            } catch (e) {
-              console.log(e)
-            }
-          })
+        put: async function (objectName, object) {
+          let data = {
+            file: object,
+            path: objectName
+          }
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, () => { });
+        },
+        multipartUpload: async (data, progress) => {
+          aws = await RefreshClient(aws);
+          return uploadAWS(aws, data, progress);
+        },
+        close: () => {
+          AWSclose();
         }
       }
   }
   return
 }
+// AWS上传函数
+function uploadAWS(aws, data, progress) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const { file, path } = data;
+      if (!file || !path) return reject('file and path be required');
+      let _vm = router.default.app
+      if (_vm._route.path !== '/trials/trials-panel/visit/crc-upload') {
+        var objectItem = data.path.split('/')
+        objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1]
+        data.path = objectItem.join('/')
+      }
+      let bucketName = data.path.split("/")[1] || Vue.prototype.OSSclientConfig.bucket
+      let curPath = data.path;
+      data.path = data.path.replace(`/${bucketName}/`, '');
+      await exist(aws, bucketName, data, progress, (path, status) => {
+        if (status === 'success') {
+          resolve({
+            name: decodeUtf8(curPath),
+            url: Vue.prototype.OSSclientConfig.viewEndpoint + decodeUtf8(curPath)
+          })
+        } else {
+          reject()
+        }
+      });
+
+    } catch (err) {
+      console.log(err)
+      reject(err)
+    }
+  })
+}
+// client过期刷新
+async function RefreshClient(client) {
+  let config = await getSTSToken(Vue.prototype.OSSclientConfig.expiration);
+  if (config) {
+    // config.Result.ObjectStoreUse = 'AWS'
+    switch (config.Result.ObjectStoreUse) {
+      case 'AliyunOSS': {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+        Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+        Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+        Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+        Vue.prototype.OSSclientConfig.stsToken = Vue.prototype.OSSclientConfig.securityToken
+        Vue.prototype.OSSclientConfig.timeout = 10 * 60 * 1000
+        return new OSS(Vue.prototype.OSSclientConfig);
+      }
+      case "MinIO": {
+        return client;
+      }
+      case "AWS": {
+        Vue.prototype.OSSclientConfig = { ...config.Result[config.Result.ObjectStoreUse] }
+        Vue.prototype.OSSclientConfig.ObjectStoreUse = config.Result.ObjectStoreUse;
+        Vue.prototype.OSSclientConfig.basePath = Vue.prototype.OSSclientConfig.viewEndpoint;
+        Vue.prototype.OSSclientConfig.bucket = Vue.prototype.OSSclientConfig.bucketName
+        return new S3Client({
+          endpoint: Vue.prototype.OSSclientConfig.viewEndpoint,
+          region: Vue.prototype.OSSclientConfig.region,
+          s3ForcePathStyle: true,
+          signatureVersion: 'v4',
+          forcePathStyle: true,
+          credentials: {
+            accessKeyId: Vue.prototype.OSSclientConfig.accessKeyId,
+            secretAccessKey: Vue.prototype.OSSclientConfig.secretAccessKey,
+            sessionToken: Vue.prototype.OSSclientConfig.sessionToken
+          }
+        });
+      }
+    }
+
+  } else {
+    return client;
+  }
+}
 function decodeUtf8(bytes) {
   let str = bytes.split('?');
   let str2 = str[0].split('/');
@@ -138,6 +259,48 @@ function decodeUtf8(bytes) {
   str2.pop();
   return str2.join("/") + '/' + name;
 }
+const queue = []
+let loading = false;
+// 获取凭证
+function getSTSToken(credentials) {
+  return new Promise(async (resolve, reject) => {
+    let isExpired = isCredentialsExpired(credentials);
+    if (isExpired) {
+      if (loading) {
+        queue.push({ resolve, reject })
+      }
+      if (!loading) {
+        loading = true;
+        let res = await GetObjectStoreToken();
+        loading = false;
+        localStorage.setItem('stsToken', JSON.stringify(res))
+        resolve(res)
+        let p = queue.shift();
+        while (p) {
+          p.resolve(res)
+          p = queue.shift();
+        }
+      }
 
+    } else {
+      // console.log("凭证未过期");
+      resolve(false)
+    }
+
+  })
+}
+/**
+* oss判断临时凭证是否到期。
+**/
+function isCredentialsExpired(credentials) {
+  if (!credentials) {
+    return true;
+  }
+  const expireDate = new Date(credentials);
+  const now = new Date();
+  // 如果有效期不足五分钟，视为过期。
+  return expireDate.getTime() - now.getTime() <= 300000;
+
+}
 
 export const OSSclient = ossGenerateSTS
diff --git a/src/utils/parseDicom.js b/src/utils/parseDicom.js
index 4d7f7c0f..562630a0 100644
--- a/src/utils/parseDicom.js
+++ b/src/utils/parseDicom.js
@@ -113,10 +113,14 @@ export const parseDicom = (file, name = false) => {
                     }
                 })
                 uintKey.forEach(key => {
-                    res[key] = data.uint16(dicom[key])
+                    if (res.hasOwnProperty(key)) {
+                        res[key] = data.uint16(dicom[key])
+                    }
                 })
                 intStringKey.forEach(key => {
-                    res[key] = data.intString(dicom[key])
+                    if (res.hasOwnProperty(key)) {
+                        res[key] = data.intString(dicom[key])
+                    }
                 })
                 defaultKey.forEach(key => {
                     if (!res[key] && res.hasOwnProperty(key)) {
diff --git a/src/utils/request.js b/src/utils/request.js
index 86eaea00..0f122229 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,9 +2,9 @@ import axios from 'axios'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
-import Vue from 'vue'
+import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
-console.log(moment.tz.guess())
+import { encryptConfig } from "@/utils/encrypt"
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -16,18 +16,28 @@ var path
 // var lang = store.state.lang.language
 
 service.interceptors.request.use(
-  config => {
+  async config => {
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9'
     config.headers['TimeZoneId'] = moment.tz.guess()
-    if (store.getters.token) {
+    if (config.ENCRYPT) {
+      try {
+        config = await encryptConfig(config)
+      } catch (err) {
+        console.log(err)
+      }
+    }
+    if (store.getters.token && !config.clearToken) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
     }
     try {
       if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
-        if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchDetail_m' || path === '/researchLogin_m' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        // if (!path || path === '/ReviewersResearchForm' || path === '/ReviewersResearch' || path === '/login' || path === '/researchForm' || path === '/researchDetail_m' || path === '/researchLogin_m' || path === '/researchLogin' || path === '/email-recompose' || path === '/recompose' || path === '/resetpassword' || path === '/error') {
+        //   return config
+        // }
+        if (!path || WHITELIST.some(item => item === path)) {
           return config
         }
         if (store.state.user.userId !== zzSessionStorage.getItem('userId')) {
diff --git a/src/utils/stream.js b/src/utils/stream.js
new file mode 100644
index 00000000..8ee5c5aa
--- /dev/null
+++ b/src/utils/stream.js
@@ -0,0 +1,106 @@
+import streamSaver from "streamsaver";
+import "streamsaver/examples/zip-stream.js";
+import store from '@/store'
+streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
+// 下载文件并压缩
+function zipFiles(zipName, files) {
+    return new Promise((resolve) => {
+        try {
+            console.log("同步下载打包开始时间：" + new Date());
+            store.dispatch('trials/setUnLock', true)
+            files = formatFiles(files)
+            // 创建压缩文件输出流  
+            const zipFileOutputStream = streamSaver.createWriteStream(zipName);
+            // 创建下载文件流  
+            const fileIterator = files.values();
+            const readableZipStream = new ZIP({
+                async pull(ctrl) {
+                    const fileInfo = fileIterator.next();
+                    if (fileInfo.done) {//迭代终止  
+                        ctrl.close();
+                    } else {
+                        let { name, url } = fileInfo.value;
+                        url = decodeUtf8(url);
+                        return fetch(url).then(res => {
+                            ctrl.enqueue({
+                                name,
+                                stream: () => res.body
+                            });
+                        })
+                    }
+                }
+            });
+            if (window.WritableStream && readableZipStream.pipeTo) {
+                // 开始下载  
+                readableZipStream
+                    .pipeTo(zipFileOutputStream)
+                    .then(() => {
+                        console.log("同步下载打包结束时间：" + new Date());
+                        store.dispatch('trials/setUnLock', false)
+                        resolve(true)
+                    }).catch(err => {
+                        console.log(err);
+                        resolve(false)
+                    });
+            } else {
+                resolve(false)
+            }
+        } catch (err) {
+            console.log(err);
+            resolve(false)
+        }
+    })
+
+}
+// 下载文件并修改名称
+async function updateFile(file, name) {
+    return new Promise(async resolve => {
+        try {
+            store.dispatch('trials/setUnLock', true)
+            const fileOutputStream = streamSaver.createWriteStream(name);
+            file = decodeUtf8(file);
+            let res = await fetch(file);
+            res.body.pipeTo(fileOutputStream).then(() => {
+                store.dispatch('trials/setUnLock', true)
+                resolve(true)
+            }).catch(err => {
+                console.log(err)
+                resolve(false)
+            });
+        } catch (err) {
+            console.log(err)
+            resolve(false)
+        }
+    })
+}
+//  同名文件修改名称
+function formatFiles(files) {
+    let fileObj = {};
+    files.forEach(file => {
+        let arr = Object.keys(fileObj);
+        if (!~arr.indexOf(file.name)) {
+            fileObj[file.name] = 1;
+        } else {
+            let name = file.name;
+            file.name = name.split(".")[0] + `(${fileObj[name]})` + name
+                .substring(name.lastIndexOf('.'))
+                .toLocaleLowerCase()
+            fileObj[name]++;
+        }
+    })
+    return files;
+}
+function decodeUtf8(bytes) {
+    let str = bytes.split('?');
+    let str2 = str[0].split('/');
+    let name = str2[str2.length - 1];
+    name = encodeURIComponent(name);
+    str.shift();
+    str2.pop();
+    return str2.join("/") + '/' + name;
+}
+export async function downLoadFile(file, name, type = 'file') {
+    if (type === 'zip') return await zipFiles(name, file);
+    return await updateFile(file, name)
+
+}
\ No newline at end of file
diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
deleted file mode 100644
index 71f813b9..00000000
--- a/src/utils/uploadZip.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import Vue from 'vue';
-import store from "@/store";
-import {
-    requestPackageAndAnonymizImage,
-} from "@/api/load.js";
-import streamSaver from "streamsaver";
-import "streamsaver/examples/zip-stream.js"
-let flag = {};
-export const resetFlag = () => {
-    flag = {};
-    store.state.trials.uploadTip = null;
-    if (store.state.trials.timer) {
-        clearInterval(store.state.trials.timer);
-        store.state.trials.timer = null;
-    }
-    store.dispatch("trials/setUnLock", false);
-}
-export const downloadImage = async (id, id2, IsDicom = true) => {
-    // if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
-    if (flag[`${id2}_${IsDicom}`]) return false;
-    flag[`${id2}_${IsDicom}`] = true
-    try {
-        let params = {
-            TrialId: id,
-            SubjectVisitId: id2,
-            IsDicom: IsDicom
-        }
-        store.dispatch("trials/setUnLock", true);
-        let res = await requestPackageAndAnonymizImage(params);
-        if (res.IsSuccess) {
-            if (!res.Result) {
-                flag[`${id2}_${IsDicom}`] = false;
-                // Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
-                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
-                store.state.trials.uploadTip = message;
-                if (!store.state.trials.timer) {
-                    store.state.trials.timer = setInterval(() => {
-                        downloadImage(id, id2, IsDicom);
-                    }, 2000);
-                }
-                return false;
-            }
-            if (store.state.trials.timer) {
-                clearInterval(store.state.trials.timer);
-                store.state.trials.timer = null;
-            }
-            let fileName = res.Result.split("/").pop();
-            let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            if (fileName !== res.OtherInfo.FileName) {
-                let message = Vue.prototype.$t('trials:upload:tip:uploading').replace("xxx", res.OtherInfo.FileName);
-                store.state.trials.uploadTip = message;
-                // Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
-                return download(href, res.OtherInfo.FileName, { id2, IsDicom });
-
-            }
-            let a = document.createElement("a");
-            a.download = res.OtherInfo.FileName;
-            a.href = href;
-            a.click();
-            URL.revokeObjectURL(href);
-            let timer = setTimeout(() => {
-                a = null;
-                href = null;
-                timer = null;
-            }, 500)
-            store.state.trials.uploadTip = null;
-            return true;
-        } else {
-            flag[`${id2}_${IsDicom}`] = false;
-            return false;
-        }
-    } catch (err) {
-        flag[`${id2}_${IsDicom}`] = false;
-        console.log(err);
-    }
-};
-export const fileDownload = (content, filename) => {
-    const eleLink = document.createElement("a");
-    eleLink.download = filename;
-    eleLink.style.display = "none";
-    const blob = new Blob([content]);
-    eleLink.href = URL.createObjectURL(blob);
-    document.body.appendChild(eleLink);
-    eleLink.click();
-    document.body.removeChild(eleLink);
-};
-let download = async (downloadUrl, downloadFileName, res) => {
-    const blob = await getBlob(downloadUrl);
-    flag[`${res.id2}_${res.IsDicom}`] = false;
-    store.state.trials.uploadTip = null;
-    store.dispatch("trials/setUnLock", false);
-    saveAsB(blob, downloadFileName);
-    return true;
-}
-
-let getBlob = (url) => {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-
-        xhr.open('GET', url, true);
-        xhr.responseType = 'blob';
-        xhr.onload = () => {
-            if (xhr.status === 200) {
-                resolve(xhr.response);
-            } else {
-                reject(new Error(`Request failed with status ${xhr.status}`));
-            }
-        };
-        xhr.onerror = () => {
-            reject(new Error('Request failed'));
-        };
-
-        xhr.send();
-    });
-}
-
-let saveAsB = (blob, filename) => {
-    const link = document.createElement('a');
-    const body = document.body;
-
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-
-    // hide the link
-    link.style.display = 'none';
-    body.appendChild(link);
-
-    link.click();
-    body.removeChild(link);
-
-    window.URL.revokeObjectURL(link.href);
-}
-
-// 前端流式打包下载
-const handleBatchDown = async (item, zip) => {
-    return new Promise((resolve) => {
-        console.log("同步下载打包开始时间：" + new Date());
-        // 创建压缩文件输出流  
-        const zipFileOutputStream = streamSaver.createWriteStream(zipName);
-        // 创建下载文件流  
-        const fileIterator = files.values();
-        const readableZipStream = new window.ZIP({
-            async pull(ctrl) {
-                const fileInfo = fileIterator.next();
-                if (fileInfo.done) {//迭代终止  
-                    ctrl.close();
-                } else {
-                    const { name, url } = fileInfo.value;
-                    return fetch(url).then(res => {
-                        ctrl.enqueue({
-                            name,
-                            stream: () => res.body
-                        })
-                    })
-                }
-            }
-        });
-        if (window.WritableStream && readableZipStream.pipeTo) {
-            // 开始下载  
-            readableZipStream
-                .pipeTo(zipFileOutputStream)
-                .then(() => { console.log("同步下载打包结束时间：" + new Date()); resolve(true) })
-        } else {
-            resolve(false);
-        }
-    })
-
-};
diff --git a/src/utils/whiteList.js b/src/utils/whiteList.js
new file mode 100644
index 00000000..d48236ce
--- /dev/null
+++ b/src/utils/whiteList.js
@@ -0,0 +1,2 @@
+const WHITELIST = ['/', 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+export default WHITELIST
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 6e1f26d8..84ca2921 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -251,7 +251,7 @@ export default {
     },
     async loadPatientStudy() {
       try {
-        let data = await getPatientSeriesList(this.studyId);
+        const data = await getPatientSeriesList(this.studyId)
         if (data.IsSuccess) {
           const { Result } = data
           var seriesList = []
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b2d6c028..9ed14b4e 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -6,7 +6,7 @@
           <div class="sidePanelThumbs">
             <el-tabs v-model="activeName" type="border-card" @tab-click="handleTabClick">
               <el-tab-pane :label="$t('trials:dicom-show:currentVisit')" name="current-study">
-                <div class="text-desc" style="background:rgb(55 55 55);">
+                <div v-if="visitInfo" class="text-desc" style="background:rgb(55 55 55);">
                   {{ visitInfo }}
                 </div>
                 <div class="viewerSidethumbs ps" style="position: relative;">
@@ -143,7 +143,7 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
+              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper" v-if="!visitTaskId">
                 <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}`">
@@ -261,6 +261,7 @@ import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
 import { setSeriesStatus } from '@/api/trials'
+import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
@@ -301,7 +302,9 @@ export default {
       relationActiveName: [],
       showSeriesList: [],
       currentLoadIns: [],
-      isFromCRCUpload: false
+      isFromCRCUpload: false,
+      visitTaskId: null,
+      page: ''
     }
   },
   mounted() {
@@ -318,6 +321,8 @@ export default {
     this.isReading = this.$router.currentRoute.query.isReading ? this.$router.currentRoute.query.isReading * 1 : 0
     this.showDelete = parseInt(this.$router.currentRoute.query.showDelete)
     this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
+    this.visitTaskId = this.$router.currentRoute.query.visitTaskId
+    this.page = this.$route.query.page
     // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     this.getStudiesInfo()
     cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
@@ -338,7 +343,14 @@ export default {
     async getStudiesInfo() {
       this.studyList = []
       try {
-        const res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+        let res = null
+        if (this.page === 'upload') {
+          res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
+        } else if (this.page === 'download'){
+          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
+        } else {
+          res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
+        }
         if (res.IsSuccess) {
           res.Result.forEach((study, studyIndex) => {
             const data = {}
diff --git a/src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue
index b250a8bb..c0fb3afd 100644
--- a/src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/UploadTemplate/TemplateForm.vue
@@ -3,7 +3,7 @@
     ref="sysTemplateFrom"
     v-loading="loading"
     :model="form"
-    label-width="90px"
+    label-width="140px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
@@ -15,7 +15,7 @@
       <el-form-item label="业务场景: " prop="BusinessScenarioEnum">
         <el-select
           v-model="form.BusinessScenarioEnum"
-          style="width:100%;"
+          style="width: 100%"
           size="small"
           filterable
         >
@@ -44,12 +44,14 @@
             :on-exceed="handleExceed"
             :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
           >
-            <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="btnLoading">Select</el-button>
-            <span
-              slot="tip"
-              style="margin-left:10px;"
-              class="el-upload__tip"
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+              :loading="btnLoading"
+              >Select</el-button
             >
+            <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
               (must be in xlsx/xls/doc/docx format)
             </span>
           </el-upload>
@@ -58,37 +60,61 @@
       <el-form-item label="文件名" prop="Name">
         <el-input v-model="form.Name" />
       </el-form-item>
+      <el-form-item
+        :label="$t('dictionary:attachment:export:form:nameCN')"
+        prop="NameCN"
+      >
+        <el-input v-model="form.NameCN" />
+      </el-form-item>
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{item.label}}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :label="item.value"
+            :key="item.id"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">
         <el-input
           v-model="form.Description"
           type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
+          :autosize="{ minRows: 2, maxRows: 4 }"
           placeholder="请输入内容"
         />
       </el-form-item>
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum" :loading="saveBtnLoading" @click="handleSave">Save</el-button>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="!form.FileTypeEnum || !form.BusinessScenarioEnum"
+          :loading="saveBtnLoading"
+          @click="handleSave"
+          >Save</el-button
+        >
       </el-form-item>
     </div>
   </el-form>
 </template>
 <script>
-import { addOrUpdateCommonDocument, uploadCommonDoc, Upload } from '@/api/dictionary'
+import {
+  addOrUpdateCommonDocument,
+  uploadCommonDoc,
+  Upload,
+} from '@/api/dictionary'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
   name: 'TemplateForm',
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {}
+      },
+    },
   },
 
   data() {
@@ -99,20 +125,30 @@ export default {
         FileTypeEnum: null,
         BusinessScenarioEnum: null,
         Name: '',
+        NameCN: '',
         Path: '',
         Description: '',
-        IsDeleted: false
+        IsDeleted: false,
       },
       rules: {
-        Code: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        Name: [{ required: true, message: 'Please specify', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }]
+        Code: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        Name: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        NameCN: [
+          { required: true, message: 'Please specify', trigger: ['blur'] },
+        ],
+        BusinessScenarioEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
       },
       fileList: [],
       btnLoading: false,
       saveBtnLoading: false,
       loading: false,
-      dictionaryList: {}
+      dictionaryList: {},
     }
   },
   mounted() {
@@ -128,8 +164,8 @@ export default {
               name: this.data.Name,
               path: this.data.Path,
               url: this.data.Path,
-              type: this.data.Type
-            }
+              type: this.data.Type,
+            },
           ]
         }
         for (const k in this.form) {
@@ -142,12 +178,14 @@ export default {
     // 获取文件类型下拉框
     getDicData() {
       this.loading = true
-      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type']).then(res => {
-        this.dictionaryList = { ...res.Result }
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     beforeUpload(file) {
       // 检测文件类型是否符合要求
@@ -165,35 +203,43 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.FileName = param.file.name
-      Upload(formData, 1).then(res => {
-        this.fileList.push({ name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath, url: res.Result.FilePath })
+      Upload(formData, 1).then((res) => {
+        this.fileList.push({
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+          url: res.Result.FilePath,
+        })
         this.form.Path = res.Result.FilePath
-        this.form.Name = param.file.name
+        this.form.NameCN = param.file.name
         this.loading = false
         this.btnLoading = false
       })
     },
     handleSave() {
-      this.$refs.sysTemplateFrom.validate(valid => {
+      this.$refs.sysTemplateFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
           this.$alert('Please select file.')
           return
         }
         this.saveBtnLoading = true
-        addOrUpdateCommonDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          this.$message.success('Uploaded successfully')
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
+        addOrUpdateCommonDocument(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success('Uploaded successfully')
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
       })
     },
     handleRemoveFile() {
       this.fileList = []
       this.form.Path = ''
+      this.form.NameCN = ''
       this.form.Name = ''
     },
     handlePreview(file) {
@@ -206,19 +252,21 @@ export default {
     },
     checkFileSuffix(fileName) {
       var typeArr = ['xls', 'xlsx', 'doc', 'docx']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
-.upload-temporary-file{
+.upload-temporary-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
@@ -231,8 +279,8 @@ export default {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }
diff --git a/src/views/dictionary/attachment/components/UploadTemplate/index.vue b/src/views/dictionary/attachment/components/UploadTemplate/index.vue
index 35754a6d..1e6df603 100644
--- a/src/views/dictionary/attachment/components/UploadTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/UploadTemplate/index.vue
@@ -5,7 +5,7 @@
         <el-form-item label="业务场景">
           <el-select
             v-model="searchData.BusinessScenarioEnum"
-            style="width:150px;"
+            style="width: 150px"
           >
             <el-option
               v-for="item of $d.Common_File_BusinessScenario"
@@ -13,15 +13,10 @@
               :label="item.label"
               :value="item.value"
             />
-
           </el-select>
         </el-form-item>
         <el-form-item label="文件名称">
-          <el-input
-            v-model="searchData.Name"
-            style="width:130px;"
-            clearable
-          />
+          <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
         <el-form-item>
@@ -30,24 +25,28 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          style="float: right"
+          size="small"
+          @click="handleAdd"
+        >
+          {{ $t('common:button:new') }}
+        </el-button>
       </el-form>
-      <el-button
-        type="primary"
-        icon="el-icon-plus"
-        style="margin-left:auto;"
-        size="small"
-        @click="handleAdd"
-      >
-        {{ $t('common:button:new') }}
-      </el-button>
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
@@ -69,9 +68,13 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd('Common_File_BusinessScenario',scope.row.BusinessScenarioEnum) }}
+            {{
+              $fd(
+                'Common_File_BusinessScenario',
+                scope.row.BusinessScenarioEnum
+              )
+            }}
           </template>
-
         </el-table-column>
 
         <el-table-column
@@ -80,6 +83,12 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <el-table-column
+          prop="NameCN"
+          :label="$t('dictionary:attachment:upload:table:nameCN')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <el-table-column
           prop="Description"
           label="描述"
@@ -92,8 +101,12 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -105,29 +118,26 @@
 
         <el-table-column label="Action">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click="handleDownload(scope.row)"
-            >
+            <el-button type="text" @click="handleDownload(scope.row)">
               下载
             </el-button>
-            <el-button
-              type="text"
-              @click="handleEdit(scope.row)"
-            >
+            <el-button type="text" @click="handleEdit(scope.row)">
               编辑
             </el-button>
-            <el-button
-              type="text"
-              @click="handleDelete(scope.row)"
-            >
+            <el-button type="text" @click="handleDelete(scope.row)">
               删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
 
       <!-- 新增/编辑 -->
       <el-dialog
@@ -138,13 +148,21 @@
         width="600px"
         custom-class="base-dialog-wrapper"
       >
-        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+        <TemplateForm
+          :data="currentRow"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
       </el-dialog>
     </template>
   </BaseContainer>
 </template>
 <script>
-import { getCommonDocumentList, DownloadCommonDoc, deleteCommonDocument } from '@/api/dictionary'
+import {
+  getCommonDocumentList,
+  DownloadCommonDoc,
+  deleteCommonDocument,
+} from '@/api/dictionary'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import TemplateForm from './TemplateForm'
@@ -155,7 +173,7 @@ const searchDataDefault = () => {
     BusinessScenarioEnum: null,
     Name: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
@@ -168,7 +186,7 @@ export default {
       total: 0,
       currentRow: {},
       editDialog: { title: '', visible: false },
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -185,13 +203,15 @@ export default {
     },
     getList() {
       this.loading = true
-      getCommonDocumentList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      getCommonDocumentList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     // 新增
     handleAdd() {
@@ -202,9 +222,13 @@ export default {
     // 下载
     handleDownload(row) {
       this.loading = true
-      DownloadCommonDoc(row.Code).then(data => {
-        this.loading = false
-      }).catch(() => { this.loading = false })
+      DownloadCommonDoc(row.Code)
+        .then((data) => {
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     // 编辑
     handleEdit(row) {
@@ -233,7 +257,12 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .search {
+  display: block;
+}
+</style>
diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 000b017e..8b03f800 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -49,7 +49,7 @@
       <el-table-column prop="Identification" label="标识" :show-overflow-tooltip="true" min-width="200px" />
       <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
       <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" show-overflow-tooltip />
+      <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px"/>
       <el-table-column
         prop="Sort"
         label="显示顺序"
@@ -110,7 +110,7 @@
 
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open" :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-row>
             <el-col v-show="title !== '复制'" :span="24">
               <el-divider content-position="left">基本信息</el-divider>
@@ -142,11 +142,16 @@
                 <el-input v-model="form.Identification" placeholder="请输入标识" />
               </el-form-item>
             </el-col>
-            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
+            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
               <el-form-item label="字段key">
                 <el-input v-model="form.Code" placeholder="请输入字段key" />
               </el-form-item>
             </el-col>
+            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
+              <el-form-item label="字段key英文">
+                <el-input v-model="form.CodeEn" placeholder="请输入字段key英文" />
+              </el-form-item>
+            </el-col>
             <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
               <el-form-item label="字段英文">
                 <el-input v-model="form.Value" placeholder="请输入字段英文" />
@@ -372,6 +377,16 @@
                         <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName" placeholder="固定列名"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="FixedColumnEnName"
+                      min-width="120"
+                      label="固定列名EN"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName" placeholder="固定列名EN"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="ColumnName"
                       min-width="120"
@@ -382,6 +397,16 @@
                         <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnName" placeholder="列字段名"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="ColumnEnName"
+                      min-width="120"
+                      label="列字段名En"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName" placeholder="列字段名En"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="ColumnValue"
                       min-width="120"
@@ -415,6 +440,16 @@
                         <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnName" placeholder="合并组"/>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                      prop="MergeColumnEnName"
+                      min-width="120"
+                      label="合并组EN"
+                      show-overflow-tooltip
+                    >
+                      <template slot-scope="scope">
+                        <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName" placeholder="合并组EN"/>
+                      </template>
+                    </el-table-column>
                     <el-table-column
                       prop="IsPicture"
                       min-width="120"
@@ -489,6 +524,14 @@
                     <el-input v-model="form.ChildDataLabel" placeholder="请输入子数据Lable" />
                   </el-form-item>
                 </el-col>
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
+                  <el-form-item>
+                  <span slot="label">
+                    子数据LableEN
+                  </span>
+                    <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
+                  </el-form-item>
+                </el-col>
                 <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                   <el-form-item>
                     <span slot="label">
@@ -559,6 +602,11 @@
                     <el-input v-model="form.ForeignKeyText" placeholder="请输入数据库字段to" />
                   </el-form-item>
                 </el-col>
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Foreign'" :span="12">
+                  <el-form-item label="字段toEN">
+                    <el-input v-model="form.ForeignKeyEnText" placeholder="请输入数据库字段toEN" />
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-col>
             <el-col v-show="title !== '复制'" :span="24">
@@ -643,6 +691,7 @@
             height="100"
           >
             <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
+            <el-table-column prop="CodeEn" label="字段名英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column
@@ -821,10 +870,13 @@ export default {
         ListName: null,
         IsFixedColumn: false,
         FixedColumnName: null,
+        FixedColumnEnName: null,
         ColumnName: null,
+        ColumnEnName: null,
         ColumnValue: null,
         IsMerge: false,
         MergeColumnName: null,
+        MergeColumnEnName: null,
         IsPicture: false,
         IsDynamicTranslate: false,
         IsNeedTransalate: false,
@@ -1097,6 +1149,7 @@ export default {
         IsShowParent: 0,
         Sort: 0,
         Code: null,
+        CodeEn: null,
         Value: null,
         ValueCN: null,
         EnumType: '',
@@ -1111,6 +1164,7 @@ export default {
         IsSpecialType: false,
         DataType: '',
         ChildDataLabel: null,
+        ChildDataEnLabel: null,
         ChildDataValue: null,
         DateType: null,
         DictionaryCode: null,
@@ -1118,6 +1172,7 @@ export default {
         ForeignKeyTableName: null,
         ForeignKeyValue: null,
         ForeignKeyText: null,
+        ForeignKeyEnText: null,
         TableConfigList: [],
         UrlConfig: {
           RoutePath: null,
diff --git a/src/views/dictionary/template/components/CriterionDictionary.vue b/src/views/dictionary/template/components/CriterionDictionary.vue
index a2cbdc69..97df91c9 100644
--- a/src/views/dictionary/template/components/CriterionDictionary.vue
+++ b/src/views/dictionary/template/components/CriterionDictionary.vue
@@ -213,7 +213,6 @@ export default {
       }).then(res => {
         this.loading = false
         this.list = res.Result
-        console.log(this.$d.GlobalAssessType)
       })
     },
     handleAdd() {
@@ -265,7 +264,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .el-form-item__content{
   width: calc(100% - 110px);
 }
diff --git a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
index edd996dc..c8569eef 100644
--- a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
+++ b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
@@ -62,7 +62,7 @@
         <template slot-scope="scope">
           <div>
             <el-radio-group v-model="scope.row.CrterionDictionaryGroup" @change="(v) => {crterionDictionaryGroupChange(v, scope.row)}" size="mini">
-              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value">{{item.label}}</el-radio-button>
+              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{item.label}}</el-radio-button>
             </el-radio-group>
           </div>
         </template>
@@ -158,7 +158,6 @@ export default {
   },
   mounted() {
     this.getList()
-    console.log(this.$d[this.parentCode])
   },
   methods: {
     crterionDictionaryGroupChange(v, row) {
@@ -231,7 +230,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .el-form-item__content{
   width: calc(100% - 110px);
 }
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 6f5c12a7..76512d45 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -10,7 +10,15 @@
   >
     <div class="base-dialog-body">
       <el-form-item label="类型" prop="Type">
-        <el-select v-model="form.Type" clearable @change="((val)=>{typeChange(val, form)})">
+        <el-select
+          v-model="form.Type"
+          clearable
+          @change="
+            (val) => {
+              typeChange(val, form)
+            }
+          "
+        >
           <el-option
             v-for="item of $d.Criterion_Question_Type"
             :key="item.value"
@@ -31,10 +39,7 @@
         v-if="form.Type === 'group'"
         prop="GroupClassify"
       >
-        <el-select
-          v-model="form.GroupClassify"
-          clearable
-        >
+        <el-select v-model="form.GroupClassify" clearable>
           <el-option
             v-for="item of groupClassifyList"
             :key="item.Id"
@@ -70,13 +75,9 @@
         v-if="form.Type === 'number' || form.Type === 'calculation'"
         label="数值类型"
         prop="ValueType"
-        :rules="[
-          { required: true, message: '请选择'}
-        ]"
+        :rules="[{ required: true, message: '请选择' }]"
       >
-        <el-radio-group
-          v-model="form.ValueType"
-        >
+        <el-radio-group v-model="form.ValueType">
           <el-radio
             v-for="item of $d.ValueType"
             :key="item.id"
@@ -92,9 +93,7 @@
         v-if="form.Type === 'number' || form.Type === 'calculation'"
         label="单位"
       >
-        <el-radio-group
-          v-model="form.Unit"
-        >
+        <el-radio-group v-model="form.Unit">
           <el-radio
             v-for="item of $d.ValueUnit"
             :key="item.id"
@@ -109,15 +108,26 @@
         label="表格类型标识"
         prop="LesionType"
       >
-        <el-select
-          v-model="form.LesionType"
-          clearable
-        >
+        <el-select v-model="form.LesionType" clearable>
           <el-option
             v-for="item of lesionTypes"
             :key="item.Code"
             :value="parseInt(item.Code)"
-            :label="$fd('LesionType',parseInt(item.Code))"
+            :label="$fd('LesionType', parseInt(item.Code))"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'basicTable'"
+        label="表格类型标识"
+        prop="LesionType"
+      >
+        <el-select v-model="form.LesionType" clearable>
+          <el-option
+            v-for="item of lesionTypeList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
           />
         </el-select>
       </el-form-item>
@@ -133,25 +143,27 @@
       </el-form-item> -->
       <!-- 选项类型 -->
       <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'"
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        "
         label="选项类型"
         prop="QuestionGenre"
-        :rules="[
-          { required: form.Type !== 'calculation', message: '请选择'}
-        ]"
+        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
       >
         <el-radio-group
           v-model="form.QuestionGenre"
-          @change="((val)=>{questionGenreChange(val, form)})"
+          @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          "
         >
-          <el-radio
-            :label="-1"
-          >
-            无
-          </el-radio>
+          <el-radio :label="-1"> 无 </el-radio>
           <el-radio
             v-for="item of $d.TableQuestionType"
-            v-show="item.value===0 || item.value===3"
+            v-show="item.value === 0 || item.value === 3"
             :key="item.id"
             :label="item.value"
           >
@@ -183,13 +195,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="转化显示类型"
-        prop="ConvertShowType"
-      >
-        <el-radio-group
-          v-model="form.ConvertShowType"
-        >
+      <el-form-item label="转化显示类型" prop="ConvertShowType">
+        <el-radio-group v-model="form.ConvertShowType">
           <el-radio
             v-for="item of $d.ConvertShowType"
             :key="item.id"
@@ -200,11 +207,19 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="form.QuestionGenre === 3 "
+        v-if="form.QuestionGenre === 3"
         label="关联字典"
         prop="DictionaryCode"
       >
-        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
+        <el-select
+          v-model="form.DictionaryCode"
+          clearable
+          @change="
+            () => {
+              form.DefaultValue = null
+            }
+          "
+        >
           <el-option
             v-for="item of dicList"
             :key="item.Id"
@@ -213,10 +228,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 "
-        label="默认值"
-      >
+      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
         <el-select v-model="form.DefaultValue" clearable>
           <el-option
             v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
@@ -226,10 +238,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 0 "
-        label="默认值"
-      >
+      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
         <el-select v-model="form.DefaultValue" clearable>
           <el-option
             v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
@@ -240,10 +249,18 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="是否显示"
+        prop="ShowQuestion"
+      >
         <el-radio-group
           v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              isShowQuestionChange(val, form)
+            }
+          "
         >
           <el-radio
             v-for="item of $d.ShowQuestion"
@@ -257,14 +274,18 @@
 
       <!-- 显示时依赖父问题 -->
       <el-form-item
-        v-if="form.Type !== 'group' && form.ShowQuestion===1"
+        v-if="form.Type !== 'group' && form.ShowQuestion === 1"
         label="显示依赖父问题"
         prop="ParentId"
       >
         <el-select
           v-model="form.ParentId"
           clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              parentQuestionChange(val, form)
+            }
+          "
         >
           <el-option
             v-for="item of parentOptions"
@@ -275,15 +296,19 @@
         </el-select>
       </el-form-item>
       <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" label="显示触发值" prop="ParentTriggerValueList">
-<!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
-<!--          <el-option-->
-<!--            v-for="item of parentTriggerValOptions"-->
-<!--            :key="item.id"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value.toString()"-->
-<!--          />-->
-<!--        </el-select>-->
+      <el-form-item
+        v-if="form.ParentId && form.ShowQuestion === 1"
+        label="显示触发值"
+        prop="ParentTriggerValueList"
+      >
+        <!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
+        <!--          <el-option-->
+        <!--            v-for="item of parentTriggerValOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value.toString()"-->
+        <!--          />-->
+        <!--        </el-select>-->
         <el-select v-model="form.ParentTriggerValueList" clearable multiple>
           <el-option
             v-for="item of parentTriggerValOptions"
@@ -293,16 +318,44 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation'" label="是否裁判问题">
-        <el-radio-group v-model="form.IsJudgeQuestion" @change="((val)=>{isJudgeQuestionChange(val, form)})">
-          <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`"  :label="item.value">{{ item.label }}</el-radio>
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        "
+        label="是否裁判问题"
+      >
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" label="是否必填" prop="IsRequired">
+      <el-form-item
+        v-if="form.Type !== 'group' && form.Type !== 'table'"
+        label="是否必填"
+        prop="IsRequired"
+      >
         <el-radio-group
           v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
+          :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
+          @change="
+            (val) => {
+              isRequiredChange(val, form)
+            }
+          "
         >
           <el-radio
             v-for="item of $d.QuestionRequired"
@@ -323,7 +376,11 @@
         <el-select
           v-model="form.RelevanceId"
           clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
+          @change="
+            (val) => {
+              relevanceQuestionChange(val, form)
+            }
+          "
         >
           <el-option
             v-for="item of parentOptions"
@@ -339,14 +396,14 @@
         label="必填触发值"
         prop="RelevanceValueList"
       >
-<!--        <el-select v-model="form.RelevanceValue" clearable>-->
-<!--          <el-option-->
-<!--            v-for="item of reParentTriggerValOptions"-->
-<!--            :key="item.id"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value.toString()"-->
-<!--          />-->
-<!--        </el-select>-->
+        <!--        <el-select v-model="form.RelevanceValue" clearable>-->
+        <!--          <el-option-->
+        <!--            v-for="item of reParentTriggerValOptions"-->
+        <!--            :key="item.id"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value.toString()"-->
+        <!--          />-->
+        <!--        </el-select>-->
         <el-select v-model="form.RelevanceValueList" clearable multiple>
           <el-option
             v-for="item of reParentTriggerValOptions"
@@ -385,7 +442,11 @@
       </el-form-item> -->
 
       <el-form-item v-if="form.Type !== 'group'" label="问题分组">
-        <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
+        <el-select
+          v-model="form.GroupId"
+          clearable
+          :disabled="isParentExistGroup"
+        >
           <el-option
             v-for="group of groupOptions"
             :key="group.GroupId"
@@ -396,12 +457,22 @@
       </el-form-item>
       <el-form-item label="限制编辑">
         <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :key="`LimitEdit${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.LimitEdit"
+            :key="`LimitEdit${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item label="全局阅片是否显示">
         <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.GlobalReadingShowType"
+            :key="item.id"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item
@@ -409,10 +480,7 @@
         v-if="form.Type !== 'group'"
         prop="QuestionType"
       >
-        <el-select
-          v-model="form.QuestionType"
-          clearable
-        >
+        <el-select v-model="form.QuestionType" clearable>
           <el-option
             v-for="item of CriterionDictionaryList.QuestionType"
             :key="item.Id"
@@ -428,9 +496,18 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
-        <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="1"
+          :max="10"
+        />
       </el-form-item>
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+      <el-form-item
+        v-if="form.Type === 'select' || form.Type === 'radio'"
+        label="高亮标记值"
+        prop="HighlightAnswerList"
+      >
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
             <el-option
@@ -471,20 +548,23 @@
 
       <el-form-item label="是否在阅片页面显示">
         <el-radio-group v-model="form.IsShowInDicom">
-          <el-radio v-for="item of $d.YesOrNo" :key="`YesOrNo${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </el-form-item>
       <el-form-item
         :label="$t('trials:readingUnit:qsList:title:Remark')"
         prop="Remark"
       >
-        <el-input
-          v-model="form.Remark"
-        />
+        <el-input v-model="form.Remark" />
       </el-form-item>
     </div>
 
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button
@@ -496,7 +576,12 @@
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="save"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -504,20 +589,31 @@
   </el-form>
 </template>
 <script>
-import { getBasicConfigSelect, addOrUpdateReadingQuestionSystem, getSystemCriterionOtherQuestion, getSystemGroupNameList, getCriterionDictionary, getCriterionDictionaryList } from '@/api/dictionary'
+import {
+  getBasicConfigSelect,
+  addOrUpdateReadingQuestionSystem,
+  getSystemCriterionOtherQuestion,
+  getSystemGroupNameList,
+  getCriterionDictionary,
+  getCriterionDictionaryList,
+} from '@/api/dictionary'
 import { getCriterionLesionType } from '@/api/trials'
 export default {
   name: 'AddOrUpdateClinicalData',
   props: {
     data: {
       type: Object,
-      default() { return {} }
+      default() {
+        return {}
+      },
     },
     type: {
       type: String,
-      default() { return '' }
-    }
-  }, 
+      default() {
+        return ''
+      },
+    },
+  },
   data() {
     var validateTypeVal = (rule, value, callback) => {
       if (value === '') {
@@ -553,7 +649,7 @@ export default {
         IsJudgeQuestion: false,
         GroupName: '',
         GroupEnName: '',
-        GroupClassify:null,
+        GroupClassify: null,
         Remark: '',
         ImageCount: 1,
         RelevanceId: '',
@@ -570,32 +666,38 @@ export default {
         GroupId: null,
         ConvertShowType: 0,
         QuestionClassify: null,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
       },
       rules: {
-        Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        Type: [{ required: true, message: '请选择', trigger: 'blur' }],
+        LesionType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        QuestionName: [
+          { required: true, message: '请注明', trigger: 'blur' },
+          { max: 300, message: '最大长度为 300' },
         ],
-        LesionType: [
-          { required: true, message: '请选择', trigger: 'blur' }
-        ],
-        QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 300, message: '最大长度为 300' }],
         QuestionGenre: [{ required: true, message: '请选择', trigger: 'blur' }],
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        TypeValue: [
+          { required: true, message: '请注明', trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: '最大长度为 500' }],
-        DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
+          { max: 500, message: '最大长度为 500' },
+        ],
+        DictionaryCode: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
         ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
         IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
         ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: '请选择', trigger: 'blur' },
         ],
         RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
-        RelevanceValueList: [{ required: true, message: '请选择', trigger: 'blur' }],
-        GroupName: [{ required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: '最大长度为 50' }]
+        RelevanceValueList: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
+        GroupName: [
+          { required: true, message: '请注明', trigger: 'blur' },
+          { max: 50, message: '最大长度为 50' },
+        ],
       },
       loading: false,
       btnLoading: false,
@@ -606,8 +708,9 @@ export default {
       lesionTypes: [],
       dicList: [],
       CriterionDictionaryList: [],
-      groupClassifyList:[],
-      highlightAnswers: []
+      groupClassifyList: [],
+      highlightAnswers: [],
+      lesionTypeList: []
     }
   },
   watch: {
@@ -622,14 +725,14 @@ export default {
           }
           let res = await getCriterionDictionary({
             ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-            DictionaryCode: this.form.DictionaryCode
+            DictionaryCode: this.form.DictionaryCode,
           })
           this.highlightAnswers = res.Result[this.form.DictionaryCode]
         } catch (e) {
           console.log(e)
         }
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.initForm()
@@ -638,22 +741,31 @@ export default {
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-        DictionaryCode: 'QuestionType'
-      }).then(res => {
+        DictionaryCode: 'QuestionType',
+      }).then((res) => {
         this.CriterionDictionaryList = res.Result
       })
     },
     getGroupClassifyDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
-        DictionaryCode: 'GroupClassify'
-      }).then(res => {
+        DictionaryCode: 'GroupClassify',
+      }).then((res) => {
         this.groupClassifyList = res.Result.GroupClassify
       })
     },
+    getLesionTypeDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
+        DictionaryCode: 'LesionType',
+      }).then((res) => {
+        this.lesionTypeList = res.Result.LesionType
+      })
+    },
     async initForm() {
       await this.getGroupOptions()
       await this.getParentQuestions()
+      await this.getLesionTypeDictionary()
       await this.getLesionType()
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
@@ -661,37 +773,47 @@ export default {
             this.form[k] = this.data[k]
           }
         }
-        if (this.form.ParentId !== '' && this.form.ParentId !== null && this.form.GroupName !== '') {
+        if (
+          this.form.ParentId !== '' &&
+          this.form.ParentId !== null &&
+          this.form.GroupName !== ''
+        ) {
           this.isParentExistGroup = true
         }
         if (this.form.ParentId) {
-          var index = this.parentOptions.findIndex(item => {
+          var index = this.parentOptions.findIndex((item) => {
             return item.QuestionId === this.form.ParentId
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              this.parentTriggerValOptions =
+                this.$d[this.parentOptions[index].DictionaryCode]
             } else {
               const options = []
-              this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-                options.push({ id: index, label: item, value: item })
-              })
+              this.parentOptions[index].TypeValue.split('|').forEach(
+                (item, index) => {
+                  options.push({ id: index, label: item, value: item })
+                }
+              )
               this.parentTriggerValOptions = options
             }
           }
         }
         if (this.form.RelevanceId) {
-          var index = this.parentOptions.findIndex(item => {
+          var index = this.parentOptions.findIndex((item) => {
             return item.QuestionId === this.form.RelevanceId
           })
           if (index !== -1) {
             if (this.parentOptions[index].QuestionGenre === 3) {
-              this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+              this.reParentTriggerValOptions =
+                this.$d[this.parentOptions[index].DictionaryCode]
             } else {
               const options = []
-              this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-                options.push({ id: index, label: item, value: item })
-              })
+              this.parentOptions[index].TypeValue.split('|').forEach(
+                (item, index) => {
+                  options.push({ id: index, label: item, value: item })
+                }
+              )
               this.reParentTriggerValOptions = options
             }
           }
@@ -701,18 +823,19 @@ export default {
       this.getGroupClassifyDictionary()
     },
     save() {
-      this.$refs.clinicalDataForm.validate(valid => {
+      this.$refs.clinicalDataForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         if (this.form.Type !== 'upload') {
           this.form.ImageCount = 0
         }
-        addOrUpdateReadingQuestionSystem(this.form).then(res => {
-          this.btnLoading = false
-          this.$emit('getList')
-          this.$emit('close')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        })
+        addOrUpdateReadingQuestionSystem(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            this.$emit('getList')
+            this.$emit('close')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
           .catch(() => {
             this.btnLoading = false
           })
@@ -722,33 +845,38 @@ export default {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          criterionId: this.data.ReadingQuestionCriterionSystemId
+          criterionId: this.data.ReadingQuestionCriterionSystemId,
         }
-        getSystemGroupNameList(param).then(res => {
-          this.groupOptions = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getSystemGroupNameList(param)
+          .then((res) => {
+            this.groupOptions = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     getParentQuestions() {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          readingQuestionCriterionSystemId: this.data.ReadingQuestionCriterionSystemId,
-          id: this.data.Id
+          readingQuestionCriterionSystemId:
+            this.data.ReadingQuestionCriterionSystemId,
+          id: this.data.Id,
         }
-        getSystemCriterionOtherQuestion(param).then(res => {
-          this.parentOptions = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getSystemCriterionOtherQuestion(param)
+          .then((res) => {
+            this.parentOptions = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     questionGenreChange(val, form) {
@@ -819,17 +947,20 @@ export default {
     parentQuestionChange(val, form) {
       this.isParentExistGroup = false
       if (val) {
-        var index = this.parentOptions.findIndex(item => {
+        var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.parentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            this.parentTriggerValOptions =
+              this.$d[this.parentOptions[index].DictionaryCode]
           } else {
             var options = []
-            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-              options.push({ id: index, label: item, value: item })
-            })
+            this.parentOptions[index].TypeValue.split('|').forEach(
+              (item, index) => {
+                options.push({ id: index, label: item, value: item })
+              }
+            )
             this.parentTriggerValOptions = options
           }
           if (this.parentOptions[index].GroupName) {
@@ -845,17 +976,20 @@ export default {
     },
     relevanceQuestionChange(val, form) {
       if (val) {
-        var index = this.parentOptions.findIndex(item => {
+        var index = this.parentOptions.findIndex((item) => {
           return item.QuestionId === val
         })
         if (index !== -1) {
           if (this.parentOptions[index].QuestionGenre === 3) {
-            this.reParentTriggerValOptions = this.$d[this.parentOptions[index].DictionaryCode]
+            this.reParentTriggerValOptions =
+              this.$d[this.parentOptions[index].DictionaryCode]
           } else {
             var options = []
-            this.parentOptions[index].TypeValue.split('|').forEach((item, index) => {
-              options.push({ id: index, label: item, value: item })
-            })
+            this.parentOptions[index].TypeValue.split('|').forEach(
+              (item, index) => {
+                options.push({ id: index, label: item, value: item })
+              }
+            )
             this.reParentTriggerValOptions = options
           }
         }
@@ -871,23 +1005,24 @@ export default {
       return new Promise((resolve, reject) => {
         this.loading = true
         var param = {
-          SystemCriterionId: this.data.ReadingQuestionCriterionSystemId
+          SystemCriterionId: this.data.ReadingQuestionCriterionSystemId,
         }
-        getCriterionLesionType(param).then(res => {
-          this.lesionTypes = res.Result
-          this.loading = false
-          resolve()
-        }).catch(() => {
-          this.loading = false
-          reject()
-        })
+        getCriterionLesionType(param)
+          .then((res) => {
+            this.lesionTypes = res.Result
+            this.loading = false
+            resolve()
+          })
+          .catch(() => {
+            this.loading = false
+            reject()
+          })
       })
     },
     close() {
       this.$emit('close')
-    }
-
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index d4d31ade..ed7741cf 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -170,7 +170,7 @@
               <el-button
                 type="primary"
                 size="mini"
-                :disabled="scope.row.Type !== 'table'"
+                :disabled="!(scope.row.Type === 'table' || scope.row.Type === 'basicTable')"
                 @click="handleConfig(scope.row)"
               >
                 表格问题
diff --git a/src/views/dictionary/template/components/OrganForm.vue b/src/views/dictionary/template/components/OrganForm.vue
index f1ee2ac5..7ace7401 100644
--- a/src/views/dictionary/template/components/OrganForm.vue
+++ b/src/views/dictionary/template/components/OrganForm.vue
@@ -69,7 +69,7 @@
           >{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="序号">
+      <el-form-item label="序号" prop="ShowOrder">
         <el-input v-model="form.ShowOrder" type="number" />
       </el-form-item>
       <!-- 描述 -->
@@ -135,7 +135,8 @@ export default {
         Part: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
         TULOC: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
         Remark: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }],
-        IsLymphNodes: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        IsLymphNodes: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
+        ShowOrder: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }]
       },
       lesionTypes: [],
       loading: false,
diff --git a/src/views/dictionary/template/components/OrgansTbl.vue b/src/views/dictionary/template/components/OrgansTbl.vue
index 639676d7..efd5127c 100644
--- a/src/views/dictionary/template/components/OrgansTbl.vue
+++ b/src/views/dictionary/template/components/OrgansTbl.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true" size="mini">
         <el-form-item label="器官类型">
           <el-select v-model="searchData.OrganType" clearable style="width:130px;">
-            <el-option v-for="item of CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
+            <el-option v-for="item of CriterionDictionaryOrganTypeList && CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
           </el-select>
         </el-form-item>
         <el-form-item label="部位">
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index ebb98415..b751763e 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -355,11 +355,11 @@
           <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="全局阅片是否显示">
+      <!-- <el-form-item label="全局阅片是否显示">
         <el-radio-group v-model="form.GlobalReadingShowType">
           <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
+        </el-radio-group> 
+      </el-form-item> -->
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
@@ -445,7 +445,7 @@ export default {
         DependParentId: '',
         QuestionMark: null,
         LimitEdit: 0,
-        GlobalReadingShowType: null,
+        // GlobalReadingShowType: null,
         QuestionClassify: null,
         HighlightAnswerList: []
 
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 4e123227..9a11ceb9 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -1,11 +1,29 @@
 <template>
-  <div style="display: flex;justify-content: center">
-    <div style="width: 600px;text-align: center;border: 1px solid #e6e6e6;margin-top:40px;padding:10px;">
-      <div class="trial-myinfo-head" style="font-size: 30px;line-height: 120px;">
+  <div style="display: flex; justify-content: center">
+    <div
+      style="
+        width: 600px;
+        text-align: center;
+        border: 1px solid #e6e6e6;
+        margin-top: 40px;
+        padding: 10px;
+      "
+    >
+      <div
+        class="trial-myinfo-head"
+        style="font-size: 30px; line-height: 120px"
+      >
         <!-- 首次登录修改密码 -->
         {{ $t('recompose:title:init') }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="200px">
+      <el-form
+        ref="passwordForm"
+        v-loading="loading"
+        label-position="right"
+        :model="password"
+        :rules="passwordFormRules"
+        :label-width="$i18n.locale == 'zh' ? '100px' : '200px'"
+      >
         <!-- 邮箱 -->
         <el-form-item :label="$t('recompose:form:email')" prop="Email">
           <el-input v-model="password.Email" disabled />
@@ -19,70 +37,135 @@
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:newPassword')"
+          prop="NewPassWord"
+        >
+          <el-input
+            v-model="password.NewPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:confirmPassword')"
+          prop="ConfirmPassWord"
+        >
+          <el-input
+            v-model="password.ConfirmPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
-        <el-form-item style="text-align:right">
+        <el-form-item style="text-align: right">
           <!-- 取消 -->
-          <el-button
-            size="small"
-            @click="cancel"
-          >
+          <el-button size="small" @click="cancel">
             {{ $t('recompose:button:cancel') }}
           </el-button>
           <!-- 保存 -->
-          <el-button
-            type="primary"
-            size="small"
-            @click="save"
-          >
+          <el-button type="primary" size="small" @click="save">
             {{ $t('recompose:button:save') }}
           </el-button>
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 </template>
 <script>
 import { initSetUserNameAndPwd } from '@/api/admin.js'
 import md5 from 'js-md5'
-import {mapGetters, mapMutations} from "vuex";
+import { mapGetters, mapMutations } from 'vuex'
 export default {
   data() {
     return {
       password: {
         NewUserName: null,
-        UserId: null
+        UserId: null,
       },
       passwordFormRules: {
-        NewUserName: [{ required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' }],
+        NewUserName: [
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              var lang = zzSessionStorage.getItem('lang')
+                ? zzSessionStorage.getItem('lang')
+                : 'zh'
+              /* eslint-disable */
+              var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
+              console.log(!reg1.test(value))
+              if (!reg1.test(value)) {
+                callback(
+                  lang === 'zh'
+                    ? new Error(
+                        '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                      )
+                    : new Error(
+                        'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                      )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
         NewPassWord: [
-          { required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' },
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              !value
+                ? callback(
+                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                  )
+                : callback()
+            },
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, validator: (rule, value, callback) => {!value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback()}, trigger: 'blur' }
-        ]
+          {
+            required: true,
+            validator: (rule, value, callback) => {
+              !value
+                ? callback(
+                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                  )
+                : callback()
+            },
+            trigger: 'blur',
+          },
+          {
+            required: true,
+            trigger: 'blur',
+            validator: (rule, value, callback) => {
+              value !== this.password.NewPassWord
+                ? callback(
+                    new Error(
+                      this.$t(
+                        'trials:researchForm:formRule:NewPassWordAndConfirmPassWord'
+                      )
+                    )
+                  )
+                : callback()
+            },
+          },
+        ],
       },
       userId: null,
-      loading: false
+      loading: false,
     }
   },
   computed: {
-    ...mapGetters([
-      'asyncRoutes',
-      'routes',
-      'language'
-    ])
+    ...mapGetters(['asyncRoutes', 'routes', 'language']),
   },
   mounted() {
     this.password.UserId = this.$route.query.UserId
@@ -112,7 +195,7 @@ export default {
       this.$updateDictionary()
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             // 两次密码输入不一致
@@ -123,26 +206,32 @@ export default {
             NewUserName: this.password.NewUserName,
             UserId: this.password.UserId,
             NewPwd: md5(this.password.NewPassWord),
-            access_token: this.password.access_token
+            access_token: this.password.access_token,
           }
           this.loading = true
-          initSetUserNameAndPwd(param).then(res => {
-            this.loading = false
-            if (res.IsSuccess) {
-              // 修改成功,请重新登录账号
-              this.$message.success(this.$t('recompose:message:updatedSuccessfully'))
-              setTimeout(() => {
-                this.logout()
-              }, 500)
-            }
-          }).catch(() => { this.loading = false })
+          initSetUserNameAndPwd(param)
+            .then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                // 修改成功,请重新登录账号
+                this.$message.success(
+                  this.$t('recompose:message:updatedSuccessfully')
+                )
+                setTimeout(() => {
+                  this.logout()
+                }, 500)
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
         }
       })
     },
     cancel() {
       this.$refs['passwordForm'].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 <style>
@@ -165,13 +254,16 @@ export default {
 <style scoped>
 input:-webkit-autofill {
   -webkit-text-fill-color: #ededed !important;
-  box-shadow: 0 0 0px 1000px transparent  inset !important;
-  background-color:transparent;
+  box-shadow: 0 0 0px 1000px transparent inset !important;
+  background-color: transparent;
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
 input {
-  background-color:transparent;
+  background-color: transparent;
   caret-color: #fff;
 }
+.el-form-item {
+  margin-bottom: 30px;
+}
 </style>
diff --git a/src/views/feedBack/index.vue b/src/views/feedBack/index.vue
index febb9590..c4edaa42 100644
--- a/src/views/feedBack/index.vue
+++ b/src/views/feedBack/index.vue
@@ -114,7 +114,7 @@
             size="mini"
             @click="getList"
           >
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -122,7 +122,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
           <!-- <el-button
             type="primary"
@@ -141,7 +141,7 @@
           v-if="level > 7"
           :disabled="tableSelectData.length <= 0"
         >
-          {{ $t("feedBack:button:resolve") }}
+          {{ $t('feedBack:button:resolve') }}
         </el-button>
       </el-form>
       <el-table
@@ -257,7 +257,7 @@
         >
           <template slot-scope="scope">
             <el-tag :type="['danger', 'success'][scope.row.State]">{{
-              $fd("FeedBackStatus", scope.row.State)
+              $fd('FeedBackStatus', scope.row.State)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -278,7 +278,7 @@
         >
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="getDetail(scope.row)">
-              {{ $t("common:button:view") }}
+              {{ $t('common:button:view') }}
             </el-button>
           </template>
         </el-table-column>
@@ -295,8 +295,8 @@
   </div>
 </template>
 <script>
-import Pagination from "@/components/Pagination";
-import { batchUpdateFeedBackState, getUserFeedBackList } from "@/api/trials.js";
+import Pagination from '@/components/Pagination'
+import { batchUpdateFeedBackState, getUserFeedBackList } from '@/api/trials.js'
 const searchDataDefault = () => {
   return {
     TrialKeyInfo: null,
@@ -312,23 +312,23 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: "CreateTime",
-  };
-};
+    SortField: 'CreateTime',
+  }
+}
 export default {
   components: { Pagination },
   props: {
     trialId: {
       type: String,
-      default: "",
+      default: '',
     },
   },
   dicts: [
-    "NoticeApplicableTrial",
-    "NoteLevel",
-    "NoteType",
-    "NoticeState",
-    "NoticeMode",
+    'NoticeApplicableTrial',
+    'NoteLevel',
+    'NoteType',
+    'NoticeState',
+    'NoticeMode',
   ],
   data() {
     return {
@@ -340,100 +340,100 @@ export default {
       searchData: searchDataDefault(),
       tableSelectData: [],
       UserTypeOptins: [
-        { label: "CRC", value: 2 },
-        { label: "IR", value: 13 },
+        { label: 'CRC', value: 2 },
+        { label: 'IR', value: 13 },
       ],
-    };
+    }
   },
   computed: {
     level() {
-      if (this.hasPermi(["role:dev", "role:admin"])) {
-        return 9;
+      if (this.hasPermi(['role:dev', 'role:admin'])) {
+        return 9
       }
-      if (this.hasPermi(["role:pm"])) {
-        return 8;
+      if (this.hasPermi(['role:pm', 'role:apm'])) {
+        return 8
       }
-      if (this.hasPermi(["role:ir", "role:crc"])) {
-        return 7;
+      if (this.hasPermi(['role:ir', 'role:crc'])) {
+        return 7
       }
-      return 0;
+      return 0
     },
     QuestionTypeOptions() {
       if (this.level > 7) {
         return [
           ...this.$d.FeedBackTypeToCRC.filter((item) => item.value > 0),
           ...this.$d.FeedBackTypeToIR,
-        ];
+        ]
       }
-      if (this.hasPermi(["role:ir"])) {
-        return this.$d.FeedBackTypeToIR;
+      if (this.hasPermi(['role:ir'])) {
+        return this.$d.FeedBackTypeToIR
       }
-      if (this.hasPermi(["role:crc"])) {
-        return this.$d.FeedBackTypeToCRC;
+      if (this.hasPermi(['role:crc'])) {
+        return this.$d.FeedBackTypeToCRC
       }
-      return [];
+      return []
     },
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 通过提交状态决定该行的 CheckBox 是否可以勾选
     handleSelectTable(row) {
-      return row.State < 1;
+      return row.State < 1
     },
     async getList() {
       try {
         if (this.trialId) {
-          this.searchData.TrialId = this.trialId;
+          this.searchData.TrialId = this.trialId
         }
-        this.loading = true;
-        let res = await getUserFeedBackList(this.searchData);
-        this.loading = false;
+        this.loading = true
+        let res = await getUserFeedBackList(this.searchData)
+        this.loading = false
         if (res.IsSuccess) {
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         }
       } catch (err) {
-        this.loading = false;
-        console.log(err);
+        this.loading = false
+        console.log(err)
       }
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.BeginCreatime = val[0];
-        this.searchData.EndCreatime = val[1];
+        this.searchData.BeginCreatime = val[0]
+        this.searchData.EndCreatime = val[1]
       } else {
-        this.searchData.BeginCreatime = "";
-        this.searchData.EndCreatime = "";
+        this.searchData.BeginCreatime = ''
+        this.searchData.EndCreatime = ''
       }
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.datetimerange = null
+      this.handleDatetimeChange()
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 设为解决
     async resolve() {
       try {
-        let confirm = await this.$confirm(this.$t("feedBack:resolve:tip"), {
-          type: "warning",
+        let confirm = await this.$confirm(this.$t('feedBack:resolve:tip'), {
+          type: 'warning',
           distinguishCancelAndClose: true,
-        });
-        if (!confirm) return;
+        })
+        if (!confirm) return
         let data = {
           IdList: this.tableSelectData.map((item) => item.Id),
           state: 1,
-        };
-        let res = await batchUpdateFeedBackState(data);
+        }
+        let res = await batchUpdateFeedBackState(data)
         if (res.IsSuccess) {
-          this.$message.success(this.$t("feedBack:resolve:success"));
-          this.getList();
+          this.$message.success(this.$t('feedBack:resolve:success'))
+          this.getList()
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 导出
@@ -441,32 +441,32 @@ export default {
     // 表格选择
     handleSelectChange(selection) {
       // console.log(selection, "handleSelectChange");
-      this.tableSelectData = selection;
+      this.tableSelectData = selection
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 获取详情
     getDetail(row) {
       this.$FB({
-        type: "detail",
+        type: 'detail',
         Id: row.Id,
         callBack: () => {
-          this.getList();
-          this.$emit("success");
+          this.getList()
+          this.$emit('success')
         },
-      });
+      })
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .role {
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 1498f6e1..1f18d6f4 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -61,16 +61,16 @@
         :disabled="form.VerificationCode === '' || form.EmailOrPhone === ''"
         @click="verifyCode"
       >
-        {{ $t("passwordReset:button:verify") }}
+        {{ $t('passwordReset:button:verify') }}
       </el-button>
     </div>
-    <div class="box-wrapper" v-if="active === 1">
+    <div class="box-wrapper" v-show="active === 1">
       <el-form
-        ref="resetForm"
+        ref="resetForm2"
         v-loading="formLoading"
         :model="form"
-        label-width="100px"
-        :rules="rules"
+        :label-width="$i18n.locale === 'en' ? '180px' : '100px'"
+        :rules="rules2"
         class="demo-ruleForm"
         size="small"
       >
@@ -131,7 +131,7 @@
       <div style="width: 50%; margin: auto; display: flex">
         <!-- 取消 -->
         <el-button size="small" @click="onCancel" style="width: 46%">
-          {{ $t("passwordReset:button:cancel") }}
+          {{ $t('passwordReset:button:cancel') }}
         </el-button>
         <!-- 提交 -->
         <el-button
@@ -140,17 +140,17 @@
           @click="onSubmit"
           style="width: 46%"
         >
-          {{ $t("passwordReset:button:submit") }}
+          {{ $t('passwordReset:button:submit') }}
         </el-button>
       </div>
     </div>
     <div class="box-wrapper flexBox" v-if="active === 3">
       <svg-icon icon-class="resetSuccess" style="width: 300px; height: 300px" />
       <p style="width: 100%; text-align: center">
-        {{ $t("resetPassword:successTip") }}
+        {{ $t('resetPassword:successTip') }}
       </p>
       <el-button size="small" type="primary" @click="goBack">
-        {{ $t("passwordReset:button:back") }}
+        {{ $t('passwordReset:button:back') }}
       </el-button>
     </div>
   </div>
@@ -160,32 +160,30 @@ import {
   anonymousSendVerificationCode,
   verifyAnonymousVerifyCode,
   anonymousSetPassword,
-} from "@/api/user";
-import md5 from "js-md5";
-import Img from "@/assets/icons/svg/resetSuccess.svg";
-var timer = "";
-var countdown = 60;
+} from '@/api/user'
+import md5 from 'js-md5'
+import Img from '@/assets/icons/svg/resetSuccess.svg'
+var timer = ''
+var countdown = 60
 export default {
   data() {
     var validateEmail = (rule, value, callback) => {
-      if (value === "") {
+      if (value === '') {
         // 请输入邮箱
-        callback(new Error(this.$t("passwordReset:formRule:email")));
+        callback(new Error(this.$t('passwordReset:formRule:email')))
       } else {
         var reg =
-          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
-          this.sendDisabled = false;
-          callback();
+          this.sendDisabled = false
+          callback()
         } else {
           // 邮箱无效
-          callback(
-            new Error(this.$t("passwordReset:formRule:passwordinvalid"))
-          );
-          this.sendDisabled = true;
+          callback(new Error(this.$t('passwordReset:formRule:passwordinvalid')))
+          this.sendDisabled = true
         }
       }
-    };
+    }
     // var validatePass = (rule, value, callback) => {
     //   if (value === '') {
     //     // 请输入密码
@@ -198,181 +196,206 @@ export default {
     //   }
     // }
     var validatePass2 = (rule, value, callback) => {
-      if (value === "" || value === undefined) {
+      if (value === '' || value === undefined) {
         // 请再次输入密码
-        callback(new Error(this.$t("passwordReset:formRule:confirmPassword")));
+        callback(new Error(this.$t('passwordReset:formRule:confirmPassword')))
       } else if (value !== undefined && value !== this.form.NewPwd) {
         // 两次密码不一致
-        callback(new Error(this.$t("passwordReset:formRule:passwordsDiffer")));
+        callback(new Error(this.$t('passwordReset:formRule:passwordsDiffer')))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     return {
       active: 0,
       Img,
       form: {
-        EmailOrPhone: "",
-        VerificationCode: "",
-        NewPwd: "",
-        UserId: "",
-        UserType: "",
+        EmailOrPhone: '',
+        VerificationCode: '',
+        NewPwd: '',
+        CheckPass: '',
+        UserId: '',
+        UserType: '',
       },
       users: [],
-      CheckPass: "",
+      CheckPass: '',
       rules: {
         EmailOrPhone: [
           {
             required: true,
             validator: validateEmail,
-            trigger: ["blur", "change"],
+            trigger: ['blur', 'change'],
           },
         ],
         VerificationCode: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
           },
         ],
         NewPwd: [
           {
             required: true,
             validator: this.$validatePassword,
-            trigger: ["blur", "change"],
+            trigger: ['blur', 'change'],
           },
         ],
         CheckPass: [
           {
             required: true,
             validator: validatePass2,
-            trigger: ["blur", "change"],
+            trigger: ['blur', 'change'],
           },
         ],
         UserId: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      rules2: {
+        NewPwd: [
+          {
+            required: true,
+            validator: this.$validatePassword,
+            trigger: ['blur', 'change'],
+          },
+        ],
+        CheckPass: [
+          {
+            required: true,
+            validator: validatePass2,
+            trigger: ['blur', 'change'],
+          },
+        ],
+        UserId: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
       },
       sendDisabled: true,
-      sendTitle: this.$t("passwordReset:button:send"),
+      sendTitle: this.$t('passwordReset:button:send'),
       formLoading: false,
-    };
+    }
   },
   methods: {
     onSubmit() {
-      this.$refs["resetForm"].validate((valid) => {
+      this.$refs['resetForm2'].validate((valid) => {
         if (valid) {
-          this.formLoading = true;
+          this.formLoading = true
           anonymousSetPassword(this.form.UserId, md5(this.form.NewPwd))
             .then((res) => {
               if (res.IsSuccess) {
                 // 修改成功
                 this.$message.success(
-                  this.$t("passwordReset:message:updatedSuccessfully")
-                );
-                this.formLoading = false;
-                this.active = 3;
+                  this.$t('passwordReset:message:updatedSuccessfully')
+                )
+                this.formLoading = false
+                this.active = 3
                 // this.goBack();
               } else {
-                this.$alert(res.ErrorMessage);
+                this.$alert(res.ErrorMessage)
               }
             })
             .catch(() => {
-              this.formLoading = false;
-            });
+              this.formLoading = false
+            })
         }
-      });
+      })
     },
     handleSendCode() {
-      const that = this;
-      this.sendDisabled = true;
+      const that = this
+      this.sendDisabled = true
       // var isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
       anonymousSendVerificationCode(this.form.EmailOrPhone)
         .then((res) => {
           if (res.IsSuccess) {
-            let msg = this.$t('passwordReset:message:tip:sendCode').replace("xxx", this.form.EmailOrPhone)
+            let msg = this.$t('passwordReset:message:tip:sendCode').replace(
+              'xxx',
+              this.form.EmailOrPhone
+            )
             this.$message.success(msg)
-            that.settime(that);
+            that.settime(that)
           } else {
-            that.$alert(res.ErrorMessage);
+            that.$alert(res.ErrorMessage)
           }
         })
         .catch(() => {
-          this.sendDisabled = false;
-        });
+          this.sendDisabled = false
+        })
     },
     verifyCode() {
-      this.formLoading = true;
+      this.formLoading = true
       verifyAnonymousVerifyCode(
         this.form.EmailOrPhone,
         this.form.VerificationCode
       )
         .then((res) => {
-          this.formLoading = false;
-          this.users = res.Result;
+          this.formLoading = false
+          this.users = res.Result
           if (this.users.length === 1) {
-            this.form.UserId = this.users[0].UserId;
-            this.form.UserType = this.users[0].UserType;
+            this.form.UserId = this.users[0].UserId
+            this.form.UserType = this.users[0].UserType
           }
           // 验证成功
           this.$message.success(
-            this.$t("passwordReset:message:verifiedSuccessfully")
-          );
-          this.active = 1;
+            this.$t('passwordReset:message:verifiedSuccessfully')
+          )
+          this.active = 1
         })
         .catch(() => {
-          this.formLoading = false;
-        });
+          this.formLoading = false
+        })
     },
     handleEmailChange() {
       var reg =
-        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
       if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
-        this.sendDisabled = false;
+        this.sendDisabled = false
       }
     },
     handleUserChange(val) {
-      const seleted = this.users.findIndex((user) => user.UserId === val);
+      const seleted = this.users.findIndex((user) => user.UserId === val)
       if (seleted > -1) {
-        this.form.UserType = this.users[seleted].UserType;
+        this.form.UserType = this.users[seleted].UserType
       }
     },
     settime(obj) {
       if (countdown === 0) {
-        obj.sendDisabled = false;
-        obj.sendTitle = this.$t("passwordReset:button:send");
-        countdown = 60;
-        clearTimeout(timer);
-        return;
+        obj.sendDisabled = false
+        obj.sendTitle = this.$t('passwordReset:button:send')
+        countdown = 60
+        clearTimeout(timer)
+        return
       } else {
-        obj.sendDisabled = true;
-        obj.sendTitle = `${this.$t(
-          "passwordReset:button:wait"
-        )}(${countdown}s)`;
-        countdown--;
+        obj.sendDisabled = true
+        obj.sendTitle = `${this.$t('passwordReset:button:wait')}(${countdown}s)`
+        countdown--
         // eslint-disable-next-line no-self-assign
-        countdown = countdown;
+        countdown = countdown
         timer = setTimeout(function () {
-          obj.settime(obj);
-        }, 1000);
+          obj.settime(obj)
+        }, 1000)
       }
     },
     onCancel() {
-      this.$refs["resetForm"].resetFields();
+      this.$refs['resetForm'].resetFields()
       Object.keys(this.form).forEach((key) => {
-        this.form[key] = "";
-      });
-      this.active = 0;
+        this.form[key] = ''
+      })
+      this.active = 0
     },
     goBack() {
-      this.$router.push("/login");
+      this.$router.push('/login')
     },
   },
-};
+}
 </script>
 <style>
 .reset-wrapper {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4d3878be..6a288fb3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -27,7 +27,7 @@
               style="width: 300px; height: 94px"
             />
           </div>
-          <div class="title" v-else>{{ $t("login:title:system") }}</div>
+          <div class="title" v-else>{{ $t('login:title:system') }}</div>
         </div>
         <el-form
           ref="loginForm"
@@ -105,7 +105,7 @@
             size="medium"
             @click.native.prevent="handleLogin"
           >
-            {{ $t("login:button:login") }}
+            {{ $t('login:button:login') }}
           </el-button>
           <div style="text-align: right">
             <TopLang
@@ -121,7 +121,7 @@
               @click.native.prevent="handleResetPwd"
               style="color: rgb(0, 147, 221)"
             >
-              {{ $t("login:button:forgetPassword") }}
+              {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
         </el-form>
@@ -174,10 +174,12 @@
       >
         <h1 style="text-align: center; margin-bottom: 20px">关于</h1>
         <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
-          {{ $t("login:title:system_title") }}
+          {{ $t('login:title:system_title') }}
+        </p>
+        <p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
+        <p style="margin-bottom: 20px">
+          V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
         </p>
-        <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V{{ $version.Version }}</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
@@ -201,14 +203,14 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from "vuex";
-import TopLang from "./topLang";
+import { mapGetters, mapMutations } from 'vuex'
+import TopLang from './topLang'
 // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee'
-import Vcode from "vue-puzzle-vcode";
-import browserTip from "@/views/dictionary/template/browser/tip.vue";
-import Img1 from "@/assets/pic-2.png";
+import Vcode from 'vue-puzzle-vcode'
+import browserTip from '@/views/dictionary/template/browser/tip.vue'
+import Img1 from '@/assets/pic-2.png'
 export default {
-  name: "Login",
+  name: 'Login',
   components: { TopLang, Vcode, browserTip },
   data() {
     return {
@@ -216,18 +218,18 @@ export default {
       VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
       aboutVisible: false,
       loginForm: {
-        username: "",
-        password: "",
+        username: '',
+        password: '',
         UserId: null,
       },
       loginRules: {
         username: [
           {
             required: true,
-            message: this.$t("login:formRule:userName"),
-            trigger: "blur",
+            message: this.$t('login:formRule:userName'),
+            trigger: 'blur',
           },
-          { max: 20, message: `${this.$t("common:ruleMessage:maxLength")} 20` },
+          { max: 20, message: `${this.$t('common:ruleMessage:maxLength')} 20` },
         ],
         password: [
           // {
@@ -237,29 +239,29 @@ export default {
           // },
           {
             required: true,
-            message: this.$t("login:formRule:password"),
-            trigger: "blur",
+            message: this.$t('login:formRule:password'),
+            trigger: 'blur',
           },
-          { max: 20, message: `${this.$t("common:ruleMessage:maxLength")} 20` },
+          { max: 20, message: `${this.$t('common:ruleMessage:maxLength')} 20` },
         ],
       },
       loading: false,
-      passwordType: "password",
+      passwordType: 'password',
       loginType: null,
       location: null,
       isShow: false,
       showCode: false,
       Img1,
-    };
+    }
   },
   computed: {
-    ...mapGetters(["asyncRoutes", "routes", "language"]),
+    ...mapGetters(['asyncRoutes', 'routes', 'language']),
   },
   watch: {
-    "$i18n.locale": {
+    '$i18n.locale': {
       handler() {
         if (this.$refs.browserTip) {
-          this.$refs.browserTip.open();
+          this.$refs.browserTip.open()
         }
       },
       deep: true,
@@ -267,88 +269,88 @@ export default {
     },
   },
   mounted() {
-    this.loginType = this.$route.query.loginType;
-    this.location = this.$route.query.location;
-    zzSessionStorage.setItem("loginType", this.loginType);
-    localStorage.setItem("location", this.location);
-    if (process.env.VUE_APP_OSS_CONFIG_REGION === "oss-us-west-1") {
-      this.$i18n.locale = "en";
-      this.setLanguage("en");
-      this.$updateDictionary();
+    this.loginType = this.$route.query.loginType
+    this.location = this.$route.query.location
+    zzSessionStorage.setItem('loginType', this.loginType)
+    localStorage.setItem('location', this.location)
+    if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
+      this.$i18n.locale = 'en'
+      this.setLanguage('en')
+      this.$updateDictionary()
     } else {
-      if (this.location === "USA" || this.NODE_ENV === "usa") {
-        this.$i18n.locale = "en";
-        this.setLanguage("en");
-        this.$updateDictionary();
+      if (this.location === 'USA' || this.NODE_ENV === 'usa') {
+        this.$i18n.locale = 'en'
+        this.setLanguage('en')
+        this.$updateDictionary()
       } else {
         // this.$i18n.locale = 'zh'
         // this.setLanguage('zh')
         // this.$updateDictionary()
       }
     }
-    this.$refs.browserTip.open();
+    this.$refs.browserTip.open()
   },
   methods: {
-    ...mapMutations({ setLanguage: "lang/setLanguage" }),
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     openAbout() {
-      this.aboutVisible = true;
+      this.aboutVisible = true
     },
     showPwd() {
-      if (this.passwordType === "password") {
-        this.passwordType = "";
+      if (this.passwordType === 'password') {
+        this.passwordType = ''
       } else {
-        this.passwordType = "password";
+        this.passwordType = 'password'
       }
       this.$nextTick(() => {
-        this.$refs.password.focus();
-      });
+        this.$refs.password.focus()
+      })
     },
     handleLogin() {
-      this.loginType = this.$route.query.loginType;
+      this.loginType = this.$route.query.loginType
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
           if (this.showCode) {
-            this.isShow = true;
+            this.isShow = true
           } else {
-            this.onSuccess();
+            this.onSuccess()
           }
         } else {
           // console.log('error submit!!')
-          return false;
+          return false
         }
-      });
+      })
     },
     loginIn(Id) {
-      this.loading = true;
-      this.showCode = false;
-      if (Id) this.loginForm.UserId = Id;
+      this.loading = true
+      this.showCode = false
+      if (Id) this.loginForm.UserId = Id
       this.$store
-        .dispatch("user/login", this.loginForm)
+        .dispatch('user/login', this.loginForm)
         .then((res) => {
           if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
-            this.$message.success(this.$t("login:message:login1"));
+            this.$message.success(this.$t('login:message:login1'))
             setTimeout(() => {
               this.$router.push({
                 path: `/recompose?userName=${this.loginForm.username}`,
-              });
-            }, 500);
-            return;
+              })
+            }, 500)
+            return
           } else if (res.BasicInfo.LoginState === 1) {
             // 请先修改密码后再登录！
             this.$alert(
-              this.$t("login:message:login3"),
-              this.$t("common:title:warning"),
+              this.$t('login:message:login3'),
+              this.$t('common:title:warning'),
               {
                 callback: (action) => {
                   this.$router.push({
                     path: `/recompose?userName=${this.loginForm.username}`,
-                  });
-                  return;
+                  })
+                  return
                 },
               }
-            );
-            return;
+            )
+            return
           } else if (res.IsMFA) {
             this.$MFA({
               UserId: res.BasicInfo.Id,
@@ -356,55 +358,55 @@ export default {
               username: this.loginForm.username,
               callBack: this.loginIn,
               cancelBack: () => {
-                this.loading = false;
+                this.loading = false
               },
-            });
-            return;
+            })
+            return
           } else if (res.BasicInfo.LoginState === 2) {
             // 本次登录的IP或设备与上次不一致，请确认'
             // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-            this.$message.warning(this.$t("login:message:login4"));
+            this.$message.warning(this.$t('login:message:login4'))
           }
-          this.$store.dispatch("permission/generateRoutes").then((res) => {
-            this.loading = false;
+          this.$store.dispatch('permission/generateRoutes').then((res) => {
+            this.loading = false
             if (res && res.length > 0) {
-              this.$store.dispatch("global/getNoticeList");
-              this.$router.addRoutes(res);
-              if (this.loginType === "DevOps") {
-                this.$router.replace({ path: res[0].path });
-                return;
+              this.$store.dispatch('global/getNoticeList')
+              this.$router.addRoutes(res)
+              if (this.loginType === 'DevOps') {
+                this.$router.replace({ path: res[0].path })
+                return
               }
-              if (this.hasPermi(["role:radmin"])) {
-                this.$router.replace({ path: res[0].path });
-                return;
+              if (this.hasPermi(['role:radmin'])) {
+                this.$router.replace({ path: res[0].path })
+                return
               }
               if (
-                this.hasPermi(["role:air", "role:rpm", "role:rcrc", "role:rir"])
+                this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])
               ) {
-                this.$router.replace({ path: "/trials/trials-list" });
+                this.$router.replace({ path: '/trials/trials-list' })
               } else {
-                this.$router.replace({ path: "/trials" });
+                this.$router.replace({ path: '/trials' })
               }
             } else {
               // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
-              this.$message.warning(this.$t("login:message:login2"));
+              this.$message.warning(this.$t('login:message:login2'))
             }
-          });
+          })
         })
         .catch(() => {
-          this.showCode = true;
-          this.loading = false;
-        });
+          this.showCode = true
+          this.loading = false
+        })
     },
     onSuccess() {
-      this.isShow = false;
-      this.loginIn();
+      this.isShow = false
+      this.loginIn()
     },
     handleResetPwd() {
-      this.$router.push({ name: "Resetpassword" });
+      this.$router.push({ name: 'Resetpassword' })
     },
   },
-};
+}
 </script>
 
 <style lang="scss">
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 7dae2175..0c5506b7 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -2,52 +2,65 @@
   <div v-loading="loading" class="img-container">
     <el-card class="box-card left">
       <div class="title">
-        {{$t('trials:none-dicom-show:fileList')}}
+        {{ $t('trials:none-dicom-show:fileList') }}
       </div>
       <div class="left-content">
         <!-- 检查层级 -->
-        <div v-for="(study,i) in studyList" :key="study.CodeView">
+        <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
-            <span style="margin:0 5px">{{ study.Modality }}</span>
+            <span style="margin: 0 5px">{{ study.Modality }}</span>
             <span>{{ getBodyPart(study.BodyPart) }}</span>
           </div>
           <!-- 文件层级 -->
-          <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
-            <slot name="empty">暂无数据</slot>
+          <div
+            v-if="study.NoneDicomStudyFileList.length === 0"
+            class="empty-text"
+          >
+            <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
           </div>
-          <div v-else id="imgList" style="height:100%;overflow: hidden">
+          <div v-else id="imgList" style="height: 100%; overflow: hidden">
             <div
-              v-for="(item,j) in study.NoneDicomStudyFileList"
+              v-for="(item, j) in study.NoneDicomStudyFileList"
               :id="`img${item.Id}`"
               :key="item.Id"
               :class="{
-                'is-boxActive': item.Id === currentFileId
+                'is-boxActive': item.Id === currentFileId,
               }"
               class="img-box"
-              @click="selected(item,i,j,true)"
+              @click="selected(item, i, j, true)"
             >
-              {{ `${j+1}. ${item.FileName}` }}
+              <div v-if="item.FileName.length < 15" class="img-text">
+                {{ `${j + 1}. ${item.FileName}` }}
+              </div>
+              <el-tooltip v-else :content="item.FileName" placement="bottom">
+                <div class="img-text">
+                  {{ `${j + 1}. ${item.FileName}` }}
+                </div>
+              </el-tooltip>
             </div>
-
           </div>
         </div>
       </div>
-
     </el-card>
     <!-- 预览图像 -->
     <el-card class="box-card right">
-      <div style="width:100%;height: 100%;">
-        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;" :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
+      <div style="width: 100%; height: 100%">
+        <Preview
+          v-if="previewImage.imgList.length > 0"
+          ref="previewImage"
+          style="width: 100%"
+          :preview-image="previewImage"
+          :value="currentStudyFileIndex"
+          @selectedImg="selectedImg"
+        />
       </div>
-
     </el-card>
 
     <!-- <el-card class="box-card" style="width:300px;height:100%;padding: 10px;margin-left:10px;">
       <CheckForm />
     </el-card> -->
   </div>
-
 </template>
 
 <script>
@@ -59,7 +72,7 @@ import Preview from './components/preview'
 export default {
   name: 'Notice',
   components: {
-    Preview
+    Preview,
     // CheckForm
   },
   data() {
@@ -76,18 +89,18 @@ export default {
         popup: true, // 弹窗的显示隐藏
         studyCode: '',
         modality: '',
-        bodyPart: ''
+        bodyPart: '',
       },
       previewVisible: false,
       studyList: [],
       subjectVisitId: '',
       sudyId: '',
       loading: false,
-      bp:[]
+      bp: [],
     }
   },
-  async created(){
-    this.bp = await this.$getBodyPart(this.$route.query.trialId);
+  async created() {
+    this.bp = await this.$getBodyPart(this.$route.query.trialId)
   },
   async mounted() {
     if (this.$router.currentRoute.query.TokenKey) {
@@ -112,31 +125,47 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
+      var newArr = arr.map((i) => {
+        return this.$fd(
+          'Bodypart',
+          i.trim(),
+          'Code',
+          { Bodypart: this.bp },
+          'Name'
+        )
       })
-      console.log(newArr,this.bp)
+      console.log(newArr, this.bp)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => {
-        this.studyList = res.Result
-        this.loading = false
-        const studyIndex = this.studyList.findIndex(item => {
-          return item.NoneDicomStudyFileList.length > 0
+      getNoneDicomStudyList(
+        this.subjectVisitId,
+        this.studyId,
+        false,
+        this.$route.query.visitTaskId
+      )
+        .then((res) => {
+          this.studyList = res.Result
+          this.loading = false
+          const studyIndex = this.studyList.findIndex((item) => {
+            return item.NoneDicomStudyFileList.length > 0
+          })
+          if (studyIndex > -1) {
+            var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
+            this.selected(fileObj[0], studyIndex, 0, true)
+          }
+        })
+        .catch(() => {
+          this.loading = false
         })
-        if (studyIndex > -1) {
-          var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
-          this.selected(fileObj[0], studyIndex, 0, true)
-        }
-      }).catch(() => { this.loading = false })
     },
     selected(file, studyIndex, fileIndex, isChangeSub = false) {
       this.currentFileId = file.Id
       this.currentStudyIndex = studyIndex
-      this.previewImage.imgList = this.studyList[studyIndex].NoneDicomStudyFileList
+      this.previewImage.imgList =
+        this.studyList[studyIndex].NoneDicomStudyFileList
       this.currentStudyFileIndex = fileIndex
       this.previewImage.index = fileIndex
       this.previewImage.studyCode = this.studyList[studyIndex].CodeView
@@ -151,11 +180,17 @@ export default {
     selectedImg(fileIndex) {
       if (this.studyList.length > 0) {
         this.currentStudyFileIndex = fileIndex
-        this.currentFileId = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[fileIndex].Id
+        this.currentFileId =
+          this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[
+            fileIndex
+          ].Id
         this.previewImage.index = fileIndex
-        this.previewImage.studyCode = this.studyList[this.currentStudyIndex].CodeView
-        this.previewImage.bodyPart = this.studyList[this.currentStudyIndex].BodyPart
-        this.previewImage.modality = this.studyList[this.currentStudyIndex].Modality
+        this.previewImage.studyCode =
+          this.studyList[this.currentStudyIndex].CodeView
+        this.previewImage.bodyPart =
+          this.studyList[this.currentStudyIndex].BodyPart
+        this.previewImage.modality =
+          this.studyList[this.currentStudyIndex].Modality
         this.$nextTick(() => {
           const target = document.getElementById(`img${this.currentFileId}`)
           const parent = document.getElementsByClassName('left-content')[0]
@@ -165,14 +200,13 @@ export default {
     },
     preview() {
       this.previewVisible = true
-    }
-
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.img-container{
+.img-container {
   position: relative;
   width: 100%;
   height: 100%;
@@ -186,27 +220,27 @@ export default {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     padding: 0px;
   }
 }
-.study-desc{
+.study-desc {
   padding: 15px 5px;
   line-height: 20px;
   background-color: #d5d5d5;
   font-weight: 500;
 }
-.left{
-  width:220px;
+.left {
+  width: 220px;
   height: 100%;
 
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
     flex-direction: column;
   }
-  .title{
+  .title {
     height: 40px;
     line-height: 40px;
     border: 1ppx solid;
@@ -215,7 +249,7 @@ export default {
     background-color: #4e4e4e;
     color: #ffffff;
   }
-  .left-content{
+  .left-content {
     flex: 1;
     overflow-y: auto;
   }
@@ -231,21 +265,26 @@ export default {
   //   overflow-y: auto;
   //   padding: 0;
   // }
-  .img-box{
+  .img-box {
     // position: relative;
     display: inline-block;
     box-sizing: border-box;
     border-bottom: 2px solid #f3f3f3;
-    width: 180px;
-    height: 50px;
-    line-height: 50px;
+
     cursor: pointer;
     // margin-bottom: 5px;
     padding-left: 5px;
-    text-overflow:ellipsis;
+  }
+  .img-text {
+    display: inline-block;
+    width: 200px;
+    height: 50px;
+    line-height: 50px;
+    overflow: hidden;
+    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
-  .img-box:nth-last-child(1){
+  .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
   .is-boxActive {
@@ -256,14 +295,13 @@ export default {
     opacity: 0;
   }
 }
-.right{
+.right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  /deep/ .el-card__body{
+  /deep/ .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
-
 </style>
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index edc686f4..171d78ea 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -1,76 +1,130 @@
 <template>
-  <div style="display: flex;justify-content: center">
-    <div style="width: 600px;text-align: center;border: 1px solid #e6e6e6;margin-top:40px;padding:10px;">
-      <div class="trial-myinfo-head" style="font-size: 30px;line-height: 120px;">
+  <div style="display: flex; justify-content: center">
+    <div
+      style="
+        width: 600px;
+        text-align: center;
+        border: 1px solid #e6e6e6;
+        margin-top: 40px;
+        padding: 10px;
+      "
+    >
+      <div
+        class="trial-myinfo-head"
+        style="font-size: 30px; line-height: 120px"
+      >
         <!-- 首次登录修改密码 -->
         {{ $t('recompose:title:init') }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="120px">
+      <el-form
+        ref="passwordForm"
+        v-loading="loading"
+        label-position="right"
+        :model="password"
+        :rules="passwordFormRules"
+        :label-width="$i18n.locale === 'en' ? '180px' : '120px'"
+      >
         <!-- 用户名 -->
         <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 旧密码 -->
-        <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
-          <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:oldPassword')"
+          prop="OldPassWord"
+        >
+          <el-input
+            v-model="password.OldPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:newPassword')"
+          prop="NewPassWord"
+        >
+          <el-input
+            v-model="password.NewPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:confirmPassword')"
+          prop="ConfirmPassWord"
+        >
+          <el-input
+            v-model="password.ConfirmPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
-        <el-form-item style="text-align:right">
+        <el-form-item style="text-align: right">
           <!-- 取消 -->
-          <el-button
-            size="small"
-            @click="cancel"
-          >
+          <el-button size="small" @click="cancel">
             {{ $t('recompose:button:cancel') }}
           </el-button>
           <!-- 保存 -->
-          <el-button
-            type="primary"
-            size="small"
-            @click="save"
-          >
+          <el-button type="primary" size="small" @click="save">
             {{ $t('recompose:button:save') }}
           </el-button>
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 </template>
 <script>
 import { modifyPassword } from '@/api/admin.js'
 import md5 from 'js-md5'
-import {mapMutations} from "vuex";
+import { mapMutations } from 'vuex'
 export default {
   data() {
     return {
       password: {
-        NewUserName: null
+        NewUserName: null,
       },
       passwordFormRules: {
-        NewUserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        NewUserName: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
+        OldPassWord: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
         NewPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             required: true,
             trigger: 'blur',
-            validator: this.$validatePassword
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        ]
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+        ],
       },
       userId: null,
-      loading: false
+      loading: false,
     }
   },
   mounted() {
@@ -78,7 +132,6 @@ export default {
     if (!this.password.NewUserName) {
       // 该页面只提供给首次进入系统的用户使用
       this.$alert(this.$t('recompose:message:warning'))
-
     }
   },
   methods: {
@@ -96,7 +149,7 @@ export default {
       this.$updateDictionary()
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             // 两次密码输入不一致
@@ -106,58 +159,64 @@ export default {
           const param = {
             NewUserName: this.password.NewUserName,
             NewPassWord: md5(this.password.NewPassWord),
-            OldPassWord: md5(this.password.OldPassWord)
+            OldPassWord: md5(this.password.OldPassWord),
           }
           this.loading = true
-          modifyPassword(param).then(res => {
-            this.loading = false
-            if (res.IsSuccess) {
-              // 修改成功,请重新登录账号
-              this.$message.success(this.$t('recompose:message:updatedSuccessfully'))
-              setTimeout(() => {
-                this.logout()
-              }, 500)
-            }
-          }).catch(() => { this.loading = false })
+          modifyPassword(param)
+            .then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                // 修改成功,请重新登录账号
+                this.$message.success(
+                  this.$t('recompose:message:updatedSuccessfully')
+                )
+                setTimeout(() => {
+                  this.logout()
+                }, 500)
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
         }
       })
     },
     cancel() {
       this.$refs['passwordForm'].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 <style>
-  .reset-wrapper {
-    padding: 20px;
-  }
-  .reset-wrapper .el-page-header {
-    line-height: 50px;
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    background-color: #fff;
-  }
-  .reset-wrapper .box-wrapper {
-    width: 60%;
-    margin: 20px auto;
-    padding: 10px;
-    color: #303133;
-  }
+.reset-wrapper {
+  padding: 20px;
+}
+.reset-wrapper .el-page-header {
+  line-height: 50px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.reset-wrapper .box-wrapper {
+  width: 60%;
+  margin: 20px auto;
+  padding: 10px;
+  color: #303133;
+}
 </style>
 <style scoped>
-::v-deep .is-error{
+::v-deep .is-error {
   margin-bottom: 40px;
 }
 input:-webkit-autofill {
   -webkit-text-fill-color: #ededed !important;
-  box-shadow: 0 0 0px 1000px transparent  inset !important;
-  background-color:transparent;
+  box-shadow: 0 0 0px 1000px transparent inset !important;
+  background-color: transparent;
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
 input {
-  background-color:transparent;
+  background-color: transparent;
   caret-color: #fff;
 }
 </style>
diff --git a/src/views/research-mobile/login.vue b/src/views/research-mobile/login.vue
index 284defad..7ed665f1 100644
--- a/src/views/research-mobile/login.vue
+++ b/src/views/research-mobile/login.vue
@@ -38,7 +38,7 @@
       <div class="login_content">
         <el-form-item
           :label="$t('trials:researchForm:form:siteName')"
-          prop="SiteId"
+          prop="TrialSiteId"
         >
           <el-select
             v-model="form.TrialSiteId"
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 594830f0..6e865b23 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -34,7 +34,7 @@
             <el-input v-model="form.IndicationType" disabled />
           </el-form-item>
           <!-- 中心名称 -->
-          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId">
+          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
             <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
               <el-option
                 v-for="(item,index) of siteOptions"
diff --git a/src/views/system/i18n/index.vue b/src/views/system/i18n/index.vue
index 5ba45484..ce1550f2 100644
--- a/src/views/system/i18n/index.vue
+++ b/src/views/system/i18n/index.vue
@@ -147,7 +147,7 @@
             >
               {{
                 $fd(
-                  "InternationalizationType",
+                  'InternationalizationType',
                   scope.row.InternationalizationType
                 )
               }}
@@ -158,7 +158,7 @@
             >
               {{
                 $fd(
-                  "InternationalizationType",
+                  'InternationalizationType',
                   scope.row.InternationalizationType
                 )
               }}
@@ -166,7 +166,7 @@
             <el-tag v-else>
               {{
                 $fd(
-                  "InternationalizationType",
+                  'InternationalizationType',
                   scope.row.InternationalizationType
                 )
               }}
@@ -176,7 +176,7 @@
         <el-table-column
           label="功能模块/服务名"
           prop="Module"
-          min-width="120"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -210,13 +210,13 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.State === 0" type="danger">
-              {{ $fd("InternationalizationKeyState", scope.row.State) }}
+              {{ $fd('InternationalizationKeyState', scope.row.State) }}
             </el-tag>
             <el-tag v-else-if="scope.row.State === 1" type="primary">
-              {{ $fd("InternationalizationKeyState", scope.row.State) }}
+              {{ $fd('InternationalizationKeyState', scope.row.State) }}
             </el-tag>
             <el-tag v-else>
-              {{ $fd("InternationalizationKeyState", scope.row.State) }}
+              {{ $fd('InternationalizationKeyState', scope.row.State) }}
             </el-tag>
           </template>
         </el-table-column>
@@ -241,7 +241,13 @@
           show-overflow-tooltip
           sortable="custom"
         />
-
+        <el-table-column
+          label="创建时间"
+          prop="CreateTime"
+          width="150"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <el-table-column
           label="操作"
           fixed="right"
@@ -289,11 +295,11 @@ import {
   deleteInternationalization,
   getPublishVersionSelect,
   batchUpdateInternationalInfo,
-} from "@/api/admin";
-import Pagination from "@/components/Pagination";
-import I18nForm from "./components/I18nForm.vue";
-import BatchAddForm from "./components/BatchAddForm.vue";
-import moment from "moment";
+} from '@/api/admin'
+import Pagination from '@/components/Pagination'
+import I18nForm from './components/I18nForm.vue'
+import BatchAddForm from './components/BatchAddForm.vue'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
     Description: null,
@@ -304,13 +310,13 @@ const searchDataDefault = () => {
     Module: null,
     PublishLogId: null,
     Asc: true,
-    SortField: "",
+    SortField: '',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "I18n",
+  name: 'I18n',
   components: { Pagination, I18nForm, BatchAddForm },
   data() {
     return {
@@ -321,140 +327,140 @@ export default {
       loading: false,
       PublishVersionList: [],
       selectTableList: [],
-    };
+    }
   },
   mounted() {
-    this.getList();
-    this.getPublishVersionSelect();
+    this.getList()
+    this.getPublishVersionSelect()
   },
   methods: {
     // 获取迭代
     async getPublishVersionSelect() {
       try {
-        let res = await getPublishVersionSelect();
+        let res = await getPublishVersionSelect()
         if (res.IsSuccess) {
-          this.PublishVersionList = res.Result;
+          this.PublishVersionList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     getList() {
-      this.loading = true;
+      this.loading = true
       getInternationalizationList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 批量更新
     handleBatchUpdate() {
       this.$nextTick(() => {
-        this.$refs["i18nForm"].openDialog(
-          "批量更新",
+        this.$refs['i18nForm'].openDialog(
+          '批量更新',
           {},
           this.PublishVersionList,
-          "batch"
-        );
-      });
+          'batch'
+        )
+      })
     },
     async batch(row) {
-      let { PublishLogId, State } = row;
+      let { PublishLogId, State } = row
       let data = {
         PublishLogId,
         State,
         IdList: this.selectTableList.map((item) => item.Id),
-      };
+      }
       try {
-        let res = await batchUpdateInternationalInfo(data);
+        let res = await batchUpdateInternationalInfo(data)
         if (res.IsSuccess) {
-          this.$message.success(this.$t("common:message:updatedSuccessfully"));
-          this.getList();
+          this.$message.success(this.$t('common:message:updatedSuccessfully'))
+          this.getList()
           this.$nextTick(() => {
-            this.$refs["i18nForm"].handleCancle();
-          });
+            this.$refs['i18nForm'].handleCancle()
+          })
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs["i18nForm"].openDialog(
-          "新增",
+        this.$refs['i18nForm'].openDialog(
+          '新增',
           {},
           this.PublishVersionList,
-          "add"
-        );
-      });
+          'add'
+        )
+      })
     },
     handleBatchAdd() {
       this.$nextTick(() => {
-        this.$refs["batcnAddForm"].openDialog(
-          "批量新增",
+        this.$refs['batcnAddForm'].openDialog(
+          '批量新增',
           {},
           this.PublishVersionList
-        );
-      });
+        )
+      })
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs["i18nForm"].openDialog(
-          "编辑",
+        this.$refs['i18nForm'].openDialog(
+          '编辑',
           row,
           this.PublishVersionList,
-          "update"
-        );
-      });
+          'update'
+        )
+      })
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 删除
     handleDelete(row) {
-      this.$confirm("是否确认删除？", {
-        type: "warning",
+      this.$confirm('是否确认删除？', {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deleteInternationalization(row.Id)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getList();
+              this.getList()
               this.$message.success(
-                this.$t("common:message:deletedSuccessfully")
-              );
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 选择
     handleSelectionChange(val) {
-      this.selectTableList = val;
+      this.selectTableList = val
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .log {
diff --git a/src/views/system/log/components/LogForm.vue b/src/views/system/log/components/LogForm.vue
index 2a3dc551..8e8c630f 100644
--- a/src/views/system/log/components/LogForm.vue
+++ b/src/views/system/log/components/LogForm.vue
@@ -9,10 +9,16 @@
         label-width="120px"
         size="small"
       >
-        <el-form-item label="发布版本" prop="Version">
+        <el-form-item :label="$t('system:log:form:version')" prop="Version">
           <el-input v-model="form.Version" />
         </el-form-item>
-        <el-form-item label="更新功能" prop="UpdateContent">
+        <el-form-item :label="$t('system:log:form:versionUS')" prop="Version">
+          <el-input v-model="form.Version_US" />
+        </el-form-item>
+        <el-form-item
+          :label="$t('system:log:form:updateContent')"
+          prop="UpdateContent"
+        >
           <el-input
             v-model="form.UpdateContent"
             type="textarea"
@@ -20,8 +26,8 @@
             :autosize="{ minRows: 4, maxRows: 5 }"
           />
         </el-form-item>
-        <el-form-item label="发布状态" prop="State">
-          <el-select v-model="form.State" placeholder="请选择">
+        <el-form-item :label="$t('system:log:form:State')" prop="State">
+          <el-select v-model="form.State" placeholder="">
             <el-option
               v-for="item in $d.PublishStatus"
               :key="item.id"
@@ -31,15 +37,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布日期">
+        <el-form-item :label="$t('system:log:form:PublishTime')">
           <el-date-picker
             v-model="form.PublishTime"
             type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
-        <el-form-item label="是否当前版本" prop="IsCurrentVersion">
-          <el-select v-model="form.IsCurrentVersion" placeholder="请选择">
+        <el-form-item
+          :label="$t('system:log:form:IsCurrentVersion')"
+          prop="IsCurrentVersion"
+        >
+          <el-select v-model="form.IsCurrentVersion" placeholder="">
             <el-option
               v-for="item in $d.YesOrNo"
               :key="item.id"
@@ -52,30 +61,31 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle"
-        >取消</el-button
-      >
-      <el-button size="small" type="primary" @click="handleSave"
-        >保存</el-button
-      >
+      <el-button size="small" type="primary" @click="handleCancle">
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdatePublishLog } from "@/api/admin";
-import BaseModel from "@/components/BaseModel";
+import { addOrUpdatePublishLog } from '@/api/admin'
+import BaseModel from '@/components/BaseModel'
 const formDataDefault = () => {
   return {
     Id: null,
     Version: null,
+    Version_US: null,
     PublishTime: null,
     UpdateContent: null,
     State: null,
     IsCurrentVersion: null,
-  };
-};
+  }
+}
 export default {
-  name: "LogForm",
+  name: 'LogForm',
   components: { BaseModel },
   data() {
     return {
@@ -83,69 +93,87 @@ export default {
       form: formDataDefault(),
       rules: {
         Version: [
-          { required: true, message: "请注明", trigger: "blur" },
-          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
+          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
         ],
         // PublishTime: [
         //   { required: true, message: '请注明', trigger: 'blur' }
         // ],
         IsCurrentVersion: [
-          { required: true, message: "请选择", trigger: "blur" },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
+        ],
+        State: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
-        State: [{ required: true, message: "请选择", trigger: "blur" }],
         UpdateContent: [
-          { required: true, message: "请注明", trigger: "blur" },
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
           {
             max: 1000,
-            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+            message: `${this.$t('common:ruleMessage:maxLength')} 500`,
           },
         ],
       },
       model_cfg: {
         visible: false,
         showClose: true,
-        width: "500px",
-        title: "",
+        width: '500px',
+        title: '',
         appendToBody: true,
       },
-    };
+    }
   },
   mounted() {},
   methods: {
     openDialog(title, data) {
-      this.model_cfg.visible = true;
-      this.model_cfg.title = title;
+      this.model_cfg.visible = true
+      this.model_cfg.title = title
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k];
+            this.form[k] = data[k]
           }
         }
       } else {
-        this.form = formDataDefault();
+        this.form = formDataDefault()
       }
     },
     handleSave() {
       this.$refs.LogForm.validate((valid) => {
-        if (!valid) return;
-        this.loading = true;
+        if (!valid) return
+        this.loading = true
         addOrUpdatePublishLog(this.form)
           .then((res) => {
-            this.loading = false;
-            this.$message.success(this.$t("common:message:savedSuccessfully"));
-            this.model_cfg.visible = false;
-            this.$emit("getList");
+            this.loading = false
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.model_cfg.visible = false
+            this.$emit('getList')
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     handleCancle() {
-      this.model_cfg.visible = false;
+      this.model_cfg.visible = false
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-select,
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 0775865f..7bfd6e16 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -2,9 +2,12 @@
   <div class="log">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item label="发布版本" prop="Version">
+        <el-form-item :label="$t('system:log:table:version')" prop="Version">
           <el-input v-model="searchData.Version" size="small" clearable />
         </el-form-item>
+        <el-form-item :label="$t('system:log:table:versionUS')" prop="Version">
+          <el-input v-model="searchData.Version_US" size="small" clearable />
+        </el-form-item>
         <el-form-item label="更新功能" prop="UpdateContent">
           <el-input v-model="searchData.UpdateContent" size="small" clearable />
         </el-form-item>
@@ -38,30 +41,37 @@
       >
         <el-table-column type="index" width="50" />
         <el-table-column
-          label="发布版本"
+          :label="$t('system:log:table:version')"
           prop="Version"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          label="更新功能"
+          :label="$t('system:log:table:versionUS')"
+          prop="Version_US"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          :label="$t('system:log:table:UpdateContent')"
           prop="UpdateContent"
           min-width="150"
           show-overflow-tooltip
         />
         <el-table-column
-          label="发布状态"
+          :label="$t('system:log:table:State')"
           prop="State"
           min-width="150"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
+            <span>{{ $fd('PublishStatus', scope.row.State) }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          label="发布日期"
+          :label="$t('system:log:table:PublishTime')"
           prop="PublishTime"
           min-width="90"
           show-overflow-tooltip
@@ -70,23 +80,23 @@
           <template slot-scope="scope">
             {{
               scope.row.PublishTime
-                ? moment(scope.row.PublishTime).format("YYYY-MM-DD")
-                : ""
+                ? moment(scope.row.PublishTime).format('YYYY-MM-DD')
+                : ''
             }}
           </template>
         </el-table-column>
         <el-table-column
-          label="是否当前版本"
+          :label="$t('system:log:table:IsCurrentVersion')"
           prop="IsCurrentVersion"
           min-width="150"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
+            <span>{{ $fd('YesOrNo', scope.row.IsCurrentVersion) }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          label="操作"
+          :label="$t('common:action:action')"
           fixed="right"
           prop=""
           min-width="200"
@@ -99,7 +109,7 @@
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               size="mini"
@@ -107,7 +117,7 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -125,20 +135,21 @@
   </div>
 </template>
 <script>
-import { getPublishLogList, deletePublishLog } from "@/api/admin";
-import Pagination from "@/components/Pagination";
-import LogForm from "./components/LogForm.vue";
-import moment from "moment";
+import { getPublishLogList, deletePublishLog } from '@/api/admin'
+import Pagination from '@/components/Pagination'
+import LogForm from './components/LogForm.vue'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
     Version: null,
+    Version_US: null,
     UpdateContent: null,
     Asc: false,
-    SortField: "PublishTime",
+    SortField: 'PublishTime',
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
   components: { Pagination, LogForm },
   data() {
@@ -148,74 +159,74 @@ export default {
       list: [],
       total: 0,
       loading: false,
-    };
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
     getList() {
-      this.loading = true;
+      this.loading = true
       getPublishLogList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs["LogForm"].openDialog("新增", {});
-      });
+        this.$refs['LogForm'].openDialog('新增', {})
+      })
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs["LogForm"].openDialog("编辑", row);
-      });
+        this.$refs['LogForm'].openDialog('编辑', row)
+      })
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 删除
     handleDelete(row) {
-      this.$confirm("是否确认删除？", {
-        type: "warning",
+      this.$confirm('是否确认删除？', {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deletePublishLog(row.Id)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getList();
+              this.getList()
               this.$message.success(
-                this.$t("common:message:deletedSuccessfully")
-              );
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .log {
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index b6392258..9a81a4c5 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -41,8 +41,8 @@
         </el-form-item>
         <!-- 阅片标准 -->
         <el-form-item
-          :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
           v-if="hasPermi(['role:ir'])"
+          :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
         >
           <el-select
             v-model="searchData.CriterionType"
@@ -59,8 +59,8 @@
         </el-form-item>
         <!-- 联系人 -->
         <el-form-item
-          :label="$t('trials:trials-list:table:IR_PMEmailList')"
           v-if="hasPermi(['role:ir'])"
+          :label="$t('trials:trials-list:table:IR_PMEmailList')"
         >
           <el-input
             v-model="searchData.PM_EMail"
@@ -293,9 +293,10 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSelectSearch"
-              >Search</el-button
-            >
+            <el-button
+              type="primary"
+              @click="handleSelectSearch"
+            >Search</el-button>
             <el-button type="primary" @click="handleReset">Reset</el-button>
             <el-button type="primary" @click="isShow = false">Back</el-button>
           </el-form-item>
@@ -357,23 +358,19 @@
             <el-tag
               v-if="scope.row.TrialStatusStr === 'Initializing'"
               type="info"
-              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-            >
+            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag>
             <el-tag
               v-if="scope.row.TrialStatusStr === 'Ongoing'"
               type="primary"
-              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-            >
+            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag>
             <el-tag
               v-if="scope.row.TrialStatusStr === 'Completed'"
               type="warning"
-              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-            >
+            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag>
             <el-tag
               v-if="scope.row.TrialStatusStr === 'Stopped'"
               type="danger"
-              >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag
-            >
+            >{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -582,7 +579,7 @@
               :disabled="
                 (scope.row.TrialStatusStr === 'Initializing' &&
                   !hasPermi(['role:pm'])) ||
-                scope.row.IsDeleted
+                  scope.row.IsDeleted || ((scope.row.TrialStatusStr === 'Completed' || scope.row.TrialStatusStr === 'Stopped') && !(hasPermi(['role:qa']) || hasPermi(['role:ea']) || hasPermi(['role:pm'])))
               "
               :title="$t('trials:trials-list:action:panel')"
               @click.stop="handleDetail(scope.row)"
@@ -612,7 +609,7 @@
               icon="el-icon-delete"
               :disabled="
                 scope.row.IsDeleted ||
-                scope.row.TrialStatusStr !== 'Initializing'
+                  scope.row.TrialStatusStr !== 'Initializing'
               "
               :title="$t('trials:trials-list:action:abolition')"
               @click.stop="handleAbandon(scope.row)"
@@ -693,54 +690,54 @@
 import {
   abandonTrial,
   ifTrialCanOngoing,
-  getTrialToBeDoneList,
-} from "@/api/trials";
-import { getTrialList_Export } from "@/api/export";
-import store from "@/store";
-import { mapGetters } from "vuex";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import TrialForm from "./components/TrialForm";
-import TrialStatusForm from "./components/TrialStatusForm";
-import DoneList from "./components/DoneList";
+  getTrialToBeDoneList
+} from '@/api/trials'
+import { getTrialList_Export } from '@/api/export'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TrialForm from './components/TrialForm'
+import TrialStatusForm from './components/TrialStatusForm'
+import DoneList from './components/DoneList'
 const searchDataDefault = () => {
   return {
-    Code: "",
+    Code: '',
     CriterionIds: [],
-    SponsorId: "",
+    SponsorId: '',
     ReviewTypeIds: [],
-    CROId: "",
-    Expedited: "",
-    Indication: "",
-    Phase: "",
+    CROId: '',
+    Expedited: '',
+    Indication: '',
+    Phase: '',
     ModalityIds: [],
-    BeginDate: "",
-    EndDate: "",
-    AttendedReviewerType: "",
-    ResearchProgramNo: "",
-    ExperimentName: "",
+    BeginDate: '',
+    EndDate: '',
+    AttendedReviewerType: '',
+    ResearchProgramNo: '',
+    ExperimentName: '',
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: "",
+    SortField: '',
     CriterionType: null,
-    PM_EMail: null,
-  };
-};
+    PM_EMail: null
+  }
+}
 export default {
-  name: "Trials",
+  name: 'Trials',
   components: {
     Pagination,
     BaseContainer,
     TrialForm,
     TrialStatusForm,
-    DoneList,
+    DoneList
   },
-  dicts: ["ReadingStandard", "ReviewType", "ReadingType"],
+  dicts: ['ReadingStandard', 'ReviewType', 'ReadingType'],
   data() {
     return {
       exportLoading: false,
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       doneDialogVisible: false,
       doneTitle: null,
       selectArr: [],
@@ -750,26 +747,26 @@ export default {
       total: 0,
       isShow: false,
       dialogVisible: false,
-      title: "",
-      currentId: "",
+      title: '',
+      currentId: '',
       statusVisible: false,
       currentRow: {},
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       phaseOptions: [
-        { value: "I" },
-        { value: "II" },
-        { value: "III" },
-        { value: "IV" },
+        { value: 'I' },
+        { value: 'II' },
+        { value: 'III' },
+        { value: 'IV' }
       ],
       expeditedOption: this.$d.TrialExpeditedState,
       beginPickerOption: {
         disabledDate: (time) => {
           if (this.searchData.EndDate) {
-            return time.getTime() > new Date(this.searchData.EndDate).getTime();
+            return time.getTime() > new Date(this.searchData.EndDate).getTime()
           } else {
-            return time.getTime() > Date.now();
+            return time.getTime() > Date.now()
           }
-        },
+        }
       },
       endpickerOption: {
         disabledDate: (time) => {
@@ -777,306 +774,189 @@ export default {
             return (
               time.getTime() > Date.now() ||
               time.getTime() <= new Date(this.searchData.BeginDate).getTime()
-            );
+            )
           } else {
-            return time.getTime() > Date.now();
+            return time.getTime() > Date.now()
           }
-        },
-      },
-    };
+        }
+      }
+    }
   },
   computed: {
-    ...mapGetters(["sponsorList", "croList"]),
+    ...mapGetters(['sponsorList', 'croList'])
   },
   created() {
-    this.initPage();
+    this.initPage()
   },
   methods: {
     initPage() {
-      this.getList();
-      store.dispatch("global/getSponsorList");
-      store.dispatch("global/getCROList");
+      this.getList()
+      store.dispatch('global/getSponsorList')
+      store.dispatch('global/getCROList')
     },
     // 获取项目列表信息
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
       getTrialToBeDoneList(this.searchData)
         .then((res) => {
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          this.listLoading = false;
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.listLoading = false
         })
         .catch(() => {
-          this.listLoading = false;
-        });
+          this.listLoading = false
+        })
     },
 
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 查询
     handleSelectSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
-      this.isShow = false;
+      this.searchData.PageIndex = 1
+      this.getList()
+      this.isShow = false
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 新增项目
     handleNew() {
       // this.$router.push({ name: 'CreateTrial' })
-      this.title = this.$t("trials:trials-list:dialogTitle:new");
-      this.currentId = "";
-      this.dialogVisible = true;
+      this.title = this.$t('trials:trials-list:dialogTitle:new')
+      this.currentId = ''
+      this.dialogVisible = true
     },
     // 编辑项目
     handleEdit(row) {
-      this.title = this.$t("trials:trials-list:dialogTitle:edit");
-      this.currentId = row.Id;
-      this.dialogVisible = true;
+      this.title = this.$t('trials:trials-list:dialogTitle:edit')
+      this.currentId = row.Id
+      this.dialogVisible = true
     },
     handleCommission(row) {
-      this.doneTitle = this.$t("trials:trials-list:dialogTitle:doneTitle");
-      this.currentId = row.Id;
-      this.doneDialogVisible = true;
+      this.doneTitle = this.$t('trials:trials-list:dialogTitle:doneTitle')
+      this.currentId = row.Id
+      this.doneDialogVisible = true
     },
     closeDialog() {
-      this.dialogVisible = false;
+      this.dialogVisible = false
     },
     // 状态
     handleStatus(row) {
-      if (row.TrialStatusStr === "Initializing") {
-        this.listLoading = true;
+      if (row.TrialStatusStr === 'Initializing') {
+        this.listLoading = true
         ifTrialCanOngoing(row.Id)
           .then((res) => {
-            this.listLoading = false;
+            this.listLoading = false
             if (res.Result) {
-              this.currentRow = { ...row };
-              this.statusVisible = true;
+              this.currentRow = { ...row }
+              this.statusVisible = true
             } else {
               this.$confirm(res.ErrorMessage, {
-                type: "warning",
+                type: 'warning',
                 showCancelButton: false,
-                callback: (action) => {},
-              });
+                callback: (action) => {}
+              })
             }
           })
           .catch(() => {
-            this.listLoading = false;
-          });
+            this.listLoading = false
+          })
       } else {
-        this.currentRow = { ...row };
-        this.statusVisible = true;
+        this.currentRow = { ...row }
+        this.statusVisible = true
       }
     },
     closeStatusDialog() {
-      this.statusVisible = false;
+      this.statusVisible = false
     },
     // 废除
     handleAbandon(row) {
-      this.$confirm(this.$t("trials:trials-list:message:abolition"), {
-        type: "warning",
-        distinguishCancelAndClose: true,
+      this.$confirm(this.$t('trials:trials-list:message:abolition'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
       })
         .then(() => {
-          this.currentRow = { ...row };
-          this.abandonTrial();
+          this.currentRow = { ...row }
+          this.abandonTrial()
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 废除项目
     abandonTrial() {
-      this.listLoading = true;
+      this.listLoading = true
       abandonTrial(this.currentRow.Id, true)
         .then((res) => {
-          this.listLoading = false;
+          this.listLoading = false
           if (res.IsSuccess) {
-            this.getList();
+            this.getList()
             this.$message.success(
-              this.$t("trials:trials-list:message:abolitionSuccessfully")
-            );
+              this.$t('trials:trials-list:message:abolitionSuccessfully')
+            )
           }
         })
         .catch(() => {
-          this.listLoading = false;
-        });
+          this.listLoading = false
+        })
     },
     rowClick(row, col) {
-      if (
-        (row.TrialStatusStr === "Initializing" &&
-          !this.hasPermi(["role:pm"])) ||
-        row.IsDeleted
-      )
-        return;
+      if ((row.TrialStatusStr === 'Initializing' && !this.hasPermi(['role:pm'])) || row.IsDeleted) {
+        return
+      } else if ((row.TrialStatusStr === 'Completed' || row.TrialStatusStr === 'Stopped') && !(this.hasPermi(['role:qa']) || this.hasPermi(['role:ea']) || this.hasPermi(['role:pm']))) {
+        return
+      }
       this.$router.push({
-        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
-      });
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`
+      })
     },
     // panel
     handleDetail(row) {
       this.$router.push({
-        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
-      });
+        path: `/trials/trials-panel?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`
+      })
     },
     // 获取已勾选行数据
     handleSelectChange(val) {
-      const arr = [];
+      const arr = []
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index]);
+        arr.push(val[index])
       }
-      this.selectArr = arr;
+      this.selectArr = arr
     },
     // 排序
     handleSortChange(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      if (column.prop === "Criterion") {
-        this.searchData.SortField = "CriterionId";
+      if (column.prop === 'Criterion') {
+        this.searchData.SortField = 'CriterionId'
       } else {
-        this.searchData.SortField = column.prop;
+        this.searchData.SortField = column.prop
       }
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 导出Excel表格
     handleExportTrial() {
-      this.exportLoading = true;
-      let data = {
-        ...this.searchData,
-      };
-      data.TrialIdList = this.selectArr.map((item) => item.Id);
+      this.exportLoading = true
+      const data = {
+        ...this.searchData
+      }
+      data.TrialIdList = this.selectArr.map((item) => item.Id)
       return getTrialList_Export(data)
         .then((res) => {
-          this.exportLoading = false;
+          this.exportLoading = false
         })
         .catch(() => {
-          this.exportLoading = false;
-        });
-      this.selectArr.forEach((element, index) => {
-        // element.ExpeditedStr = element.Expedited === 0 ? 'No' : element.Expedited === 1 ? '24H' : '48H'
-        // element.ModalityListStr = element.ModalityList.join(', ')
-        // element.CreateTimeStr = element.CreateTime
-        // element.Criterion = element.CriterionList.join(', ')
-        element.Deleted = element.IsDeleted ? "Yes" : "No";
-        element.Index = index + 1;
-      });
-      var workbook = new Excel.Workbook();
-      var sheet = workbook.addWorksheet("Trials");
-
-      sheet.properties.defaultRowHeight = 22;
-      // sheet.columns = [
-      //   { key: 'Index', width: 5 },
-      //   { key: 'Code', width: 15 },
-      //   { key: 'ExpeditedStr', width: 13 },
-      //   { key: 'TrialStatusStr', width: 10 },
-      //   { key: 'Indication', width: 25 },
-      //   { key: 'Phase', width: 10 },
-      //   { key: 'ReviewType', width: 20 },
-      //   { key: 'Criterion', width: 15 },
-      //   { key: 'ModalityListStr', width: 30 },
-      //   { key: 'CRO', width: 10 },
-      //   { key: 'Sponsor', width: 20 },
-      //   { key: 'CreateTimeStr', width: 18 }
-      // ]
-      sheet.columns = [
-        { key: "Index", width: 5 },
-        { key: "TrialCode", width: 25 },
-        { key: "ExperimentName", width: 25 },
-        { key: "ResearchProgramNo", width: 25 },
-        { key: "Sponsor", width: 25 },
-        { key: "Deleted", width: 10 },
-        { key: "CreateTime", width: 25 },
-      ];
-
-      // 处理标题
-      sheet.mergeCells("A1", "G2");
-      sheet.getCell("A1").value = "Trials";
-      sheet.getCell("A1").alignment = {
-        vertical: "middle",
-        horizontal: "center",
-      };
-      sheet.getCell("A1").font = {
-        name: "SimSun",
-        family: 4,
-        size: 13,
-        bold: true,
-      };
-      sheet.mergeCells("A3", "G3");
-      var now = new Date();
-      sheet.getCell("A3").value = now.toLocaleDateString();
-      sheet.getCell("A3").alignment = {
-        vertical: "middle",
-        horizontal: "right",
-      };
-
-      sheet.getRow(4).values = [
-        "NO.",
-        "Trial ID",
-        "试验名称",
-        "研究方案号",
-        "申办方",
-        "是否废除",
-        "Date Created",
-      ];
-      sheet.getRow(4).font = {
-        name: "SimSun",
-        family: 4,
-        size: 11,
-        bold: true,
-      };
-      sheet.getRow(4).alignment = { vertical: "middle", horizontal: "left" };
-
-      sheet.addRows(this.selectArr);
-
-      sheet.eachRow((row, number) => {
-        if (number > 3) {
-          row.eachCell((cell, rowNumber) => {
-            cell.alignment = { vertical: "center", horizontal: "left" };
-            cell.border = {
-              top: { style: "thin" },
-              left: { style: "thin" },
-              bottom: { style: "thin" },
-              right: { style: "thin" },
-            };
-          });
-        }
-      });
-
-      workbook.xlsx
-        .writeBuffer({
-          base64: true,
+          this.exportLoading = false
         })
-        .then(function (xls64) {
-          var data = new Blob([xls64], {
-            type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-          });
-
-          if ("msSaveOrOpenBlob" in navigator) {
-            // ie使用的下载方式
-            window.navigator.msSaveOrOpenBlob(data, "Trials" + ".xlsx");
-          } else {
-            var a = document.createElement("a");
-
-            var url = URL.createObjectURL(data);
-            a.href = url;
-            a.download = "Trials" + ".xlsx";
-            document.body.appendChild(a);
-            a.click();
-            setTimeout(function () {
-              document.body.removeChild(a);
-              window.URL.revokeObjectURL(url);
-            }, 0);
-          }
-        });
-    },
-  },
-};
+    }
+  }
+}
 </script>
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 82993883..bf5c9b35 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -3,14 +3,19 @@
     <div class="trial-myinfo-right-box">
       <div class="trial-myinfo-head">
         <!-- 账号信息 -->
-        {{ $t("trials:trials-myinfo:title:accountInfo") }}
+        {{ $t('trials:trials-myinfo:title:accountInfo') }}
       </div>
-      <el-form label-position="right" label-width="100px">
+      <el-form
+        label-position="right"
+        label-width="100px"
+        :rules="rule"
+        :model="userForm"
+        ref="userFormRef"
+      >
         <!-- 用户名 -->
         <el-form-item
           :label="$t('trials:trials-myinfo:form:userName')"
           style="margin-bottom: 5px"
-          prop="UserName"
         >
           <span>{{ user.UserName }}</span>
         </el-form-item>
@@ -27,18 +32,18 @@
             size="small"
             @click="setNewUserName"
           >
-            {{ $t("trials:trials-myinfo:button:update") }}
+            {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
         <!-- 电话 -->
         <el-form-item
           :label="$t('trials:trials-myinfo:form:phone')"
           style="margin-bottom: 5px"
-          prop="UserName"
+          prop="Phone"
         >
           <span>{{ user.Phone }}</span>
         </el-form-item>
-        <el-form-item label="" style="position: relative" prop="UserName">
+        <el-form-item label="" style="position: relative" prop="Phone">
           <el-input
             v-model="userForm.Phone"
             :placeholder="$t('trials:trials-myinfo:form:phone')"
@@ -51,14 +56,14 @@
             size="small"
             @click="setNewPhone"
           >
-            {{ $t("trials:trials-myinfo:button:update") }}
+            {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
         <!-- 邮箱 -->
         <el-form-item
           :label="$t('trials:trials-myinfo:form:email')"
           style="margin-bottom: 5px"
-          prop="UserName"
+          prop="EMail"
         >
           <span>{{ user.EMail }}</span>
         </el-form-item>
@@ -100,7 +105,7 @@
             size="small"
             @click="setNewEmail"
           >
-            {{ $t("trials:trials-myinfo:button:update") }}
+            {{ $t('trials:trials-myinfo:button:update') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -114,19 +119,19 @@ import {
   setNewEmail,
   setNewPhone,
   setNewUserName,
-} from "@/api/system/user.js";
-import { removeToken } from "@/utils/auth";
-import password from "./password.vue";
-var timer = "";
-var countdown = 60;
+} from '@/api/system/user.js'
+import { removeToken } from '@/utils/auth'
+import password from './password.vue'
+var timer = ''
+var countdown = 60
 export default {
-  name: "account",
+  name: 'account',
   components: { password },
   props: {
     user: {
       required: true,
       default: () => {
-        return {};
+        return {}
       },
     },
     IsCanConnectInternet: {
@@ -138,108 +143,138 @@ export default {
     return {
       userForm: {},
       sendDisabled: true,
-      sendTitle: this.$t("trials:trials-myinfo:button:getVCode"),
-    };
+      sendTitle: this.$t('trials:trials-myinfo:button:getVCode'),
+      rule: {
+        UserName: [
+          {
+            validator: (rule, value, callback) => {
+              if (!value) return callback()
+              var lang = zzSessionStorage.getItem('lang')
+                ? zzSessionStorage.getItem('lang')
+                : 'zh'
+              /* eslint-disable */
+              var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
+              if (!reg1.test(value)) {
+                callback(
+                  lang === 'zh'
+                    ? new Error(
+                        '1）用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                      )
+                    : new Error(
+                        'the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                      )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+      },
+    }
   },
   methods: {
     setNewEmail() {
       setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(
         () => {
-          this.userForm.EMail = "";
-          this.userForm.VerificationCode = "";
+          this.userForm.EMail = ''
+          this.userForm.VerificationCode = ''
           this.$message.success(
-            this.$t("trials:trials-myinfo:message:updateSuccessfully")
-          );
-          this.$emit("getUserInfo");
+            this.$t('trials:trials-myinfo:message:updateSuccessfully')
+          )
+          this.$emit('getUserInfo')
         }
-      );
+      )
     },
     async setNewUserName() {
       try {
+        let validate = await this.$refs.userFormRef.validate()
+        if (!validate) return false
         let confirm = await this.$confirm(
-          this.$t("trials:trials-myInfo:confirmMessage:updateUserName"),
+          this.$t('trials:trials-myInfo:confirmMessage:updateUserName'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
-            cancelButtonText: this.$t("common:button:cancel"),
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
           }
-        );
-        if (confirm !== "confirm") return;
-        let res = await setNewUserName(this.userForm.UserName);
+        )
+        if (confirm !== 'confirm') return
+        let res = await setNewUserName(this.userForm.UserName)
         if (res.IsSuccess) {
-          this.userForm.UserName = "";
+          this.userForm.UserName = ''
           this.$message.success(
-            this.$t("trials:trials-myinfo:message:updateSuccessfully")
-          );
-          this.$emit("getUserInfo");
-          removeToken();
-          this.logout();
+            this.$t('trials:trials-myinfo:message:updateSuccessfully')
+          )
+          this.$emit('getUserInfo')
+          removeToken()
+          this.logout()
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     setNewPhone() {
       setNewPhone(this.userForm.Phone).then(() => {
-        this.userForm.Phone = "";
+        this.userForm.Phone = ''
         this.$message.success(
-          this.$t("trials:trials-myinfo:message:updateSuccessfully")
-        );
-        this.$emit("getUserInfo");
-      });
+          this.$t('trials:trials-myinfo:message:updateSuccessfully')
+        )
+        this.$emit('getUserInfo')
+      })
     },
     handleEmailChange() {
       var reg =
-        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/;
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
       if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
-        this.sendDisabled = false;
+        this.sendDisabled = false
       } else {
-        this.sendDisabled = true;
+        this.sendDisabled = true
       }
     },
     sendVerificationCode() {
       sendVerificationCode(this.userForm.EMail).then(() => {
-        this.settime(this);
+        this.settime(this)
         // 发送成功
         this.$message.success(
-          this.$t("trials:trials-myinfo:message:sendSuccessfully")
-        );
-      });
+          this.$t('trials:trials-myinfo:message:sendSuccessfully')
+        )
+      })
     },
     settime(obj) {
       if (countdown === 0) {
-        obj.sendDisabled = false;
-        obj.sendTitle = this.$t("trials:trials-myinfo:button:getVCode"); // '获取验证码'
-        countdown = 60;
-        clearTimeout(timer);
-        return;
+        obj.sendDisabled = false
+        obj.sendTitle = this.$t('trials:trials-myinfo:button:getVCode') // '获取验证码'
+        countdown = 60
+        clearTimeout(timer)
+        return
       } else {
-        obj.sendDisabled = true;
+        obj.sendDisabled = true
         obj.sendTitle = `${this.$t(
-          "trials:trials-myinfo:button:wait"
-        )}(${countdown}s)`;
-        countdown--;
+          'trials:trials-myinfo:button:wait'
+        )}(${countdown}s)`
+        countdown--
         // eslint-disable-next-line no-self-assign
-        countdown = countdown;
+        countdown = countdown
         timer = setTimeout(function () {
-          obj.settime(obj);
-        }, 1000);
+          obj.settime(obj)
+        }, 1000)
       }
     },
     async logout() {
       /* eslint-disable */
-      var loginType = zzSessionStorage.getItem("loginType");
-      await this.$store.dispatch("user/logout");
+      var loginType = zzSessionStorage.getItem('loginType')
+      await this.$store.dispatch('user/logout')
       if (loginType) {
-        this.$router.push(`/login?loginType=${loginType}`);
+        this.$router.push(`/login?loginType=${loginType}`)
       } else {
-        this.$router.push(`/login`);
+        this.$router.push(`/login`)
       }
-      this.$i18n.locale = "zh";
-      this.setLanguage("zh");
-      this.$updateDictionary();
+      this.$i18n.locale = 'zh'
+      this.setLanguage('zh')
+      this.$updateDictionary()
     },
   },
-};
+}
 </script>
\ No newline at end of file
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index 28a4956c..8779f816 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -2,7 +2,7 @@
   <div class="trial-myinfo-right-box">
     <div class="trial-myinfo-head">
       <!-- 修改密码 -->
-      {{ $t("trials:trials-myinfo:title:updatePaasord") }}
+      {{ $t('trials:trials-myinfo:title:updatePaasord') }}
     </div>
     <el-form
       ref="passwordForm"
@@ -52,17 +52,17 @@
       </el-form-item>
     </el-form>
     <el-button type="primary" size="small" class="trial-info-btn" @click="save">
-      {{ $t("trials:trials-myinfo:button:save") }}
+      {{ $t('trials:trials-myinfo:button:save') }}
     </el-button>
   </div>
 </template>
 <script>
-import md5 from "js-md5";
-import { mapGetters, mapMutations } from "vuex";
-import { modifyPassword } from "@/api/admin.js";
-import { removeToken } from "@/utils/auth";
+import md5 from 'js-md5'
+import { mapGetters, mapMutations } from 'vuex'
+import { modifyPassword } from '@/api/admin.js'
+import { removeToken } from '@/utils/auth'
 export default {
-  name: "password",
+  name: 'password',
   data() {
     return {
       password: {},
@@ -70,91 +70,96 @@ export default {
         OldPassWord: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
         ],
         NewPassWord: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             required: true,
-            trigger: "blur",
+            trigger: 'blur',
             validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             required: true,
-            trigger: "blur",
+            trigger: 'blur',
             validator: this.$validatePassword,
           },
         ],
       },
-    };
+    }
   },
   computed: {
-    ...mapGetters(["userId"]),
+    ...mapGetters(['userId']),
   },
   methods: {
-    ...mapMutations({ setLanguage: "lang/setLanguage" }),
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     async save() {
       try {
-        let validate = await this.$refs.passwordForm.validate();
-        if (!validate) return;
+        let validate = await this.$refs.passwordForm.validate()
+        if (!validate) return
         if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
-          this.$alert(this.$t("passwordReset:formRule:passwordsDiffer"));
-          return;
+          this.$alert(this.$t('passwordReset:formRule:passwordsDiffer'))
+          return
         }
         let confirm = await this.$confirm(
-          this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"),
+          this.$t('trials:trials-myInfo:confirmMessage:updatePassWord'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
-            cancelButtonText: this.$t("common:button:cancel"),
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
           }
-        );
-        if (confirm !== "confirm") return;
+        )
+        if (confirm !== 'confirm') return
         const param = {
           UserId: this.userId,
           NewPassWord: md5(this.password.NewPassWord),
           OldPassWord: md5(this.password.OldPassWord),
-        };
-        let res = await modifyPassword(param);
+        }
+        let res = await modifyPassword(param)
         if (res.IsSuccess) {
           // 修改成功,请重新登录账号
           this.$message.success(
-            this.$t("trials:trials-myinfo:message:modifyPWSuccessfully")
-          );
-          removeToken();
-          this.logout();
+            this.$t('trials:trials-myinfo:message:modifyPWSuccessfully')
+          )
+          removeToken()
+          this.logout()
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     async logout() {
       /* eslint-disable */
-      var loginType = zzSessionStorage.getItem("loginType");
-      await this.$store.dispatch("user/logout");
+      var loginType = zzSessionStorage.getItem('loginType')
+      await this.$store.dispatch('user/logout')
       if (loginType) {
-        this.$router.push(`/login?loginType=${loginType}`);
+        this.$router.push(`/login?loginType=${loginType}`)
       } else {
-        this.$router.push(`/login`);
+        this.$router.push(`/login`)
       }
-      this.$i18n.locale = "zh";
-      this.setLanguage("zh");
-      this.$updateDictionary();
+      this.$i18n.locale = 'zh'
+      this.setLanguage('zh')
+      this.$updateDictionary()
     },
   },
-};
-</script>
\ No newline at end of file
+}
+</script>
+<style lang="scss" scoped>
+.el-form-item {
+  margin-bottom: 30px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
index 2f4be8d8..a29f1082 100644
--- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue
+++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:signRecords:table:fileType')">
-          <el-select v-model="searchData.FileTypeId" style="width: 150px">
+          <el-select v-model="searchData.FileTypeId" clearable style="width: 150px">
             <el-option
               v-for="item of typeOptions"
               :key="item.FileTypeId"
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/components/SignForm.vue b/src/views/trials/trials-panel/attachments/self-attachment/components/SignForm.vue
index 1aff22d1..4274239c 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/components/SignForm.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/components/SignForm.vue
@@ -1,19 +1,22 @@
 <template>
   <div v-loading="loading" class="sign-form-wrapper">
     <div class="sign-form-body">
-      <h4 v-if="signText" style="color:red">*{{ signText }}</h4>
+      <h4 v-if="signText" style="color: red">*{{ signText }}</h4>
       <el-form
         ref="signForm"
         :model="signForm"
         size="small"
         label-width="100px"
       >
-
         <el-form-item
           :label="$t('common:form:sign:userName')"
           prop="UserName"
           :rules="[
-            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+            {
+              required: true,
+              message: $t('common:ruleMessage:specify'),
+              trigger: 'blur',
+            },
           ]"
         >
           <el-input v-model="signForm.UserName" />
@@ -22,18 +25,36 @@
           :label="$t('common:form:sign:password')"
           prop="Password"
           :rules="[
-            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+            {
+              required: true,
+              message: $t('common:ruleMessage:specify'),
+              trigger: 'blur',
+            },
           ]"
         >
-          <el-input v-model="signForm.Password" show-password auto-complete="new-password" />
+          <el-input
+            v-model="signForm.Password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
       </el-form>
     </div>
     <div slot="footer" class="dialog-footer sign-form-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleclose">
+      <el-button
+        :disabled="btnLoading"
+        size="small"
+        type="primary"
+        @click="handleclose"
+      >
         {{ $t('common:button:cancel') }}
       </el-button>
-      <el-button :loading="btnLoading" size="small" type="primary" @click="userConfirm">
+      <el-button
+        :loading="btnLoading"
+        size="small"
+        type="primary"
+        @click="userConfirm"
+      >
         {{ $t('common:button:sign') }}
       </el-button>
     </div>
@@ -49,48 +70,54 @@ export default {
   props: {
     fileName: {
       type: String,
-      required: true
+      required: true,
     },
     isSystemDoc: {
       type: Boolean,
-      required: true
+      required: true,
     },
     documentId: {
       type: String,
-      required: true
+      required: true,
     },
     trialId: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
   },
   data() {
     return {
       signForm: {
         UserName: '',
-        Password: ''
+        Password: '',
       },
       signText: '',
       btnLoading: false,
-      loading: false
+      loading: false,
     }
   },
   mounted() {
     this.loading = true
-    getSystemBasicData(attachmentSignCode).then(res => {
-      var text
-      if (this.$i18n.locale === 'zh') {
-        text = res.Result.ValueCN
-      } else {
-        text = res.Result.Value
-      }
-      this.signText = text.replace('xxx', this.fileName)
-      this.loading = false
-    }).catch(() => { this.loading = false })
+    getSystemBasicData(attachmentSignCode)
+      .then((res) => {
+        var text
+        if (this.$i18n.locale === 'zh') {
+          text = res.Result.ValueCN
+        } else {
+          text = res.Result.Value
+        }
+        this.signText = text.replace('xxx', this.fileName)
+        this.loading = false
+      })
+      .catch(() => {
+        this.loading = false
+      })
   },
   methods: {
     userConfirm() {
-      const currentUser = zzSessionStorage.getItem('userName').toLocaleLowerCase()
+      const currentUser = zzSessionStorage
+        .getItem('userName')
+        .toLocaleLowerCase()
       this.$refs.signForm.validate((valid) => {
         console.log(valid)
         if (!valid) return
@@ -102,44 +129,52 @@ export default {
         this.btnLoading = true
         var params = {
           data: {
-            trialId: this.trialId,
+            // trialId: this.trialId,
             documentId: this.documentId,
-            isSystemDoc: this.isSystemDoc
+            isSystemDoc: this.isSystemDoc,
           },
           signInfo: {
             UserName: this.signForm.UserName,
             PassWord: md5(this.signForm.Password),
-            TrialId: this.trialId,
+            // c: this.trialId,
             SignCode: '',
             SignText: this.signText,
             SignCodeId: '',
-            SubjectVisitId: ''
-          }
+            SubjectVisitId: '',
+          },
         }
-        userConfirm(params).then(res => {
-          if (res.IsSuccess) {
-            // 签名成功！
-            this.$message.success(this.$t('common:message:signSuccessfully'))
-            this.$emit('closeDialog', true)
-          }
-        }).catch(() => { this.btnLoading = false })
+        if (!this.isSystemDoc) {
+          params.data.TrialId = this.trialId
+          params.signInfo.TrialId = this.trialId
+        }
+        userConfirm(params)
+          .then((res) => {
+            if (res.IsSuccess) {
+              // 签名成功！
+              this.$message.success(this.$t('common:message:signSuccessfully'))
+              this.$emit('closeDialog', true)
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false
+          })
       })
     },
     handleclose() {
       this.$emit('closeDialog', false)
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.sign-form-wrapper{
-  .sign-form-body{
-    padding:10px;
+.sign-form-wrapper {
+  .sign-form-body {
+    padding: 10px;
     border: 1px solid #e0e0e0;
-    max-height:650px;
+    max-height: 650px;
     overflow-y: auto;
   }
-  .sign-form-footer{
+  .sign-form-footer {
     margin-top: 10px;
     text-align: right;
   }
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index d9ecc360..4539d256 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -7,6 +7,7 @@
         <el-form-item :label="$t('trials:self-attachment:table:fileType')">
           <el-select
             v-model="searchData.FileTypeId"
+            clearable
             style="width:150px;"
           >
             <el-option
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 056fd35e..4a776f3e 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -15,7 +15,7 @@
       <el-table
         ref="myTable"
         v-loading="listLoading"
-        v-adaptive="{bottomOffset:55}"
+        v-adaptive="{ bottomOffset: 55 }"
         :data="list"
         stripe
         height="100"
@@ -32,7 +32,15 @@
           v-if="!hasPermi(['role:ea'])"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <el-button
+              type="text"
+              @click="
+                go(
+                  `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
+                )
+              "
+              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button
+            >
           </template>
         </el-table-column>
         <!-- Name CN -->
@@ -48,7 +56,7 @@
         <el-table-column
           prop="UserName"
           :label="$t('trials:enrolledReviews:table:userName')"
-          :width="hasPermi(['role:ea'])?300:150"
+          :width="hasPermi(['role:ea']) ? 300 : 150"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -56,12 +64,16 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          :width="hasPermi(['role:ea'])?320:130"
+          :width="hasPermi(['role:ea']) ? 320 : 130"
           sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-             {{ scope.row.EnrollTime?moment(scope.row.EnrollTime).format('YYYY-MM-DD'):'' }}
+            {{
+              scope.row.EnrollTime
+                ? moment(scope.row.EnrollTime).format('YYYY-MM-DD')
+                : ''
+            }}
           </template>
         </el-table-column>
         <el-table-column
@@ -78,8 +90,16 @@
                 :inactive-value="false"
                 :active-text="$fd('IsEnable', true)"
                 :inactive-text="$fd('IsEnable', false)"
-                @change="(v) => {return isEnableChange(scope.row, v)}"
-                :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
+                @change="
+                  (v) => {
+                    return isEnableChange(scope.row, v)
+                  }
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
               />
               <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
             </div>
@@ -98,16 +118,46 @@
             width="300"
           >
             <template slot-scope="scope">
-                <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId" style="margin:5px 5px 5px 0;">
-                  <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
-                  <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
-                  <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
-                  <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-                </span>
-                <el-button
-                v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
+              <span
+                v-for="item of scope.row.CriterionCategoryList.find((v) => {
+                  return (
+                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                  )
+                })
+                  ? scope.row.CriterionCategoryList.find((v) => {
+                      return (
+                        v.TrialReadingCriterionId ===
+                        ite.TrialReadingCriterionId
+                      )
+                    }).ReadingCategorys
+                  : []"
+                :key="item.TrialReadingCriterionId"
+                style="margin: 5px 5px 5px 0"
+              >
+                <el-tag v-if="item === 1" type="primary">{{
+                  $fd('ReadingCategory', item) +
+                  ' & ' +
+                  $fd('ReadingCategory', 2)
+                }}</el-tag>
+                <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
+                <el-tag v-if="item === 4" type="danger">{{
+                  $fd('ReadingCategory', item)
+                }}</el-tag>
+                <el-tag v-if="item === 5" type="warning">{{
+                  $fd('ReadingCategory', item)
+                }}</el-tag>
+              </span>
+              <el-button
+                v-hasPermi="[
+                  'trials:trials-panel:enrolled-reviewers:list:edit',
+                ]"
                 type="text"
-                @click="openSetEnrollReadingCategory(scope.row, ite.TrialReadingCriterionId)"
+                @click="
+                  openSetEnrollReadingCategory(
+                    scope.row,
+                    ite.TrialReadingCriterionId
+                  )
+                "
               >
                 {{ $t('trials:enrolledReviews:button:config') }}
               </el-button>
@@ -120,13 +170,27 @@
           >
             <template slot-scope="scope">
               <el-switch
-                v-model="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"
+                v-model="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).IsJoinAnalysis
+                "
                 :active-value="true"
                 :inactive-value="false"
                 :active-text="$fd('YesOrNo', true)"
                 :inactive-text="$fd('YesOrNo', false)"
-                @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
-                :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
+                @change="
+                  (v) => {
+                    return isConsistencyChange(scope.row, ite, v, true)
+                  }
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
               />
               <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
               <span v-else> {{$fd('YesOrNo',false)}}</span> -->
@@ -138,8 +202,20 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList.length > 0">
-                <el-button type="text" @click="preview(scope.row,ite.TrialReadingCriterionId)">View</el-button>
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).StatementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                  >View</el-button
+                >
                 <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
               </div>
               <div v-else>
@@ -147,10 +223,19 @@
                 <!-- 上传 -->
                 <el-button
                   v-if="ite.CriterionType === 0"
-                  v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
                   type="text"
                   style="margin-left: 10px"
-                  @click="addCol(0, scope.row, ite, $t('trials:enrolledReviews:message:SOW'))"
+                  @click="
+                    addCol(
+                      0,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
                 >
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
@@ -163,18 +248,40 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).AcknowledgementCriterionFileList.length > 0">
-                <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).AcknowledgementCriterionFileList[0].FilePath)">View</el-button>
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).AcknowledgementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                >
+                  View
+                </el-button>
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                 <!-- 上传 -->
                 <el-button
                   v-if="ite.CriterionType === 0"
-                  v-hasPermi="['trials:trials-panel:enrolled-reviewers:list:edit']"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
                   type="text"
                   style="margin-left: 10px"
-                  @click="addCol(1, scope.row, ite, $t('trials:enrolledReviews:message:SOW'))"
+                  @click="
+                    addCol(
+                      1,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
                 >
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
@@ -188,30 +295,47 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).PendingCount }}
+                {{
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).PendingCount
+                }}
                 /
-                {{ scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ComplectedCount }}
+                {{
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).ComplectedCount
+                }}
                 /
-                {{ scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).TotalCount }}
+                {{
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).TotalCount
+                }}
               </div>
             </template>
           </el-table-column>
         </el-table-column>
-
       </el-table>
     </template>
 
     <!-- 上传SOW -->
-<!--    <base-model :config="sow_model">-->
-<!--      <template slot="dialog-body">-->
-<!--        <upload-acksow-->
-<!--          ref="uploadAckSow"-->
-<!--          :trial-id="listQuery.TrialId"-->
-<!--          :doctor-id="doctorId"-->
-<!--          @getFileList="getFileList"-->
-<!--        />-->
-<!--      </template>-->
-<!--    </base-model>-->
+    <!--    <base-model :config="sow_model">-->
+    <!--      <template slot="dialog-body">-->
+    <!--        <upload-acksow-->
+    <!--          ref="uploadAckSow"-->
+    <!--          :trial-id="listQuery.TrialId"-->
+    <!--          :doctor-id="doctorId"-->
+    <!--          @getFileList="getFileList"-->
+    <!--        />-->
+    <!--      </template>-->
+    <!--    </base-model>-->
 
     <!-- 修改 Reading Type -->
     <base-model :config="readingType_model">
@@ -258,25 +382,42 @@
           allow-create
           multiple
           default-first-option
-          style="width: 50%;"
+          style="width: 50%"
         >
           <template v-for="item of $d.ReadingCategory">
-            <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
+            <el-option
+              v-if="item.value === 1"
+              :key="item.id"
+              :value="1"
+              :label="
+                $fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
+              "
+            />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option  v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
+            <el-option
+              v-if="item.value === 4 && IsArbitrationReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 4)"
+            />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option  v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+            <el-option
+              v-if="item.value === 5 && IsOncologyReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 5)"
+            />
           </template>
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <div style="margin-top:30px;">
+        <div style="margin-top: 30px">
           <el-button
-          :disabled="readingCategory_model.btnLoading"
-          type="primary"
-          @click="readingCategory_model.visible = false"
+            :disabled="readingCategory_model.btnLoading"
+            type="primary"
+            @click="readingCategory_model.visible = false"
           >
             {{ $t('common:button:cancel') }}
           </el-button>
@@ -298,17 +439,23 @@
           :model="updateStatusForm"
           :rules="updateStatusFormrules"
         >
-          <el-form-item :label="$t('trials:enrolledReviews:label:enrollmentStatus')" prop="Status">
-            <el-select
-              v-model="updateStatusForm.Status"
-              style="width:60%;"
-            >
+          <el-form-item
+            :label="$t('trials:enrolledReviews:label:enrollmentStatus')"
+            prop="Status"
+          >
+            <el-select v-model="updateStatusForm.Status" style="width: 60%">
               <!-- 0：回退；1：出组； -->
-              <el-option v-for="item of $d.OutOrInEnrollment" :key="`OutOrInEnrollment${item.value}`" :value="item.value" :label="item.label" :disabled="item.value === 0 && currentWorkload>0" />
+              <el-option
+                v-for="item of $d.OutOrInEnrollment"
+                :key="`OutOrInEnrollment${item.value}`"
+                :value="item.value"
+                :label="item.label"
+                :disabled="item.value === 0 && currentWorkload > 0"
+              />
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="updateStatusForm.Status== 1"
+            v-if="updateStatusForm.Status == 1"
             :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')"
             prop="OutEnrollmentTime"
           >
@@ -346,10 +493,16 @@
           label-width="120px"
           size="small"
         >
-          <el-form-item :label="$t('trials:enrolledReviews:table:criterionName')" prop="CriterionType">
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:criterionName')"
+            prop="CriterionType"
+          >
             <el-input v-model="form.CriterionName" disabled />
           </el-form-item>
-          <el-form-item :label="$t('trials:enrolledReviews:table:file')" prop="FilePath">
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:file')"
+            prop="FilePath"
+          >
             <el-upload
               class="upload-demo"
               action
@@ -358,19 +511,35 @@
               :on-preview="handlePreview2"
               :on-remove="handleRemoveFile2"
               :show-file-list="true"
+              accept=".pdf"
               :limit="1"
               :file-list="fileList"
             >
-              <el-button size="small" type="primary" :disabled="fileList.length > 0">{{$t('common:button:upload')}}</el-button>
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t('common:button:upload') }}</el-button
+              >
             </el-upload>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancle"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+        >
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -384,7 +553,7 @@ import {
   updateReviewerReadingType,
   enrollBackOrOut,
   setEnrollReadingCategory,
-  batchSetCriterionJoinJoinAnalysis
+  batchSetCriterionJoinJoinAnalysis,
 } from '@/api/trials'
 import { addDoctorCriterionFile } from '@/api/reviewers'
 import { uploadFile } from '@/api/attachment'
@@ -405,7 +574,7 @@ export default {
         PageIndex: 1,
         PageSize: 100,
         Asc: false,
-        SortField: ''
+        SortField: '',
       },
       doctorId: '',
       currentRow: {},
@@ -415,41 +584,59 @@ export default {
       currentClickRowData: '',
       btnLoading: false,
       readingType: '',
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '600px',
+        title: '',
+        appendToBody: true,
+      },
       sow_model: {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:signedAckOfSow'),
         showClose: true,
-        width: '500px'
+        width: '500px',
       },
       readingType_model: {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
         width: '500px',
-        btnLoading: false
+        btnLoading: false,
       },
       readingCategory_model: {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeReadingType'),
         showClose: true,
         width: '600px',
-        btnLoading: false
+        btnLoading: false,
       },
       reviewerStatus_model: {
         visible: false,
         title: this.$t('trials:enrolledReviews:dialogTitle:changeStatus'),
         showClose: true,
         width: '500px',
-        btnLoading: false
+        btnLoading: false,
       },
       updateStatusForm: {
         Status: '',
-        OutEnrollmentTime: ''
+        OutEnrollmentTime: '',
       },
       updateStatusFormrules: {
-        Status: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        OutEnrollmentTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }]
+        Status: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
+        OutEnrollmentTime: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
       },
       token: store.getters.token,
       ReadingCategorys: [],
@@ -460,15 +647,25 @@ export default {
       fileList: [],
       form: {},
       rowData: {},
-      moment
+      moment,
     }
   },
   computed: {
     currentWorkload() {
       if (Object.keys(this.currentRow).length === 0) return 0
-      var total = this.currentRow.Adjudication + this.currentRow.AdjudicationIn24H + this.currentRow.AdjudicationIn48H + this.currentRow.Timepoint + this.currentRow.TimepointIn24H + this.currentRow.TimepointIn48H + this.currentRow.TrainingTimes + this.currentRow.RefresherTraining + this.currentRow.Global + this.currentRow.Downtime
+      var total =
+        this.currentRow.Adjudication +
+        this.currentRow.AdjudicationIn24H +
+        this.currentRow.AdjudicationIn48H +
+        this.currentRow.Timepoint +
+        this.currentRow.TimepointIn24H +
+        this.currentRow.TimepointIn48H +
+        this.currentRow.TrainingTimes +
+        this.currentRow.RefresherTraining +
+        this.currentRow.Global +
+        this.currentRow.Downtime
       return total
-    }
+    },
   },
   mounted() {
     this.trialId = this.$route.query.trialCode
@@ -477,14 +674,16 @@ export default {
   },
   methods: {
     // 预览
-    preview(row,TrialReadingCriterionId){
-      let file = row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === TrialReadingCriterionId}).StatementCriterionFileList[0];
-      let arr = file.FilePath.split(".");
+    preview(row, TrialReadingCriterionId) {
+      let file = row.CriterionCategoryList.find((v) => {
+        return v.TrialReadingCriterionId === TrialReadingCriterionId
+      }).StatementCriterionFileList[0]
+      let arr = file.FilePath.split('.')
 
       this.$preview({
-        path:file.FilePath, 
-        type:arr[arr.length - 1], 
-        title:file.FileName
+        path: file.FilePath,
+        type: arr[arr.length - 1],
+        title: file.FileName,
       })
     },
     isConsistencyChange(row, ite, value, showMessage) {
@@ -492,39 +691,50 @@ export default {
     },
     batchSetCriterionJoinJoinAnalysis(row, ite, value, showMessage) {
       let params
-      if (row.DoctorCriterionStatusList && row.DoctorCriterionStatusList.length > 0) {
+      if (
+        row.DoctorCriterionStatusList &&
+        row.DoctorCriterionStatusList.length > 0
+      ) {
         if (ite) {
-          let item = row.CriterionCategoryList.find(v => v.TrialReadingCriterionId === ite.TrialReadingCriterionId)
+          let item = row.CriterionCategoryList.find(
+            (v) => v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+          )
           if (item) {
-            params = [{
-              Id: item.Id,
-              EnrollId: item.EnrollId,
-              TrialReadingCriterionId: item.TrialReadingCriterionId,
-              IsJoinAnalysis: value
-            }]
+            params = [
+              {
+                Id: item.Id,
+                EnrollId: item.EnrollId,
+                TrialReadingCriterionId: item.TrialReadingCriterionId,
+                IsJoinAnalysis: value,
+              },
+            ]
           }
         } else {
-          params = row.DoctorCriterionStatusList.map(v => {
+          params = row.DoctorCriterionStatusList.map((v) => {
             return {
               Id: v.Id,
               EnrollId: v.EnrollId,
               TrialReadingCriterionId: v.TrialReadingCriterionId,
-              IsJoinAnalysis: v.IsJoinAnalysis
+              IsJoinAnalysis: v.IsJoinAnalysis,
             }
           })
         }
       } else {
-        params = row.CriterionCategoryList.map(v => {
+        params = row.CriterionCategoryList.map((v) => {
           return {
             EnrollId: v.EnrollId,
             TrialReadingCriterionId: v.TrialReadingCriterionId,
-            IsJoinAnalysis: value
+            IsJoinAnalysis: value,
           }
         })
       }
-      batchSetCriterionJoinJoinAnalysis(params).then(res => {
+      batchSetCriterionJoinJoinAnalysis(params).then((res) => {
         if (showMessage) {
-          this.$message.success(this.$t('trials:enrolledReviews:message:batchSetCriterionJoinJoinAnalysis1'))
+          this.$message.success(
+            this.$t(
+              'trials:enrolledReviews:message:batchSetCriterionJoinJoinAnalysis1'
+            )
+          )
         }
         this.initPage()
       })
@@ -532,17 +742,25 @@ export default {
     go(path) {
       window.open(path)
     },
-    beforeUpload() {
+    beforeUpload(file) {
       if (this.fileList.length > 0) {
         // 只允许上传1个文件
         this.$alert(this.$t('trials:enrolledReviews:message:uploadSowWaring1'))
-        return
+        return false
+      }
+      const fileName = file.name
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.'))
+        .toLocaleLowerCase()
+      if (extendName !== '.pdf') {
+        this.$alert(this.$t('trials:enrolledReviews:message:uploadSowWaring2'))
+        return false
       }
     },
     handleSave() {
-      this.$refs['DictionaryTypeConfigForm'].validate(valid => {
+      this.$refs['DictionaryTypeConfigForm'].validate((valid) => {
         if (!valid) return
-        addDoctorCriterionFile(this.form).then(res => {
+        addDoctorCriterionFile(this.form).then((res) => {
           // 保存成功
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.initPage()
@@ -560,11 +778,19 @@ export default {
       this.btnLoading = true
       var fileName = param.file.name
       let file = await this.fileToBlob(param.file)
-      let res = await this.OSSclient.put(`/SystemData/reviewer/${this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'}/${this.rowData.DoctorId}/${fileName}`, file)
+      let res = await this.OSSclient.put(
+        `/SystemData/reviewer/${
+          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        }/${this.rowData.DoctorId}/${fileName}`,
+        file
+      )
       this.form.FileName = param.file.name
       this.form.FilePath = this.$getObjectName(res.url)
       param.file.url = this.$getObjectName(res.url)
-      this.$set(this.fileList, 0,  { name: this.form.FileName, url: this.$getObjectName(res.url) })
+      this.$set(this.fileList, 0, {
+        name: this.form.FileName,
+        url: this.$getObjectName(res.url),
+      })
       this.btnLoading = false
 
       // this.btnLoading = true
@@ -587,7 +813,7 @@ export default {
       this.fileList = []
     },
     addCol(fileType, row, item) {
-      this.rowData = {...row}
+      this.rowData = { ...row }
       this.model_cfg.visible = true
       this.form = {
         Remark: null,
@@ -599,10 +825,13 @@ export default {
         DoctorId: row.DoctorId,
         CriterionType: item.CriterionType,
         CriterionName: item.TrialReadingCriterionName,
-        TrialReadingCriterionId: item.TrialReadingCriterionId
+        TrialReadingCriterionId: item.TrialReadingCriterionId,
       }
       this.handleRemoveFile2()
-      this.model_cfg.title = fileType === 0 ? this.$t('trials:enrolledReviews:message:SOW') : this.$t('trials:enrolledReviews:message:EQC')// '既往阅片情况说明' : '入项资格确认书'
+      this.model_cfg.title =
+        fileType === 0
+          ? this.$t('trials:enrolledReviews:message:SOW')
+          : this.$t('trials:enrolledReviews:message:EQC') // '既往阅片情况说明' : '入项资格确认书'
     },
     windowOpen(url) {
       console.log(url)
@@ -614,14 +843,16 @@ export default {
       updateTrialReviewerState({
         TrialId: this.listQuery.TrialId,
         IsEnable: v,
-        EnrollId: row.EnrollId
-      }).then(res => {
-        // '保存成功'
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.listLoading = false
-      }).catch(() => {
-        this.listLoading = false
+        EnrollId: row.EnrollId,
       })
+        .then((res) => {
+          // '保存成功'
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.listLoading = false
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     handleUpdateReadingCategory() {
       this.readingCategory_model.btnLoading = true
@@ -630,19 +861,20 @@ export default {
         TrialId: this.$route.query.trialId,
         EnrollId: this.currentRow.EnrollId,
         ReadingCategorys: Object.assign([], this.ReadingCategorys),
-        TrialReadingCriterionId: this.TrialReadingCriterionId
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
       }
       if (~this.ReadingCategorys.indexOf(1)) {
         params.ReadingCategorys.push(2)
       }
       setEnrollReadingCategory(params)
-        .then(res => {
+        .then((res) => {
           this.readingCategory_model.visible = false
           this.readingCategory_model.btnLoading = false
           this.readingCategory_model.showClose = true
           this.initPage()
           this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(_ => {
+        })
+        .catch((_) => {
           this.readingCategory_model.btnLoading = false
           this.readingCategory_model.showClose = true
         })
@@ -653,16 +885,20 @@ export default {
       this.currentRow = row
       this.TrialReadingCriterionId = TrialReadingCriterionId
       this.readingCategory_model.visible = true
-      var o = row.CriterionCategoryList.find(v => {
+      var o = row.CriterionCategoryList.find((v) => {
         return v.TrialReadingCriterionId === TrialReadingCriterionId
-      }) ? row.CriterionCategoryList.find(v => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        }) : null
-      var i = row.TrialReadingCriterionList.find(v => {
+      })
+        ? row.CriterionCategoryList.find((v) => {
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
+        : null
+      var i = row.TrialReadingCriterionList.find((v) => {
         return v.TrialReadingCriterionId === TrialReadingCriterionId
-      }) ? row.TrialReadingCriterionList.find(v => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        }) : null
+      })
+        ? row.TrialReadingCriterionList.find((v) => {
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
+        : null
       if (i) {
         this.IsArbitrationReading = i.IsArbitrationReading
         this.IsOncologyReading = i.IsOncologyReading
@@ -678,48 +914,56 @@ export default {
     // 获取入组医生列表数据
     initPage() {
       this.listLoading = true
-      getTrialEnrollmentWorkloadStats(this.listQuery).then((res) => {
-        this.listLoading = false
-        let resArray = res.Result.CurrentPageData
-        try {
-          resArray.forEach(v => {
-            if (v.DoctorCriterionStatusList && v.DoctorCriterionStatusList.length === 0) {
-              this.isConsistencyChange(v, null,true, false)
-            }
-            v.CriterionCategoryList.forEach(v1 => {
-              let o = v.DoctorCriterionStatusList.find(v2 => {
-                return v2.TrialReadingCriterionId === v1.TrialReadingCriterionId
-              })
-              if (o) {
-                this.$set(v1, 'Id', o.Id)
-                this.$set(v1, 'IsJoinAnalysis', o.IsJoinAnalysis)
+      getTrialEnrollmentWorkloadStats(this.listQuery)
+        .then((res) => {
+          this.listLoading = false
+          let resArray = res.Result.CurrentPageData
+          try {
+            resArray.forEach((v) => {
+              if (
+                v.DoctorCriterionStatusList &&
+                v.DoctorCriterionStatusList.length === 0
+              ) {
+                this.isConsistencyChange(v, null, true, false)
               }
+              v.CriterionCategoryList.forEach((v1) => {
+                let o = v.DoctorCriterionStatusList.find((v2) => {
+                  return (
+                    v2.TrialReadingCriterionId === v1.TrialReadingCriterionId
+                  )
+                })
+                if (o) {
+                  this.$set(v1, 'Id', o.Id)
+                  this.$set(v1, 'IsJoinAnalysis', o.IsJoinAnalysis)
+                }
+              })
+              v.DoctorCriterionStatusList.push({})
             })
-            v.DoctorCriterionStatusList.push({})
-          })
-        } catch (e) {
-          console.log(e)
-        }
-        this.list = resArray
-        if (this.list.length > 0) {
-          this.TrialReadingCriterionList = this.list[0].TrialReadingCriterionList
-        }
-        this.total = res.Result.TotalCount
-        this.$nextTick(() => {
-          // myTable是表格的ref属性值
-          if (this.$refs.myTable && this.$refs.myTable.doLayout) {
-            this.$refs.myTable.doLayout()
+          } catch (e) {
+            console.log(e)
           }
+          this.list = resArray
+          if (this.list.length > 0) {
+            this.TrialReadingCriterionList =
+              this.list[0].TrialReadingCriterionList
+          }
+          this.total = res.Result.TotalCount
+          this.$nextTick(() => {
+            // myTable是表格的ref属性值
+            if (this.$refs.myTable && this.$refs.myTable.doLayout) {
+              this.$refs.myTable.doLayout()
+            }
+          })
+        })
+        .catch(() => {
+          this.listLoading = false
         })
-      }).catch(() => {
-        this.listLoading = false
-      })
     },
 
     // Enroll按钮回调
     handleEnroll() {
       this.$router.push({
-        path: `/trials/trials-panel/enrolled-reviewers/enroll?trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}`
+        path: `/trials/trials-panel/enrolled-reviewers/enroll?trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}`,
       })
     },
 
@@ -731,12 +975,16 @@ export default {
 
     // 更新医生状态信息
     handleUpdateReviewerStatus() {
-      this.$refs.updateStatusForm.validate(valid => {
+      this.$refs.updateStatusForm.validate((valid) => {
         if (!valid) return
         this.reviewerStatus_model.btnLoading = true
         this.reviewerStatus_model.showClose = false
-        enrollBackOrOut(this.listQuery.TrialId, this.currentRow.DoctorId, this.updateStatusForm.Status)
-          .then(res => {
+        enrollBackOrOut(
+          this.listQuery.TrialId,
+          this.currentRow.DoctorId,
+          this.updateStatusForm.Status
+        )
+          .then((res) => {
             this.$nextTick(() => {
               this.$refs['updateStatusForm'].resetFields()
             })
@@ -765,14 +1013,19 @@ export default {
     handleUpdateReadingType() {
       this.readingType_model.btnLoading = true
       this.readingType_model.showClose = false
-      updateReviewerReadingType(this.listQuery.TrialId, this.currentRow.DoctorId, this.readingType)
-        .then(res => {
+      updateReviewerReadingType(
+        this.listQuery.TrialId,
+        this.currentRow.DoctorId,
+        this.readingType
+      )
+        .then((res) => {
           this.readingType_model.visible = false
           this.readingType_model.btnLoading = false
           this.readingType_model.showClose = true
           this.initPage()
           this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(_ => {
+        })
+        .catch((_) => {
           this.readingType_model.btnLoading = false
           this.readingType_model.showClose = true
         })
@@ -791,17 +1044,15 @@ export default {
       this.initPage()
     },
 
-
-
     handleTipCloseOK() {
       zzSessionStorage.setItem(
         'ReviewerName',
         this.currentClickRowData.FirstName +
-        ' ' +
-        this.currentClickRowData.LastName
+          ' ' +
+          this.currentClickRowData.LastName
       )
       this.$router.push({
-        path: `/trials/trials-panel/enrolled-reviewers/stats?doctorId=${this.currentClickRowData.DoctorId}&trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}&doctorName=${this.currentClickRowData.LastName}/${this.currentClickRowData.FirstName}`
+        path: `/trials/trials-panel/enrolled-reviewers/stats?doctorId=${this.currentClickRowData.DoctorId}&trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}&doctorName=${this.currentClickRowData.LastName}/${this.currentClickRowData.FirstName}`,
       })
     },
 
@@ -827,18 +1078,18 @@ export default {
         }
       })
       return sums
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-  .enroll-list {
-    height: 100%;
-    .readingCategory_model{
-      .base-modal-body{
-        min-height: 150px;
-        padding-bottom: 30px !important;
-      }
+.enroll-list {
+  height: 100%;
+  .readingCategory_model {
+    .base-modal-body {
+      min-height: 150px;
+      padding-bottom: 30px !important;
     }
   }
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 5c32a23f..41902c29 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -54,8 +54,8 @@
             j.armEnum === 1
               ? $t('trials:adReview:table:viewR1')
               : j.armEnum === 2
-              ? $t('trials:adReview:table:viewR2')
-              : $fd('ArmEnum', j.armEnum)
+                ? $t('trials:adReview:table:viewR2')
+                : $fd('ArmEnum', j.armEnum)
           "
           align="center"
           prop=""
@@ -70,54 +70,21 @@
               width="150"
             >
               <template slot-scope="scope">
-                <div
-                  v-if="
-                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .QuestionType === 1
-                  "
-                >
-                  <span
-                    v-if="
-                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                        .DictionaryCode
-                    "
-                    >{{
-                      $fd(
-                        scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
-                          i
-                        ].DictionaryCode,
-                        parseInt(
-                          scope.row.VisitTaskInfoList[j.index]
-                            .JudgeQuestionList[i].Answer
-                        )
-                      )
-                    }}</span
-                  >
-                  <span v-else>{{
-                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .Answer
-                  }}</span>
+                <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType === 1">
+                  <span v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode">
+                    {{ $fd(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode,parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))
+                    }}
+                  </span>
+                  <span v-else>
+                    {{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}
+                  </span>
+                  <span v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit && !isNaN(parseFloat(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))">{{ $fd('ValueUnit', parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit)) }}</span>
                 </div>
-                <div
-                  v-else-if="
-                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .QuestionType === 2
-                  "
-                >
-                  <div
-                    v-if="
-                      scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                        .Answer
-                    "
-                  >
-                    <span>{{
-                      $fd(
-                        "YesOrNo",
-                        scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
-                          i
-                        ].Answer
-                      )
-                    }}</span>
+                <div v-else-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType === 2">
+                  <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer">
+                    <span>
+                      {{ $fd("YesOrNo",scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer) }}
+                    </span>
                     <!-- 查看详情 -->
                     <el-button
                       type="text"
@@ -144,10 +111,7 @@
                   </div>
                 </div>
                 <div v-else>
-                  {{
-                    scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
-                      .Answer
-                  }}
+                  {{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}
                 </div>
               </template>
             </el-table-column>
@@ -321,7 +285,7 @@
                   alt=""
                   crossorigin="anonymous"
                   style="max-width: 100%; max-height: 100%"
-                />
+                >
                 <span class="el-upload-list__item-actions">
                   <span
                     class="el-upload-list__item-preview"
@@ -435,88 +399,87 @@ import {
   // uploadJudgeTaskImage,
   saveJudgeVisitTaskResult,
   submitJudgeVisitTaskResult,
-  getReadingPastResultList,
-} from "@/api/trials";
-import { getAutoCutNextTask } from "@/api/user";
-import { setSkipReadingCache } from "@/api/reading";
-import const_ from "@/const/sign-code";
-import { getToken } from "@/utils/auth";
-import SignForm from "@/views/trials/components/newSignForm";
-import DicomEvent from "@/views/trials/trials-panel/reading/dicoms/components/DicomEvent";
+  getReadingPastResultList
+} from '@/api/trials'
+import { getAutoCutNextTask } from '@/api/user'
+import { setSkipReadingCache } from '@/api/reading'
+import const_ from '@/const/sign-code'
+import { getToken } from '@/utils/auth'
+import SignForm from '@/views/trials/components/newSignForm'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 // import store from '@/store'
-import { changeURLStatic } from "@/utils/history.js";
-import Viewer from "v-viewer";
+import { changeURLStatic } from '@/utils/history.js'
 export default {
-  name: "AdReview",
+  name: 'AdReview',
   components: { SignForm },
   props: {
     trialId: {
       type: String,
-      required: true,
+      required: true
     },
     subjectId: {
       type: String,
-      required: true,
+      required: true
     },
     visitTaskId: {
       type: String,
-      required: true,
+      required: true
     },
     readingCategory: {
       type: Number,
-      required: true,
+      required: true
     },
     subjectCode: {
       type: String,
-      required: true,
+      required: true
     },
     taskBlindName: {
       type: String,
-      required: true,
+      required: true
     },
     isReadingShowSubjectInfo: {
       type: Boolean,
-      required: true,
+      required: true
     },
     isReadingShowPreviousResults: {
       type: Boolean,
-      required: true,
+      required: true
     },
     isExistsClinicalData: {
       type: Boolean,
-      required: true,
-    },
+      required: true
+    }
   },
   data() {
     return {
       adInfo: {},
       judgeQuestion: [],
       adForm: {
-        visitTaskId: "",
-        judgeResultTaskId: "",
-        judgeResultRemark: "",
+        visitTaskId: '',
+        judgeResultTaskId: '',
+        judgeResultRemark: '',
         // judgeResultImagePath: ''
-        judgeResultImagePathList: [],
+        judgeResultImagePathList: []
       },
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       signVisible: false,
       signCode: null,
-      accept: ".png,.jpg,.jpeg",
+      accept: '.png,.jpg,.jpeg',
       imgVisible: false,
-      imageUrl: "",
+      imageUrl: '',
       uploadDisabled: false,
       fileList: [],
       loading: false,
       visitTaskArmList: [],
       priorADList: [],
       priorLoading: false,
-      judgeResultArmEnum: "",
+      judgeResultArmEnum: '',
       criterionType: null,
       openWindow: null,
       isFixed: false,
       images: [],
-      remark: "",
-    };
+      remark: ''
+    }
   },
   // watch: {
   //   visitTaskId: {
@@ -532,261 +495,260 @@ export default {
   //   }
   // },
   mounted() {
-    this.initializeViewer();
-    this.criterionType = parseInt(this.$route.query.criterionType);
-    this.getAdInfo();
+    this.criterionType = parseInt(this.$route.query.criterionType)
+    this.getAdInfo()
     if (this.isReadingShowPreviousResults) {
-      this.getPriorAdList();
+      this.getPriorAdList()
     }
-    DicomEvent.$on("resetOpenWindow", () => {
+    DicomEvent.$on('resetOpenWindow', () => {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-    });
+    })
   },
   beforeDestroy() {
-    DicomEvent.$off("resetOpenWindow");
+    DicomEvent.$off('resetOpenWindow')
     if (this.openWindow) {
-      this.openWindow.close();
+      this.openWindow.close()
     }
   },
   methods: {
     async getAdInfo() {
-      this.loading = true;
+      this.loading = true
       try {
         const res = await getJudgeReadingInfo({
-          visitTaskId: this.visitTaskId,
-        });
+          visitTaskId: this.visitTaskId
+        })
         if (res.IsSuccess) {
-          var judgeQS = [];
+          var judgeQS = []
           if (res.Result.VisitInfoList.length > 0) {
             res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
               var qsObj = {
                 armEnum: v.ArmEnum,
                 judgeQuestionList: [],
-                index: index,
-              };
+                index: index
+              }
               v.JudgeQuestionList.map((q) => {
                 if (q.QuestionType === 1) {
-                  qsObj.judgeQuestionList.push(q.QuestionName);
+                  qsObj.judgeQuestionList.push(q.QuestionName)
                 } else if (q.QuestionType === 3 && this.criterionType === 10) {
                   qsObj.judgeQuestionList.push(
-                    this.$t("trials:globalReview:table:visitRemark")
-                  );
+                    this.$t('trials:globalReview:table:visitRemark')
+                  )
                 } else {
                   qsObj.judgeQuestionList.push(
-                    this.$fd("JudgeReadingQuestionType", q.QuestionType)
-                  );
+                    this.$fd('JudgeReadingQuestionType', q.QuestionType)
+                  )
                 }
-              });
-              judgeQS.push(qsObj);
-            });
+              })
+              judgeQS.push(qsObj)
+            })
           }
-          this.judgeQuestion = judgeQS;
+          this.judgeQuestion = judgeQS
           this.isFixed =
             this.judgeQuestion.length > 0 &&
-            this.judgeQuestion[0].judgeQuestionList.length > 4;
-          this.adInfo = res.Result;
-          this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId;
+            this.judgeQuestion[0].judgeQuestionList.length > 4
+          this.adInfo = res.Result
+          this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
 
-          this.fileList = [];
+          this.fileList = []
           if (res.Result.JudgeResultImagePathList) {
             res.Result.JudgeResultImagePathList.map((url) => {
               if (url) {
-                this.fileList.push({ name: "", url: url });
+                this.fileList.push({ name: '', url: url })
               }
-            });
+            })
             this.adForm.judgeResultImagePathList =
-              res.Result.JudgeResultImagePathList;
+              res.Result.JudgeResultImagePathList
           }
-          this.visitTaskArmList = res.Result.VisitTaskArmList;
+          this.visitTaskArmList = res.Result.VisitTaskArmList
           var i = this.visitTaskArmList.findIndex(
             (i) => i.VisitTaskId === this.adForm.judgeResultTaskId
-          );
+          )
           if (i > -1) {
             // 本人已完整查看两位独立阅片人的全部相关影像和评估数据，经过综合研判，更认同第一阅片人（R1）对该病例的整体评估，原因是：
-            this.judgeResultArmEnum = this.visitTaskArmList[i].ArmEnum;
-            var msg = "";
+            this.judgeResultArmEnum = this.visitTaskArmList[i].ArmEnum
+            var msg = ''
             if (this.judgeResultArmEnum === 1) {
-              msg = this.$t("trials:adReview:title:msg1");
+              msg = this.$t('trials:adReview:title:msg1')
             } else if (this.judgeResultArmEnum === 2) {
-              msg = this.$t("trials:adReview:title:msg3");
+              msg = this.$t('trials:adReview:title:msg3')
             }
-            this.remark = msg;
-            this.adForm.judgeResultRemark = res.Result.JudgeResultRemark;
+            this.remark = msg
+            this.adForm.judgeResultRemark = res.Result.JudgeResultRemark
           }
         }
-        this.loading = false;
+        this.loading = false
       } catch (e) {
-        this.loading = false;
+        this.loading = false
       }
     },
     async getPriorAdList() {
-      this.priorLoading = true;
+      this.priorLoading = true
       try {
         const res = await getReadingPastResultList({
-          visitTaskId: this.visitTaskId,
-        });
+          visitTaskId: this.visitTaskId
+        })
         if (res.IsSuccess) {
-          this.priorADList = res.Result;
+          this.priorADList = res.Result
         }
-        this.priorLoading = false;
+        this.priorLoading = false
       } catch (e) {
-        this.priorLoading = false;
+        this.priorLoading = false
       }
     },
     handleVisitTaskArmChange(v) {
-      var i = this.visitTaskArmList.findIndex((i) => i.VisitTaskId === v);
+      var i = this.visitTaskArmList.findIndex((i) => i.VisitTaskId === v)
       if (i > -1) {
         // 本人已完整查看两位独立阅片人的全部相关影像和评估数据，经过综合研判，更认同第一阅片人（R1）对该病例的整体评估，原因是：
-        this.judgeResultArmEnum = this.visitTaskArmList[i].ArmEnum;
-        var msg = "";
+        this.judgeResultArmEnum = this.visitTaskArmList[i].ArmEnum
+        var msg = ''
         if (this.judgeResultArmEnum === 1) {
-          msg = this.$t("trials:adReview:title:msg1");
+          msg = this.$t('trials:adReview:title:msg1')
         } else {
-          msg = this.$t("trials:adReview:title:msg3");
+          msg = this.$t('trials:adReview:title:msg3')
         }
         // this.adForm.judgeResultRemark = `本人已完整查看两位独立阅片人的全部相关影像和评估数据，经过综合研判，更认同${this.$fd('ArmEnum', this.judgeResultArmEnum)}对该病例的整体评估，原因是：`
-        this.remark = msg;
-        this.adForm.judgeResultRemark = "";
+        this.remark = msg
+        this.adForm.judgeResultRemark = ''
       } else {
-        this.judgeResultArmEnum = "";
-        this.remark = "";
-        this.adForm.judgeResultRemark = "";
+        this.judgeResultArmEnum = ''
+        this.remark = ''
+        this.adForm.judgeResultRemark = ''
       }
     },
     previewCD() {
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`,
-      });
-      window.open(routeData.href, "_blank");
+        path: `/clinicalData?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${this.visitTaskId}&TokenKey=${token}`
+      })
+      window.open(routeData.href, '_blank')
     },
     async handleSave() {
-      const valid = await this.$refs["adForm"].validate();
-      if (!valid) return;
-      this.loading = true;
-      var paths = [];
+      const valid = await this.$refs['adForm'].validate()
+      if (!valid) return
+      this.loading = true
+      var paths = []
       this.fileList.map((file) => {
         if (file.url) {
-          paths.push(file.url);
+          paths.push(file.url)
         }
-      });
-      this.adForm.judgeResultImagePathList = paths;
-      this.adForm.visitTaskId = this.visitTaskId;
+      })
+      this.adForm.judgeResultImagePathList = paths
+      this.adForm.visitTaskId = this.visitTaskId
       try {
-        await saveJudgeVisitTaskResult(this.adForm);
-        this.$message.success(this.$t("common:message:savedSuccessfully"));
-        this.loading = false;
+        await saveJudgeVisitTaskResult(this.adForm)
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.loading = false
       } catch (e) {
-        this.loading = false;
+        this.loading = false
       }
     },
     async handleSubmit() {
-      const valid = await this.$refs["adForm"].validate();
-      if (!valid) return;
-      const { ImageAssessmentReportConfirmation } = const_.processSignature;
-      this.signCode = ImageAssessmentReportConfirmation;
-      this.signVisible = true;
+      const valid = await this.$refs['adForm'].validate()
+      if (!valid) return
+      const { ImageAssessmentReportConfirmation } = const_.processSignature
+      this.signCode = ImageAssessmentReportConfirmation
+      this.signVisible = true
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.signConfirm(signInfo);
+        this.signConfirm(signInfo)
       } else {
-        this.signVisible = false;
+        this.signVisible = false
       }
     },
     // 签名并确认
     async signConfirm(signInfo) {
-      this.loading = true;
-      var paths = [];
+      this.loading = true
+      var paths = []
       this.fileList.map((file) => {
-        paths.push(file.url);
-      });
+        paths.push(file.url)
+      })
       var params = {
         data: {
           visitTaskId: this.visitTaskId,
           judgeResultTaskId: this.adForm.judgeResultTaskId,
           judgeResultRemark: this.adForm.judgeResultRemark,
-          judgeResultImagePathList: paths,
+          judgeResultImagePathList: paths
         },
-        signInfo: signInfo,
-      };
+        signInfo: signInfo
+      }
       try {
-        const res = await submitJudgeVisitTaskResult(params);
+        const res = await submitJudgeVisitTaskResult(params)
         if (res.IsSuccess) {
-          this.$message.success(this.$t("common:message:savedSuccessfully"));
-          this.isEdit = false;
-          this.$refs["signForm"].btnLoading = false;
-          this.signVisible = false;
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.isEdit = false
+          this.$refs['signForm'].btnLoading = false
+          this.signVisible = false
           // window.location.reload()
           // window.opener.postMessage('refreshTaskList', window.location)
           // 设置当前任务阅片状态为已读
-          this.adInfo.ReadingTaskState = 2;
-          const res = await getAutoCutNextTask();
-          var isAutoTask = res.Result.AutoCutNextTask;
+          this.adInfo.ReadingTaskState = 2
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
             // store.dispatch('reading/resetVisitTasks')
-            window.location.reload();
+            window.location.reload()
           } else {
             // '当前阅片任务已完成，是否进入下一个阅片任务？'
             const confirm = await this.$confirm(
-              this.$t("trials:adReview:title:msg2"),
+              this.$t('trials:adReview:title:msg2'),
               {
-                type: "warning",
-                distinguishCancelAndClose: true,
+                type: 'warning',
+                distinguishCancelAndClose: true
               }
-            );
-            if (confirm === "confirm") {
+            )
+            if (confirm === 'confirm') {
               // store.dispatch('reading/resetVisitTasks')
               // DicomEvent.$emit('getNextTask')
-              window.location.reload();
+              window.location.reload()
             } else {
-              changeURLStatic("visitTaskId", this.visitTaskId);
+              changeURLStatic('visitTaskId', this.visitTaskId)
             }
           }
-          window.opener.postMessage("refreshTaskList", window.location);
+          window.opener.postMessage('refreshTaskList', window.location)
         }
-        this.loading = false;
+        this.loading = false
       } catch (e) {
-        this.loading = false;
-        this.$refs["signForm"].btnLoading = false;
+        this.loading = false
+        this.$refs['signForm'].btnLoading = false
       }
     },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-      var token = getToken();
-      var criterionType = parseInt(localStorage.getItem("CriterionType"));
-      var readingTool = this.$router.currentRoute.query.readingTool;
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool);
+      var token = getToken()
+      var criterionType = parseInt(localStorage.getItem('CriterionType'))
+      var readingTool = this.$router.currentRoute.query.readingTool
+      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
       var isReadingTaskViewInOrder =
-        this.$router.currentRoute.query.isReadingTaskViewInOrder;
+        this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId =
-        this.$router.currentRoute.query.TrialReadingCriterionId;
+        this.$router.currentRoute.query.TrialReadingCriterionId
 
-      var path = "";
+      var path = ''
       if (readingTool === 0) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
         }&subjectCode=${this.subjectCode}&subjectId=${
           this.subjectId
-        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
         }&subjectCode=${this.subjectCode}&subjectId=${
           this.subjectId
-        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
-      var routeData = this.$router.resolve({ path });
-      this.openWindow = window.open(routeData.href, "_blank");
+      var routeData = this.$router.resolve({ path })
+      this.openWindow = window.open(routeData.href, '_blank')
     },
     handleView(row, armEnum) {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
       // var token = getToken()
       // var task = row.VisitTaskInfoList.find(item => item.ArmEnum === armEnum)
@@ -794,17 +756,17 @@ export default {
       //   path: `/readingPage?trialId=${this.trialId}&visitTaskId=${task.VisitTaskId}&TokenKey=${token}&isReadingShowPreviousResults=false`
       // })
       // window.open(routeData.href, '_blank')
-      var token = getToken();
-      var task = row.VisitTaskInfoList.find((item) => item.ArmEnum === armEnum);
-      var criterionType = this.$router.currentRoute.query.criterionType;
-      var readingTool = this.$router.currentRoute.query.readingTool;
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool);
+      var token = getToken()
+      var task = row.VisitTaskInfoList.find((item) => item.ArmEnum === armEnum)
+      var criterionType = this.$router.currentRoute.query.criterionType
+      var readingTool = this.$router.currentRoute.query.readingTool
+      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
       var isReadingTaskViewInOrder =
-        this.$router.currentRoute.query.isReadingTaskViewInOrder;
+        this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId =
-        this.$router.currentRoute.query.TrialReadingCriterionId;
+        this.$router.currentRoute.query.TrialReadingCriterionId
 
-      var path = "";
+      var path = ''
       if (readingTool === 0) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
@@ -812,7 +774,7 @@ export default {
           this.subjectId
         }&visitTaskId=${
           task.VisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
@@ -820,26 +782,26 @@ export default {
           this.subjectId
         }&visitTaskId=${
           task.VisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
-      var routeData = this.$router.resolve({ path });
-      this.openWindow = window.open(routeData.href, "_blank");
+      var routeData = this.$router.resolve({ path })
+      this.openWindow = window.open(routeData.href, '_blank')
     },
     handleViewGl(row, armEnum) {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-      var token = getToken();
-      var task = row.VisitTaskInfoList.find((item) => item.ArmEnum === armEnum);
-      var criterionType = this.$router.currentRoute.query.criterionType;
-      var readingTool = this.$router.currentRoute.query.readingTool;
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool);
+      var token = getToken()
+      var task = row.VisitTaskInfoList.find((item) => item.ArmEnum === armEnum)
+      var criterionType = this.$router.currentRoute.query.criterionType
+      var readingTool = this.$router.currentRoute.query.readingTool
+      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
       var isReadingTaskViewInOrder =
-        this.$router.currentRoute.query.isReadingTaskViewInOrder;
+        this.$router.currentRoute.query.isReadingTaskViewInOrder
       var trialReadingCriterionId =
-        this.$router.currentRoute.query.TrialReadingCriterionId;
+        this.$router.currentRoute.query.TrialReadingCriterionId
 
-      var path = "";
+      var path = ''
       if (readingTool === 0) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
@@ -847,7 +809,7 @@ export default {
           this.subjectId
         }&visitTaskId=${
           task.GlobalVisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${
           this.trialId
@@ -855,10 +817,10 @@ export default {
           this.subjectId
         }&visitTaskId=${
           task.GlobalVisitTaskId
-        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
-      var routeData = this.$router.resolve({ path });
-      this.openWindow = window.open(routeData.href, "_blank");
+      var routeData = this.$router.resolve({ path })
+      this.openWindow = window.open(routeData.href, '_blank')
     },
     // uploadScreenshot(param) {
     //   this.loading = true
@@ -876,105 +838,93 @@ export default {
     //   })
     // },
     async uploadScreenshot(param) {
-      this.loading = true;
-      this.uploadDisabled = false;
-      var trialId = this.$route.query.trialId;
-      var file = await this.fileToBlob(param.file);
+      this.loading = true
+      this.uploadDisabled = false
+      var trialId = this.$route.query.trialId
+      var file = await this.fileToBlob(param.file)
       const res = await this.OSSclient.put(
         `/${trialId}/Read/${this.subjectId}/visit/${param.file.name}`,
         file
-      );
-      console.log(res);
+      )
+      console.log(res)
       this.fileList.push({
         name: param.file.name,
-        url: this.$getObjectName(res.url),
-      });
-      this.loading = false;
-      this.uploadDisabled = true;
+        url: this.$getObjectName(res.url)
+      })
+      this.loading = false
+      this.uploadDisabled = true
     },
     handleBeforeUpload(file) {
       // 检测文件类型是否符合要求
       if (this.checkFileSuffix(file.name)) {
-        return true;
+        return true
       } else {
-        const msg = this.$t("trials:adReview:title:msg4").replace(
-          "xxx",
+        const msg = this.$t('trials:adReview:title:msg4').replace(
+          'xxx',
           this.accept
-        );
-        this.$alert(msg);
-        return false;
+        )
+        this.$alert(msg)
+        return false
       }
     },
     checkFileSuffix(fileName) {
-      var index = fileName.lastIndexOf(".");
-      var suffix = fileName.substring(index + 1, fileName.length);
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
       if (
         this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) ===
         -1
       ) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     },
     // 图片清空
     removeImage() {
-      this.imageUrl = "";
-      this.fileList = [];
-      this.adForm.judgeResultImagePath = "";
+      this.imageUrl = ''
+      this.fileList = []
+      this.adForm.judgeResultImagePath = ''
     },
     // 预览图片
     handlePictureCardPreview(file) {
       this.images = this.fileList.map(
         (f) => this.OSSclientConfig.basePath + f.url
-      );
+      )
       // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show();
+      this.$refs[file.url].$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {
-      var idx = this.fileList.findIndex((i) => i.url === file.url);
-      if (idx === -1) return;
-      this.fileList.splice(idx, 1);
+      var idx = this.fileList.findIndex((i) => i.url === file.url)
+      if (idx === -1) return
+      this.fileList.splice(idx, 1)
     },
     async skipTask() {
       try {
         // 是否确认跳过？
         const confirm = await this.$confirm(
-          this.$t("trials:readingReport:message:skipConfirm"),
+          this.$t('trials:readingReport:message:skipConfirm'),
           {
-            type: "warning",
-            distinguishCancelAndClose: true,
+            type: 'warning',
+            distinguishCancelAndClose: true
           }
-        );
-        if (confirm !== "confirm") return;
-        this.loading = true;
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
         const res = await setSkipReadingCache({
-          visitTaskId: this.visitTaskId,
-        });
-        this.loading = false;
+          visitTaskId: this.visitTaskId
+        })
+        this.loading = false
         if (res.IsSuccess) {
-          window.location.reload();
+          window.location.reload()
         }
       } catch (e) {
-        this.loading = false;
-        console.log(e);
+        this.loading = false
+        console.log(e)
       }
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: {
-          zoomIn: true,
-          zoomOut: true,
-          rotateLeft: true,
-          rotateRight: true,
-          flipHorizontal: true,
-          flipVertical: true,
-        },
-      });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .adReview_wrapper {
diff --git a/src/views/trials/trials-panel/reading/clinical-data/index.vue b/src/views/trials/trials-panel/reading/clinical-data/index.vue
index f182ca67..2f0ebf6e 100644
--- a/src/views/trials/trials-panel/reading/clinical-data/index.vue
+++ b/src/views/trials/trials-panel/reading/clinical-data/index.vue
@@ -41,7 +41,7 @@
     </div>
     <div class="right-wrapper">
       <div v-if="selected.type===1" class="right-content">
-        <iframe :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" />
+        <iframe :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
       </div>
       <div v-else-if="selected.type===2" class="right-content" style="padding: 10px">
         <clinicalDataQuestions
@@ -216,7 +216,8 @@ export default {
       otherInfo: {},
       moment,
       loading: false,
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 32b4808b..921df42d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1039,7 +1039,7 @@ export default {
     loadImageStack(dicomSeries) {
       return new Promise(resolve => {
         this.isCurrentTask = dicomSeries.isCurrentTask
-        this.isBaseline = dicomSeries.isBaseline
+        this.isBaseline = dicomSeries.isBaseLineTask
         this.readingTaskState = dicomSeries.readingTaskState
         if (this.isCurrentTask && this.readingTaskState < 2) {
           this.activeTool = 1
@@ -1088,16 +1088,16 @@ export default {
         var frame = imageInfo.frame
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
+        
+        const element = this.$refs.canvas
+        cornerstone.enable(element)
+        element.tabIndex = 0
+        element.focus()
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
         this.toggleClipPlay(false)
         this.toolState.viewportInvert = false
         this.toolState.dicomInfoVisible = false
-
-        const element = this.$refs.canvas
-        cornerstone.enable(element)
-        element.tabIndex = 0
-        element.focus()
         var scope = this
         // var p = parseInt(new Date().getTime())
         // requestPoolManager.loadAndCacheImagePlus(this.stack.imageIds[this.stack.currentImageIdIndex], this.stack.seriesId, p*100).then(image=>{
@@ -1654,7 +1654,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 6acdf1a2..90fca6c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -352,7 +352,44 @@
             <div class="text">{{ $t('trials:reading:button:reset') }}</div>
           </div>
         </el-tooltip>
-
+        <el-tooltip
+          v-if="trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2"
+          v-hasPermi="['role:ir']"
+          class="item"
+          effect="dark"
+          :content="$t('trials:reading:button:upload')"
+          placement="bottom"
+        >
+          <div class="tool-wrapper">
+            <div class="icon" @click.prevent="openUploadImage('upload')">
+              <i class="el-icon-upload2 svg-icon" />
+            </div>
+            <div class="text">{{ $t('trials:reading:button:upload') }}</div>
+          </div>
+        </el-tooltip>
+        <el-tooltip
+          v-if="trialCriterion.ImageDownloadEnum > 0"
+          v-hasPermi="[
+            'role:ir',
+            'role:mim',
+            'role:mc',
+            'role:pm',
+            'role:apm',
+            'role:ea',
+            'role:qa',
+          ]"
+          class="item"
+          effect="dark"
+          :content="$t('trials:reading:button:download')"
+          placement="bottom"
+        >
+          <div class="tool-wrapper">
+            <div class="icon" @click.prevent="openUploadImage('download')">
+              <i class="el-icon-download svg-icon" />
+            </div>
+            <div class="text">{{ $t('trials:reading:button:download') }}</div>
+          </div>
+        </el-tooltip>
         <div style="margin-left:auto;">
           <div style="padding:5px">
             <!-- 手册 -->
@@ -397,49 +434,88 @@
           </div>
         </div>
         <div ref="form-container" class="form-container">
-          <!-- 激活canvas测量数据 -->
+          <div class="form-wrapper">
+            <RecistBMQuestionList
+              v-if="CriterionType === 17"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+            <IRecistQuestionList
+              v-else-if="CriterionType === 3"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+            <PCWGQuestionList
+              v-else-if="CriterionType === 10"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+            <LuganoQuestionList
+              v-else-if="CriterionType === 2"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
 
-          <RecistBMQuestionList
-            v-if="CriterionType === 17"
-            ref="measurementList"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
-          <IRecistQuestionList
-            v-else-if="CriterionType === 3"
-            ref="measurementList"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
-          <PCWGQuestionList
-            v-else-if="CriterionType === 10"
-            ref="measurementList"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
-          <LuganoQuestionList
-            v-else-if="CriterionType === 2"
-            ref="measurementList"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
+            <RecistQuestionList
+              v-else-if="CriterionType === 1"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+
+            <IVUSList
+              v-else-if="CriterionType === 19"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+            <OCTList
+              v-else-if="CriterionType === 20"
+              ref="measurementList"
+              :question-form-change-state="questionFormChangeState"
+              :question-form-change-num="questionFormChangeNum"
+              :is-show="isShow"
+              :is-reading-show-subject-info="isReadingShowSubjectInfo"
+            />
+            <h2 v-else style="color:#ddd">
+              Developing...
+            </h2>
+          </div>
+          <div v-if="iseCRFShowInDicomReading && currentReadingTaskState < 2" class="form-footer">
+            <el-button
+              type="primary"
+              size="small"
+              @click="skipTask"
+            >
+              <!-- 跳过 -->
+              {{ $t('trials:readingReport:button:skip') }}
+            </el-button>
+            <el-button
+              type="primary"
+              size="small"
+              @click="submit"
+            >
+              <!-- 提交 -->
+              {{ $t('common:button:submit') }}
+            </el-button>
+          </div>
 
-          <RecistQuestionList
-            v-else-if="CriterionType !== 17"
-            ref="measurementList"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
-          />
         </div>
       </div>
 
@@ -655,6 +731,37 @@
         </el-form-item>
       </el-form>
     </el-dialog>
+    <upload-dicom-and-nonedicom
+      v-if="uploadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId"
+      :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+    />
+    <download-dicom-and-nonedicom
+      v-if="downloadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :task-id="taskId"
+      :visible.sync="downloadImageVisible"
+    />
+    <!-- 签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <div slot="title">
+        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size:12px;margin-left:5px;user-select: text !important;">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+      </div>
+      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -677,6 +784,8 @@ import RecistBMQuestionList from './RecistBM/QuestionList'
 import IRecistQuestionList from './IRecist/QuestionList'
 import PCWGQuestionList from './PCWG/QuestionList'
 import LuganoQuestionList from './Lugano/QuestionList'
+import IVUSList from './IVUS/QuestionList'
+import OCTList from './OCT/QuestionList'
 import CustomWwwcForm from './CustomWwwcForm'
 import Manuals from './Manuals'
 import Hotkeys from './Hotkeys'
@@ -684,6 +793,14 @@ import WL from './WL'
 import Others from './Others'
 import DicomEvent from './DicomEvent'
 import html2canvas from 'html2canvas'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
+import SignForm from '@/views/trials/components/newSignForm'
+import { getCriterionReadingInfo, verifyVisitTaskQuestions, submitDicomVisitTask } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
+import { getAutoCutNextTask } from '@/api/user'
+import const_ from '@/const/sign-code'
+import { changeURLStatic } from '@/utils/history.js'
 export default {
   name: 'DicomViewer',
   components: {
@@ -698,7 +815,13 @@ export default {
     PCWGQuestionList,
     RecistBMQuestionList,
     IRecistQuestionList,
-    LuganoQuestionList },
+    LuganoQuestionList,
+    IVUSList,
+    OCTList,
+    'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
+    'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
+    SignForm
+  },
   props: {
     isShow: {
       type: Boolean,
@@ -724,6 +847,10 @@ export default {
       type: Boolean,
       required: true
     },
+    iseCRFShowInDicomReading: {
+      type: Boolean,
+      required: true
+    },
     questionFormChangeState: {
       type: Boolean,
       default() {
@@ -839,7 +966,19 @@ export default {
       activeCanvasWC: null,
       activeTaskInfo: {},
       clipPlaying: false,
-      fps: 15
+      fps: 15,
+      trialCriterion: {},
+      // 上传
+      downloadImageVisible: false,
+      uploadImageVisible: false,
+      uploadSubjectId: null,
+      uploadSubjectCode: null,
+      uploadTrialCriterion: {},
+      uploadStatus: 'upload',
+      taskId: '',
+      signVisible: false,
+      signCode: null,
+      currentUser: zzSessionStorage.getItem('userName')
     }
   },
 
@@ -912,6 +1051,7 @@ export default {
   mounted() {
     this.getHotKeys()
     this.getWwcTpl()
+    this.getTrialCriterion()
     // cornerstone.imageCache.setMaximumSizeBytes(0)
 
     // const maximumSizeInBytes = 1024 * 1024 * 1024 // 1 GB
@@ -923,6 +1063,10 @@ export default {
       this.measuredTools = [{ toolName: 'ArrowAnnotate', text: this.$t('trials:reading:button:arrowAnnotate'), icon: 'arrow', isDisabled: false, disabledReason: '' }, { toolName: 'RectangleRoi', text: this.$t('trials:reading:button:rectangle'), icon: 'rectangle', isDisabled: false, disabledReason: '' }]
     } else if (this.CriterionType === 17) {
       this.measuredTools = [{ toolName: 'Length', text: this.$t('trials:reading:button:length'), icon: 'length', isDisabled: false, disabledReason: '' }, { toolName: 'RectangleRoi', text: this.$t('trials:reading:button:rectangle'), icon: 'rectangle', isDisabled: false, disabledReason: '' }, { toolName: 'ArrowAnnotate', text: this.$t('trials:reading:button:arrowAnnotate'), icon: 'arrow', isDisabled: false, disabledReason: '' }]
+    } else if (this.CriterionType === 19) {
+      this.measuredTools = []
+    } else if (this.CriterionType === 20) {
+      this.measuredTools = []
     }
     this.rotateList[0] = '1'
     this.colorList[0] = ''
@@ -1062,6 +1206,27 @@ export default {
     })
   },
   methods: {
+    getTrialCriterion() {
+      getCriterionReadingInfo({
+        TrialId: this.trialId || this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId || this.$route.query.TrialReadingCriterionId
+      })
+        .then((res) => {
+          this.trialCriterion = res.Result
+        })
+        .catch(() => {})
+    },
+    openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
+      this.uploadSubjectCode = this.$route.query.subjectCode||localStorage.getItem("subjectCode")
+      this.uploadSubjectId = this.$route.query.subjectId||localStorage.getItem("subjectId")
+      this.uploadTrialCriterion = this.trialCriterion
+      this.uploadStatus = status
+      this[`${status}ImageVisible`] = true
+    },
     async getWwcTpl() {
       // const loading = this.$loading({ fullscreen: true })
       try {
@@ -2070,17 +2235,119 @@ export default {
       this.isFullscreen = false
       this.manualsDialog.visible = true
     },
+    async skipTask() {
+      // 是否确认跳过？
+      const confirm = await this.$confirm(
+        this.$t('trials:readingReport:message:skipConfirm'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      // const loading = this.$loading({ fullscreen: true })
+      try {
+        const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+        if (idx > -1) {
+          var visitTaskId = this.visitTaskList[idx].VisitTaskId
+          const res = await setSkipReadingCache({ visitTaskId: visitTaskId })
+          if (res.IsSuccess) {
+            window.location.reload()
+          }
+        }
+        // loading.close()
+      } catch (e) {
+        // loading.close()
+        console.log(e)
+      }
+    },
+    async submit() {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+        if (idx > -1) {
+          var visitTaskId = this.visitTaskList[idx].VisitTaskId
+          this.taskId = visitTaskId
+          await verifyVisitTaskQuestions({ visitTaskId: visitTaskId })
+          const { ImageAssessmentReportConfirmation } = const_.processSignature
+          this.signCode = ImageAssessmentReportConfirmation
+          this.signVisible = true
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+      }
+    },
+    // 关闭签名框
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo)
+      } else {
+        this.signVisible = false
+      }
+    },
+    // 签名并确认
+    async signConfirm(signInfo) {
+      this.loading = true
+      try {
+        var params = {
+          data: {
+            visitTaskId: this.taskId
+          },
+          signInfo: signInfo
+        }
+        const res = await submitDicomVisitTask(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          if (this.$refs['signForm']) {
+            this.$refs['signForm'].btnLoading = false
+          }
+
+          this.signVisible = false
+
+          // 设置当前任务阅片状态为已读
+          this.readingTaskState = 2
+          await store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
+          await store.dispatch('reading/setCurrentReadingTaskState', 2)
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
+          if (isAutoTask) {
+            window.location.reload()
+          } else {
+            // '当前阅片任务已完成，是否进入下一个阅片任务？'
+            this.$confirm(this.$t('trials:readingReport:message:msg4'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                window.location.reload()
+              })
+              .catch(action => {
+                changeURLStatic('visitTaskId', this.visitTaskId)
+              })
+          }
+
+          window.opener.postMessage('refreshTaskList', window.location)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        if (this.$refs['signForm'] && this.$refs['signForm'].btnLoading) {
+          this.$refs['signForm'].btnLoading = false
+        }
+      }
+    },
     handleFusion() {
       // https 或者 本地开发环境才是安全上下文
-      if (!window.isSecureContext) {
-        this.$alert(this.$t('components:uploadvideo:message:xf3'))
-        return
-      }
-      // 顶部文档是否开启跨源隔离
-      if (!window.crossOriginIsolated) {
-        this.$alert(this.$t('components:uploadvideo:message:xf4'))
-        return
-      }
+      // if (!window.isSecureContext) {
+      //   this.$alert(this.$t('components:uploadvideo:message:xf3'))
+      //   return
+      // }
+      // // 顶部文档是否开启跨源隔离
+      // if (!window.crossOriginIsolated) {
+      //   this.$alert(this.$t('components:uploadvideo:message:xf4'))
+      //   return
+      // }
       if (this.imageQualityIssues && parseInt(this.imageQualityIssues) === 6) {
         this.$alert(this.$t('trials:lugano:message:fusionWarn'))
         return
@@ -2400,9 +2667,22 @@ export default {
     .form-container{
       // box-sizing: border-box;
       width: 350px;
-      height: 100%;
+      // height: 100vh;
       border: 1px solid #727272;
-      // overflow-y: auto;
+      // position: relative;
+      display: flex;
+      flex-direction: column;
+
+    }
+    .form-wrapper{
+      flex-grow: 1;
+      height: 0;
+      overflow: hidden;
+    }
+    .form-footer{
+      background: #000;
+      padding: 10px 0;
+      text-align: center;
     }
     .viewer-container{
       box-sizing: border-box;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
index ba3b16c5..656769a2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
+  <div class="measurement-wrapper">
 
-    <div class="container" :style="{'height':height+'px'}">
+    <div class="container">
       <div class="basic-info">
         <h3 v-if="isReadingShowSubjectInfo">
           <span v-if="subjectCode">{{ subjectCode }} </span>
@@ -203,7 +203,6 @@ export default {
   },
   data() {
     return {
-      height: window.innerHeight - 140,
       questions: [],
       activeName: '',
       activeItem: {
@@ -269,8 +268,6 @@ export default {
     DicomEvent.$on('split', measureData => {
       this.handleSplit(measureData.RowId, measureData.QuestionId)
     })
-
-    window.addEventListener('resize', this.setHeight)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
@@ -457,9 +454,6 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
-    setHeight() {
-      this.height = window.innerHeight - 140
-    },
     getQuestionAnswer(questions, questionMark, answers) {
       var idx = questions.findIndex(i => i.QuestionMark === questionMark)
       if (idx > -1) {
@@ -1183,6 +1177,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper{
+  height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
new file mode 100644
index 00000000..21b0f31d
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -0,0 +1,874 @@
+<template>
+  <div class="measurement-wrapper">
+
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 影像质量问题 -->
+      <div class="lesions">
+        <Questions
+          ref="ecrf"
+          :question-form-change-state="true"
+          :question-form-change-num="0"
+          :is-qulity-issues="false"
+          :group-classify="1"
+        />
+      </div>
+
+      <!-- 测量问题 -->
+      <template v-if="questions.length > 0">
+        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+          </h4>
+          <div class="lesion_list">
+            <el-form
+              v-if="questions.length > 0"
+              :ref="`questions${index}`"
+              size="small"
+              :model="questionForm"
+            >
+              <div class="table-wrapper">
+                <div v-for="item in qs.Childrens" :key="item.Id">
+                  <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
+                    <div class="title">{{ item.QuestionName }}</div>
+                    <div v-if="item.LesionType === 102 && readingTaskState < 2">
+                      <div class="add-icon" @click.prevent="downloadTpl">
+                        <i class="el-icon-download" />
+                      </div>
+                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
+                        <i class="el-icon-upload2" />
+                      </div>
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                        <i class="el-icon-plus" />
+                      </div>
+                    </div>
+
+                  </div>
+                  <el-table
+                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :ref="item.Id"
+                    :data="item.TableQuestions.Answers"
+                  >
+                    <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
+                      </template>
+                    </el-table-column> -->
+                    <!-- <el-table-column
+                      type="index"
+                      width="40px"
+                    /> -->
+                    <el-table-column
+                      v-for="q of item.TableQuestions.Questions"
+                      :key="q.Id"
+                      :prop="q.Id"
+                      :label="q.QuestionName"
+                      show-overflow-tooltip
+                      :render-header="renderHeader"
+                    >
+                      <template slot-scope="scope">
+                        <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
+                          {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
+                        </span>
+                        <span v-else-if="q.DictionaryCode">
+                          {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+                        </span>
+                        <span v-else>
+                          {{ `${scope.row[q.Id]}` }}
+                        </span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      v-if="readingTaskState < 2 && item.LesionType === 102"
+                      :label="$t('common:action:action')"
+                      width="90px"
+                      fixed="right"
+                    >
+                      <template slot-scope="scope">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                          {{ $t('common:button:edit') }}
+                        </el-button>
+                        <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                          {{ $t('common:button:delete') }}
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <template v-else>
+                    <!-- 数值 -->
+                    <el-form-item
+                      v-if="item.ShowQuestion!==2"
+                      :key="item.Id"
+                      :label="`${item.QuestionName}`"
+                      :prop="item.Id"
+                      :rules="[
+                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
+                      ]"
+                    >
+                      <!-- 数值类型 -->
+                      <template v-if="item.Type==='textarea'">
+                        <el-input
+                          v-model="questionForm[qs.Id]"
+                          type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 4}"
+                          :disabled="!isCurrentTask || readingTaskState>=2"
+                          @change="((val)=>{formItemChange(val, qs)})"
+                        />
+                      </template>
+                    </el-form-item>
+                  </template>
+                </div>
+                <div
+                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer"
+                  style="text-align:right;margin-top:10px;"
+                >
+                  <!-- 保存 -->
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    :disabled="!formChanged"
+                    @click="handleSave(index)"
+                  >
+                    {{ $t('common:button:save') }}
+                  </el-button>
+                </div>
+              </div>
+            </el-form>
+          </div>
+        </div>
+      </template>
+
+      <!-- 计算值 -->
+      <Questions
+        ref="ecrf2"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :is-qulity-issues="false"
+        :group-classify="4"
+        style="margin-top:20px"
+      />
+
+      <!-- 评估结果 -->
+      <Questions
+        ref="ecrf3"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :is-qulity-issues="false"
+        :group-classify="5"
+      />
+      <!-- 新增、编辑弹窗 -->
+      <el-dialog
+        v-if="addOrEdit.visible"
+        :visible.sync="addOrEdit.visible"
+        :close-on-click-modal="false"
+        :title="addOrEdit.title"
+        width="500px"
+      >
+        <el-form
+          ref="tableQsForm"
+          v-loading="loading"
+          :model="qsForm"
+          size="small"
+        >
+          <QuestionTableFormItem
+            v-for="item in qsList"
+            :key="item.Id"
+            :question="item"
+            :question-form="qsForm"
+            :reading-task-state="readingTaskState"
+            @setFormItemData="setFormItemData"
+            @resetFormItemData="resetFormItemData"
+          />
+          <el-form-item style="text-align: right">
+            <el-button
+              size="small"
+              @click="addOrEdit.visible = false"
+            >
+              {{ $t('common:button:cancel') }}
+            </el-button>
+            <!-- 保存 -->
+            <el-button size="small" class="my_upload_btn" @click="saveFormData">
+              {{ $t('common:button:save') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+      <!-- 导入 -->
+      <el-dialog
+        v-if="upload.visible"
+        :visible.sync="upload.visible"
+        :close-on-click-modal="false"
+        :title="upload.title"
+        width="500px"
+      >
+        <UploadExcel
+          :visit-task-id="visitTaskId"
+          @close="uploadDlgClose"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
+import { resetReadingTask, getIVUSTemplate } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import Questions from './../Questions'
+import QuestionTableFormItem from './QuestionTableFormItem'
+import UploadExcel from './UploadExcel'
+export default {
+  name: 'MeasurementList',
+  components: {
+    Questions,
+    QuestionTableFormItem,
+    UploadExcel
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    questionFormChangeState: {
+      type: Boolean,
+      default() {
+        return false
+      }
+    },
+    questionFormChangeNum: {
+      type: Number,
+      default() {
+        return 0
+      }
+    }
+  },
+  data() {
+    return {
+      questions: [],
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      readingTaskState: 2,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      tableQuestions: [],
+      CriterionType: null,
+      subjectCode: '',
+      questionForm: {},
+      formChanged: false,
+      digitPlaces: 2,
+      addOrEdit: { visible: false, title: '' },
+      upload: { visible: false, title: '' },
+      qsList: [],
+      answersList: [],
+      qsForm: {},
+      diffId: '',
+      eemId: '',
+      lumenId: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['visitTaskList', 'language', 'lastCanvasTaskId', 'currentReadingTaskState'])
+  },
+  watch: {
+    lastCanvasTaskId: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.initList()
+        }
+      }
+    },
+    currentReadingTaskState: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.readingTaskState = val
+        }
+      }
+    }
+  },
+  mounted() {
+    // this.subjectCode = this.$router.currentRoute.query.subjectCode
+    this.subjectCode = localStorage.getItem('subjectCode')
+    this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    window.addEventListener('message', this.receiveMsg)
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    DicomEvent.$on('setCollapseActive', measureData => {
+      this.setCollapseActive(measureData)
+      console.log('setCollapseActive')
+    })
+    DicomEvent.$on('getAllUnSaveLesions', (callback) => {
+      callback([])
+    })
+    DicomEvent.$on('refreshQuestions', _ => {
+      this.refreshQuestions()
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('getUnSaveTarget')
+    DicomEvent.$off('refreshQuestions')
+  },
+  methods: {
+    async initList() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      if (i > -1) {
+        this.visitTaskId = this.visitTaskList[i].VisitTaskId
+        this.taskBlindName = this.visitTaskList[i].TaskBlindName
+        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
+        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
+        if (!this.visitTaskList[i].IsInit) {
+          var loading = this.$loading({ fullscreen: true })
+          var triald = this.trialId = this.$router.currentRoute.query.trialId
+          if (!this.visitTaskList[i].studyListInit) {
+            await store.dispatch('reading/getStudyInfo', { trialId: triald, subjectVisitId: this.visitTaskList[i].VisitId, visitTaskId: this.visitTaskList[i].VisitTaskId, taskBlindName: this.visitTaskList[i].TaskBlindName })
+          }
+          if (!this.visitTaskList[i].readingQuestionsInit) {
+            await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+          if (!this.visitTaskList[i].questionsInit) {
+            await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+
+          await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
+          loading.close()
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.setQuestionForm(this.questions)
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+        })
+      }
+    },
+    setQuestionForm(questions) {
+      const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
+      questions.forEach(item => {
+        if (type.includes(item.Type)) {
+          const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          this.$set(this.questionForm, item.Id, answer)
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestionForm(item.Childrens)
+        }
+      })
+    },
+    async resetQuestions(obj) {
+      this.setQuestions(this.questions, obj)
+      await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
+
+      this.getTableQuestions()
+    },
+    setQuestions(questions, obj) {
+      questions.forEach(item => {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
+          var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
+          item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
+          item.TableQuestions.Answers[idx].area1 = obj.area1
+          item.TableQuestions.Answers[idx].area2 = obj.area2
+          item.TableQuestions.Answers[idx].diff = obj.diff
+          for (const i in obj.anwsers) {
+            item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
+          }
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestions(item.Childrens, obj)
+        }
+      })
+    },
+    getQuestions(questions) {
+      questions.forEach(item => {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+          item.TableQuestions.Answers.forEach(answerObj => {
+            if (answerObj.RowId) {
+              var diffVal = this.getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
+              this.$set(answerObj, 'saveTypeEnum', isNaN(parseFloat(diffVal)) ? 1 : 2)
+            } else {
+              this.$set(answerObj, 'saveTypeEnum', 0)
+            }
+          })
+        }
+        if (item.Childrens.length > 0) {
+          this.getQuestions(item.Childrens)
+        }
+      })
+      return questions
+    },
+    getReadingQuestionAndAnswer() {
+      return new Promise(async resolve => {
+        try {
+          const loading = this.$loading({ fullscreen: true })
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(() => {
+            var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+            if (idx > -1) {
+              if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
+                this.questions = this.visitTaskList[idx].ReadingQuestions
+                this.setQuestionForm(this.questions)
+              }
+              this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
+              this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
+              this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
+            }
+          })
+          loading.close()
+          resolve()
+        } catch (e) { console.log(e) }
+      })
+    },
+    getQuestionAnswer(questions, questionMark, answers) {
+      var idx = questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        var questionId = questions[idx].Id
+        return answers[questionId]
+      } else {
+        return ''
+      }
+    },
+    isCanActiveTool(toolName) {
+      return { isCanActiveTool: true, reason: '' }
+    },
+    getMaxRowIndex(answerList) {
+      if (answerList.length > 0) {
+        var arr = []
+        answerList.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        var max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    modifyMeasuredData(measureObj) {
+    },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+
+    },
+    formItemChange() {
+      this.formChanged = true
+    },
+    limitBlur(qId, valueType) {
+      const value = this.questionForm[qId]
+      if (isNaN(parseInt(value))) {
+        this.$set(this.questionForm, qId, '')
+      } else {
+        if (valueType === 0) {
+          this.$set(this.questionForm, qId, parseInt(value))
+        } else if (valueType === 3) {
+          this.$set(this.questionForm, qId, parseFloat(value))
+        } else {
+          this.$set(this.questionForm, qId, this.numberToFixed(value))
+        }
+      }
+    },
+    numberToFixed(v) {
+      if (this.digitPlaces > -1) {
+        return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+      } else {
+        return v
+      }
+    },
+    async handleSave(index) {
+      const refName = `questions${index}`
+      const valid = await this.$refs[refName][0].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      var answers = []
+      for (const k in this.questionForm) {
+        answers.push({ id: k, answer: this.questionForm[k] })
+      }
+      var params = {
+        visitTaskId: this.visitTaskId,
+        answers: answers
+      }
+      try {
+        await saveTaskQuestion(8, params)
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        loading.close()
+        DicomEvent.$emit('getReportInfo', true)
+        this.refreshQuestions()
+        this.formChanged = false
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    getECRFQuestions(obj) {
+      this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+      this.$refs['ecrf2'].getQuestions(obj.visitTaskId)
+      this.$refs['ecrf3'].getQuestions(obj.visitTaskId)
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getReportInfo', true)
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    async refreshQuestions() {
+      const triald = this.$router.currentRoute.query.trialId
+      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+      this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+      this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+    },
+    receiveMsg(event) {
+    },
+    resetFormItemData(v) {
+      this.qsForm[v] = null
+    },
+    setFormItemData(obj) {
+      this.qsForm[obj.key] = obj.val
+      if (obj.key === this.eemId || obj.key === this.lumenId) {
+        const eem = this.qsForm[this.eemId]
+        const lumen = this.qsForm[this.lumenId]
+        if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
+          this.$set(this.qsForm, this.diffId, null)
+        } else {
+          const diff = parseFloat(eem) - parseFloat(lumen)
+          this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
+        }
+      }
+    },
+    handleAddOrEdit(type, row, index) {
+      this.addOrEdit.title = row.QuestionName
+      this.qsList = row.TableQuestions.Questions
+      this.qsForm = {}
+      this.qsForm.questionId = row.Id
+      this.qsForm.rowId = type === 'add' ? null : row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowId : null
+      if (type === 'add') {
+        var maxIndex = this.getMaxRowIndex(row.TableQuestions.Answers)
+        this.qsForm.rowIndex = `${maxIndex + 1}.00`
+      } else {
+        this.qsForm.rowIndex = row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowIndex : null
+      }
+      row.TableQuestions.Questions.map(i => {
+        if (i.QuestionMark === 1001) {
+          this.eemId = i.Id
+        }
+        if (i.QuestionMark === 1002) {
+          this.lumenId = i.Id
+        }
+        if (i.QuestionMark === 1003) {
+          this.diffId = i.Id
+        }
+        let v = null
+        if (type === 'add') {
+          v = i.Type === 'number' ? undefined : null
+        } else {
+          v = row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index][i.Id] : null
+        }
+        this.$set(this.qsForm, i.Id, v)
+      })
+      this.addOrEdit.visible = true
+    },
+    async saveFormData() {
+      const valid = await this.$refs.tableQsForm.validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var answers = []
+        var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+        for (const k in this.qsForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
+            }
+          }
+        }
+
+        var params = {
+          questionId: this.qsForm.questionId,
+          rowId: this.qsForm.rowId,
+          rowIndex: this.qsForm.rowIndex,
+          visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
+          answerList: answers
+        }
+        const res = await submitTableQuestion(params)
+        if (res.IsSuccess) {
+          // this.refreshQuestions()
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getReportInfo', true)
+          // 保存成功！
+          this.addOrEdit.visible = false
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    async handleDelete(row, index) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg48'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        if (row.TableQuestions.Answers[index].RowId) {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: row.Id,
+            rowId: row.TableQuestions.Answers[index].RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            await this.getReadingQuestionAndAnswer(this.visitTaskId)
+            DicomEvent.$emit('getReportInfo', true)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    uploadTpl(lesionType) {
+      this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
+      this.upload.visible = true
+    },
+    async downloadTpl() {
+      try {
+        const params = {
+          visitTaskId: this.visitTaskId
+        }
+        await getIVUSTemplate(params)
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async uploadDlgClose() {
+      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      DicomEvent.$emit('getReportInfo', true)
+      this.upload.visible = false
+    },
+    renderHeader(h, { column, $index }) {
+      const span = document.createElement('span')
+      span.innerText = column.label
+      document.body.appendChild(span)
+      const w = span.getBoundingClientRect().width
+      column.minWidth = w > 65 ? w + 10 : w > 60 ? w + 15 : w + 20
+      document.body.removeChild(span)
+      return h('span', column.label)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    display: inline-block;
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+    /deep/ .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    /deep/ .el-input .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-form-item{
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+    }
+    /deep/ .el-form-item__content{
+      flex: 1;
+    }
+    /deep/ .el-input.is-disabled .el-input__inner{
+      background-color: #646464a1;
+    }
+    /deep/ .el-select.is-disabled .el-input__inner{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+  .table-wrapper {
+    ::-webkit-scrollbar {
+      width: 5px;
+      height: 8px;
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #d0d0d0;
+    }
+    /deep/ .el-table,
+    .el-table__expanded-cell {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table th,
+    .el-table tr {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr > td {
+      background-color: #000 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr:hover > td {
+      background-color: #858282 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table--border th.gutter:last-of-type {
+      border: none;
+    }
+    /deep/ .el-table__fixed-right {
+      height: 100% !important;
+    }
+    // /deep/ .el-table .cell {
+    //   line-height: 20px;
+    // }
+    /deep/ .el-table__cell {
+      padding: 5px 0;
+    }
+    /deep/.el-table__fixed-right-patch {
+      background-color: #000 !important;
+      border-color: #444444;
+    }
+    /deep/.el-table__fixed-body-wrapper tr:hover > td {
+      background-color: #000 !important;
+    }
+    /deep/.el-table--scrollable-x .el-table__body-wrapper {
+      z-index: 2;
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
new file mode 100644
index 00000000..a8dee2bb
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+    >
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ language==='en'?question.GroupEnName:question.GroupName }}
+      </h4>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
+      >
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-else-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
+          clearable
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-else-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.DictionaryCode">
+            <el-radio
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :label="String(item.value)"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="question.TypeValue">
+            <el-radio
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-else-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 数值 -->
+        <!-- <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+        </template> -->
+        <!-- 数值类型 -->
+        <el-input
+          v-else-if="question.Type==='number'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState>=2 "
+          type="number"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+
+        <el-input
+          v-else-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          disabled
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+      </el-form-item>
+    </template>
+
+    <QuestionTableFormItem
+      v-for="item in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :question-form="questionForm"
+      :reading-task-state="readingTaskState"
+      @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  name: 'QuestionTableFormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return []
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+      digitPlaces: 2
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  mounted() {
+    this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens && question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      } else {
+        if (question.Type === 'number') {
+          v = this.limitBlur(question.ValueType, v)
+        }
+        this.$emit('setFormItemData', { key: question.Id, val: v })
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    limitBlur(valueType, value) {
+      if (isNaN(parseInt(value))) {
+        value = null
+      } else {
+        if (valueType === 0) {
+          value = parseInt(value)
+        } else if (valueType === 3) {
+          value = parseFloat(value)
+        } else {
+          value = this.numberToFixed(value)
+        }
+      }
+      return value
+    },
+    numberToFixed(v) {
+      if (this.digitPlaces > -1) {
+        return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+      } else {
+        return v
+      }
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    },
+    setFormItemData(obj) {
+      this.$emit('setFormItemData', obj)
+    },
+    limitNumbersEvent(e) {
+      // 通过正则保留两位小数点
+      let val = e.target.value
+      if (val.length > 6) val = val.slice(0, 6)
+      e.target.value = (val.match(/^\d*(\.?\d{0,3})/g)[0]) || null
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  /deep/ .el-upload--picture-card {
+    display: none;
+  }
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column !important;
+  align-items: flex-start;
+}
+/deep/ .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-input-group__append, .el-input-group__prepend{
+    padding: 0 10px;
+  }
+  /deep/ .el-form-item__content {
+    width: 100%;
+  }
+  /deep/ .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
new file mode 100644
index 00000000..360f29dc
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-form
+    ref="uploadExcel"
+    class="upload-excel-file"
+  >
+    <!-- 文件 -->
+    <el-form-item :label="$t('trials:consistencyCheck:label:file')">
+      <div class="upload-container">
+        <el-upload
+          class="upload-demo"
+          action
+          accept=".xlsx,.xls,.csv"
+          :before-upload="beforeUpload"
+          :http-request="handleUploadFile"
+          :on-preview="handlePreview"
+          :show-file-list="true"
+          :limit="1"
+          :on-exceed="handleExceed"
+        >
+          <el-button size="small" type="primary">
+            {{ $t('trials:consistencyCheck:dialogButton:upload') }}
+          </el-button>
+          <span
+            slot="tip"
+            style="margin-left:10px;"
+            class="el-upload__tip"
+          >
+            ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
+          </span>
+        </el-upload>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { uploadIVUSTemplate } from '@/api/reading'
+export default {
+  props: {
+    visitTaskId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    beforeUpload(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        return true
+      } else {
+        // Must be xls or xlsx format
+        this.$alert(this.$t('trials:consistencyCheck:message:xlsx'))
+
+        return false
+      }
+    },
+    async handleUploadFile(param) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var data = new FormData()
+        data.append('file', param.file)
+        data.append('visitTaskId', this.visitTaskId)
+        await uploadIVUSTemplate(data)
+        this.$emit('close')
+        this.$message.success('导入成功！')
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    handlePreview(file) {
+      if (file.fullPath) {
+        window.open(file.fullPath, '_blank')
+      }
+    },
+    handleExceed(files, fileList) {
+      // Upload is currently limited to 1 file
+      this.$message.warning(this.$t('trials:consistencyCheck:message:onlyOneFile'))
+    },
+    checkFileSuffix(fileName) {
+      var typeArr = ['xls', 'xlsx', 'csv']
+      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.upload-excel-file{
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+  .account_item_clear{
+    .el-tag__close{
+      display: none !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index c5e7430a..74c2b4a2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -276,7 +276,6 @@ import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } from '
 // import { uploadPrintscreen } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
-import Viewer from 'v-viewer'
 export default {
   name: 'MeasurementForm',
   props: {
@@ -353,7 +352,6 @@ export default {
     }
   },
   mounted() {
-    this.initializeViewer()
     this.trialId = this.$route.query.trialId
     this.initForm()
     DicomEvent.$on('handleImageQualityAbnormal', () => {
@@ -380,11 +378,6 @@ export default {
         }
       }
     },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
-    },
     previewImage() {
       this.$refs.viewer[0].$viewer.show()
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index d11436f1..7330b60e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
+  <div class="measurement-wrapper">
 
-    <div class="container" :style="{'height':height+'px'}">
+    <div class="container">
       <div class="basic-info">
         <h3 v-if="isReadingShowSubjectInfo">
           <span v-if="subjectCode">{{ subjectCode }} </span>
@@ -262,7 +262,6 @@ export default {
   },
   data() {
     return {
-      height: window.innerHeight - 140,
       questions: [],
       activeName: '',
       activeItem: {
@@ -359,8 +358,6 @@ export default {
       }
       callback(true)
     })
-
-    window.addEventListener('resize', this.setHeight)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
@@ -573,9 +570,6 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
-    setHeight() {
-      this.height = window.innerHeight - 140
-    },
     getQuestionAnswer(questions, questionMark, answers) {
       var idx = questions.findIndex(i => i.QuestionMark === questionMark)
       if (idx > -1) {
@@ -1347,9 +1341,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper{
+  height: 100%;
   overflow-y: auto;
-  // overflow: hidden;
-
   .container{
     padding: 10px;
     .basic-info{
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue b/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
index bf89c6fd..847b30be 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Manuals.vue
@@ -21,7 +21,7 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
@@ -44,7 +44,8 @@ export default {
       },
       fileList: [],
       loading: false,
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
new file mode 100644
index 00000000..20cd3aa8
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -0,0 +1,887 @@
+<template>
+  <div class="measurement-wrapper">
+    <div class="container">
+      <div class="basic-info">
+        <h3 v-if="isReadingShowSubjectInfo">
+          <span v-if="subjectCode">{{ subjectCode }} </span>
+          <span style="margin-left:5px;">{{ taskBlindName }}</span>
+        </h3>
+        <div v-if="readingTaskState < 2">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetMeasuredData"
+            />
+          </el-tooltip>
+        </div>
+      </div>
+
+      <!-- 影像质量问题 -->
+      <div class="lesions">
+        <Questions
+          ref="ecrf"
+          :question-form-change-state="true"
+          :question-form-change-num="0"
+          :is-qulity-issues="false"
+          :group-classify="1"
+        />
+      </div>
+
+      <!-- 测量问题 -->
+      <template v-if="questions.length > 0">
+        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+          </h4>
+          <div class="lesion_list">
+            <el-form
+              v-if="questions.length > 0"
+              :ref="`questions${index}`"
+              size="small"
+              :model="questionForm"
+            >
+              <div class="table-wrapper">
+                <div v-for="item in qs.Childrens" :key="item.Id">
+                  <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
+                    <div class="title">{{ item.QuestionName }}</div>
+                    <div v-if="(item.LesionType === 112 || item.LesionType === 111) && readingTaskState < 2">
+                      <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
+                        <i class="el-icon-download" />
+                      </div>
+                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
+                        <i class="el-icon-upload2" />
+                      </div>
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                        <i class="el-icon-plus" />
+                      </div>
+                    </div>
+
+                  </div>
+                  <el-table
+                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :ref="item.Id"
+                    :data="item.TableQuestions.Answers"
+                    max-height="600"
+                  >
+                    <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
+                      </template>
+                    </el-table-column> -->
+                    <!-- <el-table-column
+                      type="index"
+                      width="40px"
+                    /> -->
+                    <el-table-column
+                      v-for="q of item.TableQuestions.Questions"
+                      :key="q.Id"
+                      :prop="q.Id"
+                      :label="q.QuestionName"
+                      show-overflow-tooltip
+                      :render-header="renderHeader"
+                    >
+                      <template slot-scope="scope">
+                        <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
+                          {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
+                        </span>
+                        <span v-else-if="q.DictionaryCode">
+                          {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+                        </span>
+                        <span v-else>
+                          {{ `${scope.row[q.Id]}` }}
+                        </span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      v-if="readingTaskState < 2"
+                      :label="$t('common:action:action')"
+                      width="90px"
+                      fixed="right"
+                    >
+                      <template slot-scope="scope">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                          {{ $t('common:button:edit') }}
+                        </el-button>
+                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                          {{ $t('common:button:delete') }}
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+
+                  <template v-else>
+                    <!-- 数值 -->
+                    <el-form-item
+                      v-if="item.ShowQuestion!==2"
+                      :key="item.Id"
+                      :label="`${item.QuestionName}`"
+                      :prop="item.Id"
+                      :rules="[
+                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
+                      ]"
+                    >
+                      <!-- 数值类型 -->
+                      <template v-if="item.Type==='textarea'">
+                        <el-input
+                          v-model="questionForm[qs.Id]"
+                          type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 4}"
+                          :disabled="!isCurrentTask || readingTaskState>=2"
+                          @change="((val)=>{formItemChange(val, qs)})"
+                        />
+                      </template>
+                    </el-form-item>
+                  </template>
+                </div>
+                <div
+                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer"
+                  style="text-align:right;margin-top:10px;"
+                >
+                  <!-- 保存 -->
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    :disabled="!formChanged"
+                    @click="handleSave(index)"
+                  >
+                    {{ $t('common:button:save') }}
+                  </el-button>
+                </div>
+              </div>
+            </el-form>
+          </div>
+        </div>
+      </template>
+
+      <!-- 计算值 -->
+      <Questions
+        ref="ecrf2"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :is-qulity-issues="false"
+        :group-classify="4"
+        style="margin-top:20px"
+      />
+
+      <!-- 评估结果 -->
+      <Questions
+        ref="ecrf3"
+        :question-form-change-state="true"
+        :question-form-change-num="0"
+        :is-qulity-issues="false"
+        :group-classify="5"
+      />
+      <el-dialog
+        v-if="addOrEdit.visible"
+        :visible.sync="addOrEdit.visible"
+        :close-on-click-modal="false"
+        :title="addOrEdit.title"
+        width="500px"
+      >
+        <el-form
+          ref="tableQsForm"
+          v-loading="loading"
+          :model="qsForm"
+          size="small"
+        >
+          <QuestionTableFormItem
+            v-for="item in qsList"
+            :key="item.Id"
+            :question="item"
+            :question-form="qsForm"
+            :reading-task-state="readingTaskState"
+            @setFormItemData="setFormItemData"
+            @resetFormItemData="resetFormItemData"
+          />
+          <el-form-item style="text-align: right">
+            <el-button
+              size="small"
+              @click="addOrEdit.visible = false"
+            >
+              {{ $t('common:button:cancel') }}
+            </el-button>
+            <!-- 保存 -->
+            <el-button size="small" class="my_upload_btn" @click="saveFormData">
+              {{ $t('common:button:save') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
+      <!-- 导入 -->
+      <el-dialog
+        v-if="upload.visible"
+        :visible.sync="upload.visible"
+        :close-on-click-modal="false"
+        :title="upload.title"
+        width="500px"
+      >
+        <UploadExcel
+          :visit-task-id="visitTaskId"
+          :lesion-type="upload.lesionType"
+          @close="uploadDlgClose"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
+import { resetReadingTask, getOCTFCTTemplate, getOCTLipidAngleTemplate } from '@/api/reading'
+import DicomEvent from './../DicomEvent'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import Questions from './../Questions'
+import QuestionTableFormItem from './QuestionTableFormItem'
+import UploadExcel from './UploadExcel'
+export default {
+  name: 'MeasurementList',
+  components: {
+    Questions,
+    QuestionTableFormItem,
+    UploadExcel
+  },
+  props: {
+    isShow: {
+      type: Boolean,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    questionFormChangeState: {
+      type: Boolean,
+      default() {
+        return false
+      }
+    },
+    questionFormChangeNum: {
+      type: Number,
+      default() {
+        return 0
+      }
+    }
+  },
+  data() {
+    return {
+      questions: [],
+      visitTaskId: '',
+      isCurrentTask: false,
+      loading: false,
+      readingTaskState: 2,
+      isBaseLineTask: false,
+      taskBlindName: '',
+      tableQuestions: [],
+      CriterionType: null,
+      subjectCode: '',
+      questionForm: {},
+      formChanged: false,
+      digitPlaces: 2,
+      addOrEdit: { visible: false, title: '', lesionType: null },
+      upload: { visible: false, title: '', lesionType: null },
+      qsList: [],
+      answersList: [],
+      qsForm: {},
+      m1Id: '',
+      m2Id: '',
+      m3Id: '',
+      avgId: ''
+    }
+  },
+  computed: {
+    ...mapGetters(['visitTaskList', 'language', 'lastCanvasTaskId', 'currentReadingTaskState'])
+  },
+  watch: {
+    lastCanvasTaskId: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.initList()
+        }
+      }
+    },
+    currentReadingTaskState: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          this.readingTaskState = val
+        }
+      }
+    }
+  },
+  mounted() {
+    // this.subjectCode = this.$router.currentRoute.query.subjectCode
+    this.subjectCode = localStorage.getItem('subjectCode')
+    this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    window.addEventListener('message', this.receiveMsg)
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    DicomEvent.$on('setCollapseActive', measureData => {
+      this.setCollapseActive(measureData)
+      console.log('setCollapseActive')
+    })
+    DicomEvent.$on('getAllUnSaveLesions', (callback) => {
+      callback([])
+    })
+    DicomEvent.$on('refreshQuestions', _ => {
+      this.refreshQuestions()
+    })
+  },
+  beforeDestroy() {
+    DicomEvent.$off('setCollapseActive')
+    DicomEvent.$off('getUnSaveTarget')
+    DicomEvent.$off('refreshQuestions')
+  },
+  methods: {
+    async initList() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      if (i > -1) {
+        this.visitTaskId = this.visitTaskList[i].VisitTaskId
+        this.taskBlindName = this.visitTaskList[i].TaskBlindName
+        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
+        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
+        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
+        if (!this.visitTaskList[i].IsInit) {
+          var loading = this.$loading({ fullscreen: true })
+          var triald = this.trialId = this.$router.currentRoute.query.trialId
+          if (!this.visitTaskList[i].studyListInit) {
+            await store.dispatch('reading/getStudyInfo', { trialId: triald, subjectVisitId: this.visitTaskList[i].VisitId, visitTaskId: this.visitTaskList[i].VisitTaskId, taskBlindName: this.visitTaskList[i].TaskBlindName })
+          }
+          if (!this.visitTaskList[i].readingQuestionsInit) {
+            await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+          if (!this.visitTaskList[i].questionsInit) {
+            await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskList[i].VisitTaskId })
+          }
+
+          await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
+          loading.close()
+        }
+        this.questions = this.visitTaskList[i].ReadingQuestions
+        this.setQuestionForm(this.questions)
+        this.$nextTick(() => {
+          this.$refs['ecrf'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
+        })
+      }
+    },
+    setQuestionForm(questions) {
+      const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
+      questions.forEach(item => {
+        if (type.includes(item.Type)) {
+          const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
+          this.$set(this.questionForm, item.Id, answer)
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestionForm(item.Childrens)
+        }
+      })
+    },
+    async resetQuestions(obj) {
+      this.setQuestions(this.questions, obj)
+      await store.dispatch('reading/setReadingQuestionAndAnswer', { questions: this.questions, visitTaskId: this.visitTaskId })
+
+      this.getTableQuestions()
+    },
+    setQuestions(questions, obj) {
+      questions.forEach(item => {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
+          var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
+          item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
+          item.TableQuestions.Answers[idx].area1 = obj.area1
+          item.TableQuestions.Answers[idx].area2 = obj.area2
+          item.TableQuestions.Answers[idx].diff = obj.diff
+          for (const i in obj.anwsers) {
+            item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
+          }
+        }
+        if (item.Childrens.length > 0) {
+          this.setQuestions(item.Childrens, obj)
+        }
+      })
+    },
+    getQuestions(questions) {
+      questions.forEach(item => {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+          item.TableQuestions.Answers.forEach(answerObj => {
+            if (answerObj.RowId) {
+              var diffVal = this.getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
+              this.$set(answerObj, 'saveTypeEnum', isNaN(parseFloat(diffVal)) ? 1 : 2)
+            } else {
+              this.$set(answerObj, 'saveTypeEnum', 0)
+            }
+          })
+        }
+        if (item.Childrens.length > 0) {
+          this.getQuestions(item.Childrens)
+        }
+      })
+      return questions
+    },
+    getReadingQuestionAndAnswer() {
+      return new Promise(async resolve => {
+        try {
+          const loading = this.$loading({ fullscreen: true })
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(() => {
+            var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+            if (idx > -1) {
+              if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
+                this.questions = this.visitTaskList[idx].ReadingQuestions
+                this.setQuestionForm(this.questions)
+              }
+              this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
+              this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
+              this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
+            }
+          })
+          loading.close()
+          resolve()
+        } catch (e) { console.log(e) }
+      })
+    },
+    getQuestionAnswer(questions, questionMark, answers) {
+      var idx = questions.findIndex(i => i.QuestionMark === questionMark)
+      if (idx > -1) {
+        var questionId = questions[idx].Id
+        return answers[questionId]
+      } else {
+        return ''
+      }
+    },
+    isCanActiveTool(toolName) {
+      return { isCanActiveTool: true, reason: '' }
+    },
+    getMaxRowIndex(answerList) {
+      if (answerList.length > 0) {
+        var arr = []
+        answerList.forEach(item => {
+          var rowIndex = item.RowIndex
+          arr.push(parseInt(rowIndex))
+        })
+        var max = Math.max.apply(null, arr)
+        return max
+      } else {
+        return 0
+      }
+    },
+    getLesionName(orderMark, rowIndex) {
+      var lessionName = ''
+      var rowIndexArr = rowIndex.split('.')
+      var x = parseInt(rowIndexArr[0])
+      var y = parseInt(rowIndexArr[1])
+      if (y > 0) {
+        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
+      } else {
+        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
+      }
+
+      return lessionName
+    },
+    modifyMeasuredData(measureObj) {
+    },
+    // 设置测量数据
+    setMeasuredData(measureData) {
+
+    },
+    formItemChange() {
+      this.formChanged = true
+    },
+    limitBlur(qId, valueType) {
+      const value = this.questionForm[qId]
+      if (isNaN(parseInt(value))) return
+      if (valueType === 0) {
+        this.$set(this.questionForm, qId, parseInt(value))
+      } else if (valueType === 3) {
+        this.$set(this.questionForm, qId, parseFloat(value))
+      } else {
+        this.$set(this.questionForm, qId, this.numberToFixed(value))
+      }
+    },
+    numberToFixed(v) {
+      if (this.digitPlaces > -1) {
+        return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+      } else {
+        return v
+      }
+    },
+    async handleSave(index) {
+      const refName = `questions${index}`
+      const valid = await this.$refs[refName][0].validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      var answers = []
+      for (const k in this.questionForm) {
+        answers.push({ id: k, answer: this.questionForm[k] })
+      }
+      var params = {
+        visitTaskId: this.visitTaskId,
+        answers: answers
+      }
+      try {
+        await saveTaskQuestion(8, params)
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        loading.close()
+        DicomEvent.$emit('getReportInfo', true)
+        this.refreshQuestions()
+        this.formChanged = false
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    getECRFQuestions(obj) {
+      this.$refs['ecrf'].getQuestions(obj.visitTaskId)
+      this.$refs['ecrf2'].getQuestions(obj.visitTaskId)
+      this.$refs['ecrf3'].getQuestions(obj.visitTaskId)
+    },
+    async resetMeasuredData() {
+      const confirm = await this.$confirm(
+        this.$t('trials:dicomReading:message:confirmReset1'),
+        this.$t('trials:dicomReading:message:confirmReset2'),
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          const triald = this.$router.currentRoute.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getReportInfo', true)
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    async refreshQuestions() {
+      const triald = this.$router.currentRoute.query.trialId
+      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
+      this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+      this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+      this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+    },
+    receiveMsg(event) {
+    },
+    resetFormItemData(v) {
+      this.qsForm[v] = null
+    },
+    setFormItemData(obj) {
+      this.qsForm[obj.key] = obj.val
+      if (obj.key === this.m1Id || obj.key === this.m2Id || obj.key === this.m3Id) {
+        const m1 = this.qsForm[this.m1Id]
+        const m2 = this.qsForm[this.m2Id]
+        const m3 = this.qsForm[this.m3Id]
+        if (isNaN(parseFloat(m1)) || isNaN(parseFloat(m2)) || isNaN(parseFloat(m3))) {
+          this.$set(this.qsForm, this.avgId, null)
+        } else {
+          const avg = (parseFloat(m1) + parseFloat(m2) + parseFloat(m3)) / 3
+          this.$set(this.qsForm, this.avgId, this.numberToFixed(avg))
+        }
+      }
+    },
+    handleAddOrEdit(type, row, index) {
+      this.addOrEdit.title = row.QuestionName
+      this.qsList = row.TableQuestions.Questions
+      this.qsForm = {}
+      this.qsForm.questionId = row.Id
+      this.qsForm.rowId = type === 'add' ? null : row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowId : null
+      if (type === 'add') {
+        var maxIndex = this.getMaxRowIndex(row.TableQuestions.Answers)
+        this.qsForm.rowIndex = `${maxIndex + 1}.00`
+      } else {
+        this.qsForm.rowIndex = row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowIndex : null
+      }
+      row.TableQuestions.Questions.map(i => {
+        if (i.QuestionMark === 1011) {
+          this.m1Id = i.Id
+        }
+        if (i.QuestionMark === 1012) {
+          this.m2Id = i.Id
+        }
+        if (i.QuestionMark === 1013) {
+          this.m3Id = i.Id
+        }
+        if (i.QuestionMark === 1015) {
+          this.avgId = i.Id
+        }
+        let v = null
+        if (type === 'add') {
+          v = i.Type === 'number' ? undefined : null
+        } else {
+          v = row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index][i.Id] : null
+        }
+        this.$set(this.qsForm, i.Id, v)
+      })
+      this.addOrEdit.visible = true
+      this.addOrEdit.lesionType = row.LesionType
+    },
+    async saveFormData() {
+      const valid = await this.$refs.tableQsForm.validate()
+      if (!valid) return
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var answers = []
+        var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+        for (const k in this.qsForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
+            }
+          }
+        }
+
+        var params = {
+          questionId: this.qsForm.questionId,
+          rowId: this.qsForm.rowId,
+          rowIndex: this.qsForm.rowIndex,
+          visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
+          answerList: answers
+        }
+        if (this.addOrEdit.lesionType === 101) {
+          params.computationTrigger = 9
+        }
+        const res = await submitTableQuestion(params)
+        if (res.IsSuccess) {
+          // this.refreshQuestions()
+          await this.getReadingQuestionAndAnswer(this.visitTaskId)
+          this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
+          DicomEvent.$emit('getReportInfo', true)
+          // 保存成功！
+          this.addOrEdit.visible = false
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+    },
+    async handleDelete(row, index) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:reading:warnning:msg48'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        if (row.TableQuestions.Answers[index].RowId) {
+          var param = {
+            visitTaskId: this.visitTaskId,
+            questionId: row.Id,
+            rowId: row.TableQuestions.Answers[index].RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            await this.getReadingQuestionAndAnswer(this.visitTaskId)
+            DicomEvent.$emit('getReportInfo', true)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    uploadTpl(lesionType) {
+      this.upload.lesionType = lesionType
+      this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
+      this.upload.visible = true
+    },
+    async downloadTpl(lesionType) {
+      try {
+        const params = {
+          visitTaskId: this.visitTaskId
+        }
+        if (lesionType === 112) {
+          await getOCTFCTTemplate(params)
+        } else {
+          await getOCTLipidAngleTemplate(params)
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    async uploadDlgClose() {
+      await this.getReadingQuestionAndAnswer(this.visitTaskId)
+      DicomEvent.$emit('getReportInfo', true)
+      this.upload.visible = false
+    },
+    renderHeader(h, { column, $index }) {
+      const span = document.createElement('span')
+      span.innerText = column.label
+      document.body.appendChild(span)
+      const w = span.getBoundingClientRect().width
+      column.minWidth = w > 65 ? w + 10 : w > 60 ? w + 15 : w + 30
+      document.body.removeChild(span)
+      return h('span', column.label)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.measurement-wrapper{
+  height: 100%;
+  overflow-y: auto;
+  // overflow: hidden;
+
+  .container{
+    padding: 10px;
+    .basic-info{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      h3{
+        color: #ddd;
+        padding: 5px 0px;
+        margin: 0;
+      }
+      i{
+        color: #fff;
+        font-size: 22px;
+        font-weight: bold;
+        cursor: pointer;
+      }
+    }
+  }
+  .title{
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+
+  }
+  .add-icon{
+    display: inline-block;
+    padding: 5px;
+    font-weight: bold;
+    color: #ddd;
+    font-size: 15px;
+    border: 1px solid #938b8b;
+    margin-bottom: 2px;
+    cursor: pointer;
+  }
+  .add-icon:hover{
+    background-color: #607d8b;
+  }
+
+  .flex-row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    background-color: #424242;
+
+  }
+  .lesion_list{
+    position: relative;
+    /deep/ .el-form-item__label{
+      color: #c3c3c3;
+      text-align: left;
+    }
+    /deep/ .el-input .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    /deep/ .el-form-item{
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+    }
+    /deep/ .el-form-item__content{
+      flex: 1;
+    }
+    /deep/ .el-input.is-disabled .el-input__inner{
+      background-color: #646464a1;
+    }
+    /deep/ .el-select.is-disabled .el-input__inner{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content
+    .el-select{
+      width: 100%;
+    }
+  }
+  .table-wrapper {
+    ::-webkit-scrollbar {
+      width: 5px;
+      height: 8px;
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #d0d0d0;
+    }
+    /deep/ .el-table,
+    .el-table__expanded-cell {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table th,
+    .el-table tr {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr > td {
+      background-color: #000 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr:hover > td {
+      background-color: #858282 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table--border th.gutter:last-of-type {
+      border: none;
+    }
+    /deep/ .el-table__fixed-right {
+      height: 100% !important;
+    }
+    // /deep/ .el-table .cell {
+    //   line-height: 20px;
+    // }
+    /deep/ .el-table__cell {
+      padding: 5px 0;
+    }
+    /deep/.el-table__fixed-right-patch {
+      background-color: #000 !important;
+      border-color: #444444;
+    }
+    /deep/.el-table__fixed-body-wrapper tr:hover > td {
+      background-color: #000 !important;
+    }
+    /deep/.el-table--scrollable-x .el-table__body-wrapper {
+      z-index: 2;
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
new file mode 100644
index 00000000..a8dee2bb
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+    >
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ language==='en'?question.GroupEnName:question.GroupName }}
+      </h4>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
+      >
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-else-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
+          clearable
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="String(item.value)"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-else-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.DictionaryCode">
+            <el-radio
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :label="String(item.value)"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="question.TypeValue">
+            <el-radio
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-else-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 数值 -->
+        <!-- <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+        </template> -->
+        <!-- 数值类型 -->
+        <el-input
+          v-else-if="question.Type==='number'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState>=2 "
+          type="number"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+
+        <el-input
+          v-else-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          disabled
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+      </el-form-item>
+    </template>
+
+    <QuestionTableFormItem
+      v-for="item in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :question-form="questionForm"
+      :reading-task-state="readingTaskState"
+      @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  name: 'QuestionTableFormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return []
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+      digitPlaces: 2
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  mounted() {
+    this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens && question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      } else {
+        if (question.Type === 'number') {
+          v = this.limitBlur(question.ValueType, v)
+        }
+        this.$emit('setFormItemData', { key: question.Id, val: v })
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    limitBlur(valueType, value) {
+      if (isNaN(parseInt(value))) {
+        value = null
+      } else {
+        if (valueType === 0) {
+          value = parseInt(value)
+        } else if (valueType === 3) {
+          value = parseFloat(value)
+        } else {
+          value = this.numberToFixed(value)
+        }
+      }
+      return value
+    },
+    numberToFixed(v) {
+      if (this.digitPlaces > -1) {
+        return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+      } else {
+        return v
+      }
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    },
+    setFormItemData(obj) {
+      this.$emit('setFormItemData', obj)
+    },
+    limitNumbersEvent(e) {
+      // 通过正则保留两位小数点
+      let val = e.target.value
+      if (val.length > 6) val = val.slice(0, 6)
+      e.target.value = (val.match(/^\d*(\.?\d{0,3})/g)[0]) || null
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  /deep/ .el-upload--picture-card {
+    display: none;
+  }
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column !important;
+  align-items: flex-start;
+}
+/deep/ .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-input-group__append, .el-input-group__prepend{
+    padding: 0 10px;
+  }
+  /deep/ .el-form-item__content {
+    width: 100%;
+  }
+  /deep/ .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
new file mode 100644
index 00000000..15c3a9e7
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/UploadExcel.vue
@@ -0,0 +1,125 @@
+<template>
+  <el-form
+    ref="uploadExcel"
+    class="upload-excel-file"
+  >
+    <!-- 文件 -->
+    <el-form-item :label="$t('trials:consistencyCheck:label:file')">
+      <div class="upload-container">
+        <el-upload
+          class="upload-demo"
+          action
+          accept=".xlsx,.xls,.csv"
+          :before-upload="beforeUpload"
+          :http-request="handleUploadFile"
+          :on-preview="handlePreview"
+          :show-file-list="true"
+          :limit="1"
+          :on-exceed="handleExceed"
+        >
+          <el-button size="small" type="primary">
+            {{ $t('trials:consistencyCheck:dialogButton:upload') }}
+          </el-button>
+          <span
+            slot="tip"
+            style="margin-left:10px;"
+            class="el-upload__tip"
+          >
+            ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
+          </span>
+        </el-upload>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { uploadOCTFCTTemplate, uploadOCTLipidAngleTemplate } from '@/api/reading'
+export default {
+  props: {
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    lesionType: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+    beforeUpload(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        return true
+      } else {
+        // Must be xls or xlsx format
+        this.$alert(this.$t('trials:consistencyCheck:message:xlsx'))
+
+        return false
+      }
+    },
+    async handleUploadFile(param) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        var data = new FormData()
+        data.append('file', param.file)
+        data.append('visitTaskId', this.visitTaskId)
+        if (this.lesionType === 112) {
+          await uploadOCTFCTTemplate(data)
+        } else {
+          await uploadOCTLipidAngleTemplate(data)
+        }
+        this.$emit('close')
+        this.$message.success('导入成功！')
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    },
+    handlePreview(file) {
+      if (file.fullPath) {
+        window.open(file.fullPath, '_blank')
+      }
+    },
+    handleExceed(files, fileList) {
+      // Upload is currently limited to 1 file
+      this.$message.warning(this.$t('trials:consistencyCheck:message:onlyOneFile'))
+    },
+    checkFileSuffix(fileName) {
+      var typeArr = ['xls', 'xlsx', 'csv']
+      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.upload-excel-file{
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+  .account_item_clear{
+    .el-tag__close{
+      display: none !important;
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
index 88f83875..8ec6b1aa 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
+  <div class="measurement-wrapper">
 
-    <div class="container" :style="{'height':height+'px'}">
+    <div class="container">
       <div class="basic-info">
         <h3 v-if="isReadingShowSubjectInfo">
           <span v-if="subjectCode">{{ subjectCode }} </span>
@@ -147,7 +147,6 @@ export default {
   },
   data() {
     return {
-      height: window.innerHeight - 140,
       questions: [],
       activeName: '',
       activeItem: {
@@ -212,8 +211,6 @@ export default {
       callback(list)
       console.log('getAllUnSaveLesions')
     })
-
-    window.addEventListener('resize', this.setHeight)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
@@ -802,6 +799,7 @@ export default {
 
 <style lang="scss" scoped>
 .measurement-wrapper{
+  height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 4d37ebc9..07a305f5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -24,7 +24,7 @@
           { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
             message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
         ]"
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
       >
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
@@ -211,16 +211,40 @@
           </el-checkbox>
         </el-checkbox-group>
         <!-- 数值 -->
-        <el-input-number
+        <!-- <el-input-number
           v-else-if="question.Type==='number'"
           v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
-        />
+          :precision="2"
+        /> -->
+        <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2 || isFirstChangeTask"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2 || isFirstChangeTask"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2 || isFirstChangeTask"
+          />
+        </template>
         <el-input
           v-else-if="question.Type==='calculation'"
           v-model="questionForm[question.Id]"
           disabled
-        />
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
         <!-- 上传图像 -->
         <el-upload
           v-else-if="question.Type==='upload'"
@@ -326,7 +350,8 @@ export default {
       accept: '.png,.jpg,.jpeg',
       imgVisible: false,
       imageUrl: '',
-      urls: []
+      urls: [],
+      digitPlaces: 2
     }
   },
   computed: {
@@ -352,6 +377,8 @@ export default {
         })
       }
     }
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {
     formItemChange(v, question) {
@@ -461,7 +488,7 @@ export default {
 }
 .uploadWrapper{
   display: flex;
-  flex-direction: column;
+  flex-direction: column !important;
   align-items: flex-start;
 }
 /deep/ .el-input.is-disabled .el-input__inner{
@@ -470,6 +497,9 @@ export default {
   /deep/ .el-input-group__append, .el-input-group__prepend{
     padding: 0 10px;
   }
+  /deep/ .el-form-item__content {
+    width: 100%;
+  }
   /deep/ .el-select.is-disabled .el-input__inner{
     background-color: #646464a1;
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index ea58890c..c9a7e117 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -88,7 +88,7 @@ export default {
       spleenInfo: null,
       calculateSpleenStatus: '',
       formChanged: false,
-      digitPlaces: null
+      digitPlaces: 2
     }
   },
   computed: {
@@ -374,7 +374,8 @@ export default {
         DicomEvent.$emit('getReportInfo', true)
         // DicomEvent.$emit('readingPageUpdate', {})
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-        if (idx > -1 && !this.visitTaskList[idx].IsBaseLineTask) {
+        const criterionType = parseInt(localStorage.getItem('CriterionType'))
+        if (idx > -1 && !this.visitTaskList[idx].IsBaseLineTask && (criterionType === 1 || criterionType === 2 || criterionType === 3 || criterionType === 17)) {
           if (parseInt(imageQuality) === 2) {
             this.$confirm(this.$t('trials:reading:warnning:unableEvaluate'), '', {
               type: 'warning'
@@ -856,6 +857,7 @@ export default {
   .ecrf-wrapper{
     /deep/ .el-form-item__label{
       color: #c3c3c3;
+      text-align: left;
     }
     /deep/ .el-input__inner{
       background-color: transparent;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 8c39f055..e95766d2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -57,6 +57,7 @@
           :is-reading-show-subject-info="isReadingShowSubjectInfo"
           :is-reading-task-view-in-order="isReadingTaskViewInOrder"
           :is-exists-manual="isExistsManual"
+          :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
           @previewCD="previewCD"
         />
       </div>
@@ -136,6 +137,10 @@ export default {
       type: Boolean,
       required: true
     },
+    iseCRFShowInDicomReading: {
+      type: Boolean,
+      required: true
+    },
     questionFormChangeState: {
       type: Boolean,
       default() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
index b96b73df..02f9482f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
+  <div class="measurement-wrapper">
 
-    <div class="container" :style="{'height':height+'px'}">
+    <div class="container">
       <div class="basic-info">
         <h3 v-if="isReadingShowSubjectInfo">
           <span v-if="subjectCode">{{ subjectCode }} </span>
@@ -169,7 +169,6 @@ export default {
   },
   data() {
     return {
-      height: window.innerHeight - 140,
       questions: [],
       activeName: '',
       activeItem: {
@@ -234,8 +233,6 @@ export default {
     DicomEvent.$on('split', measureData => {
       this.handleSplit(measureData.RowId, measureData.QuestionId)
     })
-
-    window.addEventListener('resize', this.setHeight)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
@@ -416,9 +413,6 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
-    setHeight() {
-      this.height = window.innerHeight - 140
-    },
     getQuestionAnswer(questions, questionMark, answers) {
       var idx = questions.findIndex(i => i.QuestionMark === questionMark)
       if (idx > -1) {
@@ -1065,6 +1059,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper{
+  height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
index 68498a50..d5801ad6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="measurement-wrapper" :style="{'height':height+10+'px'}">
+  <div class="measurement-wrapper">
 
-    <div class="container" :style="{'height':height+'px'}">
+    <div class="container">
       <div class="basic-info">
         <h3 v-if="isReadingShowSubjectInfo">
           <span v-if="subjectCode">{{ subjectCode }} </span>
@@ -165,7 +165,6 @@ export default {
   },
   data() {
     return {
-      height: window.innerHeight - 140,
       questions: [],
       activeName: '',
       activeItem: {
@@ -229,8 +228,6 @@ export default {
     DicomEvent.$on('split', measureData => {
       this.handleSplit(measureData.RowId, measureData.QuestionId)
     })
-
-    window.addEventListener('resize', this.setHeight)
   },
   beforeDestroy() {
     DicomEvent.$off('loadMeasurementList')
@@ -409,9 +406,6 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
-    setHeight() {
-      this.height = window.innerHeight - 140
-    },
     getQuestionAnswer(questions, questionMark, answers) {
       var idx = questions.findIndex(i => i.QuestionMark === questionMark)
       if (idx > -1) {
@@ -994,6 +988,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .measurement-wrapper{
+  height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 9d895bc6..2e7c5019 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -102,7 +102,7 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff'}" >
+              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff'}">
                 <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
                   <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index eaf3c793..15af0d20 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -77,7 +77,7 @@
                           >
                             <div>
                               <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
                             </div>
 
                           </div>
@@ -294,7 +294,14 @@ export default {
             store.dispatch('reading/setImageloadedInfo', item)
           }
         })
-        var i = res.findIndex(s => s.isCurrentTask)
+        var i = -1
+        var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+        if (isReadingTaskViewInOrder === 2) {
+          // 受试者内随机
+          i = res.length === 2 ? 1 : -1
+        } else {
+          i = res.findIndex(s => s.isCurrentTask)
+        }
         if (i > -1) {
           var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
           if (idx > -1) {
@@ -342,8 +349,9 @@ export default {
           this.studyList = this.visitTaskList[idx].StudyList
           var sIdx = this.studyList.findIndex(s => s.IsDicom)
           if (sIdx > -1) {
-            this.studyIndex = sIdx
-            this.seriesIndex = 0
+            console.log(this.studyIndex, this.studyIndex)
+            // this.studyIndex = sIdx
+            // c = 0
             this.activeNames = [`${this.studyList[sIdx].StudyId}`]
             // 下载关键序列
             const i = this.studyList.findIndex(i => i.IsCriticalSequence)
@@ -377,8 +385,23 @@ export default {
       var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
-        // 基线
+      const studyList = this.visitTaskList[idx].StudyList.filter(i => i.IsDicom)
+      const seriesArr = studyList.map(s => s.SeriesList).flat()
+      if (isReadingTaskViewInOrder === 2) {
+        // 受试者内随机
+        if (seriesArr.length === 1) {
+          seriesList.push(seriesArr[0], seriesArr[0])
+          this.studyIndex = seriesArr[0].studyIndex
+          this.seriesIndex = seriesArr[0].seriesIndex
+          this.activeNames = [`${seriesArr[0].studyId}`]
+        } else if (seriesArr.length > 1) {
+          seriesList.push(seriesArr[0], seriesArr[1])
+          this.studyIndex = seriesArr[1].studyIndex
+          this.seriesIndex = seriesArr[1].seriesIndex
+          this.activeNames = [`${seriesArr[1].studyId}`]
+        }
+      } else if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder === 0) {
+        // 基线任务或完全随机
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
         if (Object.keys(obj).length !== 0) {
           this.studyIndex = obj.studyIndex
@@ -387,9 +410,13 @@ export default {
           this.activeNames = [`${this.studyList[ this.studyIndex].StudyId}`]
           this.studyList[ obj.studyIndex].SeriesList[obj.seriesIndex].isFirstRender = true
         } else {
-          // 初始化问题表单
           if (this.studyList.length > 0) {
-            this.activeNames = [`${this.studyList[0].StudyId}`]
+            // 初始化问题表单
+            this.studyIndex = seriesArr[0].studyIndex
+            this.seriesIndex = seriesArr[0].seriesIndex
+            this.activeNames = [`${seriesArr[0].studyId}`]
+            seriesList.push(seriesArr[0])
+            // this.activeNames = [`${this.studyList[0].StudyId}`]
           }
 
           // DicomEvent.$emit('loadMeasurementList', { visitTaskId: this.visitTaskList[idx].VisitTaskId, taskBlindName: this.visitTaskList[idx].TaskBlindName })
@@ -413,6 +440,7 @@ export default {
 
           const firstObj = this.getFirstMarkedSeries(this.visitTaskList[bsIdx].MeasureData, [...this.visitTaskList[bsIdx].StudyList])
           seriesList.push(firstObj.series)
+
           const secondObj = this.getSecondMarkedSeries(firstObj, { ...this.visitTaskList[idx] })
           this.studyIndex = secondObj.studyIndex
           this.seriesIndex = secondObj.seriesIndex
@@ -552,22 +580,20 @@ export default {
           obj.series = seriesObj.series
           obj.seriesId = seriesObj.series.seriesId
           obj.isMarked = false
-        } else {
-          const sIdx = studyList.findIndex(s => s.IsDicom)
-          if (sIdx > -1) {
-          // 判断是否存在层厚为5的序列，否则显示第一个检查的第一个序列
-            const series = studyList[sIdx].SeriesList[0]
-            var imageIdIndex = series.imageIds.length > 1 ? Math.floor(series.imageIds.length / 2) - 1 : 0
-            obj.studyIndex = sIdx
-            obj.seriesIndex = 0
-            obj.series = series
-            obj.series.imageIdIndex = imageIdIndex >= 0 ? imageIdIndex : 0
-            obj.seriesId = series.seriesId
-            obj.isMarked = false
-          }
         }
       }
-
+      if (Object.keys(obj).length === 0) {
+        const sIdx = studyList.findIndex(s => s.IsDicom)
+        if (sIdx > -1) {
+          obj.studyIndex = sIdx
+          obj.seriesIndex = 0
+          obj.series = studyList[obj.studyIndex].SeriesList[obj.seriesIndex]
+          const imageIdIndex = Math.floor(obj.series.imageIds.length / 2)
+          obj.series.imageIdIndex = imageIdIndex >= 0 ? imageIdIndex : 0
+          // obj.seriesId = series.seriesId
+          obj.isMarked = false
+        }
+      }
       return obj
     },
     strSimilarity2Number(s, t) {
@@ -668,7 +694,11 @@ export default {
       this.currentSeriesIndex = seriesIndex
       var idx = this.visitTaskIdx
       const imageIds = []
-      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+      if (instanceInfo.KeyFramesList.length > 0) {
+        instanceInfo.KeyFramesList.map(i => {
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${i}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+        })
+      } else if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
         for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 319140db..32d43319 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -1064,16 +1064,15 @@ export default {
         var frame = imageInfo.frame
         this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
+        const element = this.$refs.canvas
+        cornerstone.enable(element)
+        element.tabIndex = 0
+        element.focus()
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
         this.toggleClipPlay(false)
         this.toolState.viewportInvert = false
         this.toolState.dicomInfoVisible = false
-
-        const element = this.$refs.canvas
-        cornerstone.enable(element)
-        element.tabIndex = 0
-        element.focus()
         var scope = this
         // var p = parseInt(new Date().getTime())
         // requestPoolManager.loadAndCacheImagePlus(this.stack.imageIds[this.stack.currentImageIdIndex], this.stack.seriesId, p*100).then(image=>{
@@ -1637,7 +1636,7 @@ export default {
     resetWwwc() {
       this.toolState.viewportInvert = false
       var viewport = cornerstone.getViewport(this.canvas)
-      viewport.invert = false
+      // viewport.invert = false
       var image = cornerstone.getImage(this.canvas)
       viewport.voi.windowWidth = image.windowWidth
       viewport.voi.windowCenter = image.windowCenter
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index e5eb871a..80645b29 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -106,7 +106,8 @@
                       v-if="item.val === 1"
                       class="divider"
                       content-position="center"
-                    >{{ ` ${$t("trials:reading:title:preset")}` }}</el-divider>
+                      >{{ ` ${$t('trials:reading:title:preset')}` }}</el-divider
+                    >
                   </li>
                 </ul>
               </div>
@@ -163,7 +164,7 @@
               <svg-icon icon-class="magnifier" class="svg-icon" />
             </div>
             <!-- 缩放 -->
-            <div class="text">{{ $t("trials:reading:button:zoom") }}</div>
+            <div class="text">{{ $t('trials:reading:button:zoom') }}</div>
           </div>
         </el-tooltip>
 
@@ -183,7 +184,7 @@
               <svg-icon icon-class="move" class="svg-icon" />
             </div>
             <!-- 移动 -->
-            <div class="text">{{ $t("trials:reading:button:move") }}</div>
+            <div class="text">{{ $t('trials:reading:button:move') }}</div>
           </div>
         </el-tooltip>
 
@@ -210,7 +211,7 @@
               </div>
               <!-- 旋转 -->
               <div class="text">
-                {{ $t("trials:reading:button:rotate")
+                {{ $t('trials:reading:button:rotate')
                 }}<i class="el-icon-caret-bottom" />
               </div>
               <div class="dropdown-content">
@@ -223,7 +224,8 @@
                     <a
                       href="#"
                       @click.prevent="setDicomCanvasRotate(rotate.val)"
-                    >{{ rotate.label }}</a>
+                      >{{ rotate.label }}</a
+                    >
                   </li>
                 </ul>
               </div>
@@ -258,8 +260,8 @@
             <div class="text">
               {{
                 fitType === 1
-                  ? $t("trials:reading:button:fitWindow")
-                  : $t("trials:reading:button:fitImage")
+                  ? $t('trials:reading:button:fitWindow')
+                  : $t('trials:reading:button:fitImage')
               }}
             </div>
           </div>
@@ -282,7 +284,7 @@
             </div>
             <!-- 同步 -->
             <div class="text">
-              {{ $t("trials:reading:button:imageIndexSync") }}
+              {{ $t('trials:reading:button:imageIndexSync') }}
             </div>
           </div>
         </el-tooltip>
@@ -307,7 +309,7 @@
               <svg-icon icon-class="image" class="svg-icon" />
             </div>
             <!-- 截屏 -->
-            <div class="text">{{ $t("trials:reading:button:screenShot") }}</div>
+            <div class="text">{{ $t('trials:reading:button:screenShot') }}</div>
           </div>
         </el-tooltip>
 
@@ -316,7 +318,7 @@
             <div slot="content">
               <div v-if="tool.disabledReason">
                 <h4 style="margin: 0; padding-bottom: 2px">{{ tool.text }}</h4>
-                <br>{{ tool.disabledReason }}
+                <br />{{ tool.disabledReason }}
               </div>
               <div v-else>{{ tool.text }}</div>
             </div>
@@ -365,7 +367,7 @@
               <svg-icon icon-class="clear" class="svg-icon" />
             </div>
             <!-- 缩放 -->
-            <div class="text">{{ $t("trials:dicom-show:Eraser") }}</div>
+            <div class="text">{{ $t('trials:dicom-show:Eraser') }}</div>
           </div>
         </el-tooltip>
         <div class="tool-frame">
@@ -467,11 +469,13 @@
             <div class="icon" @click.prevent="resetViewport">
               <svg-icon icon-class="refresh" class="svg-icon" />
             </div>
-            <div class="text">{{ $t("trials:reading:button:reset") }}</div>
+            <div class="text">{{ $t('trials:reading:button:reset') }}</div>
           </div>
         </el-tooltip>
         <el-tooltip
-          v-if="trialCriterion.ImageUploadEnum > 0"
+          v-if="
+            trialCriterion.ImageUploadEnum > 0 && currentReadingTaskState < 2
+          "
           v-hasPermi="['role:ir']"
           class="item"
           effect="dark"
@@ -482,7 +486,7 @@
             <div class="icon" @click.prevent="openUploadImage('upload')">
               <i class="el-icon-upload2 svg-icon" />
             </div>
-            <div class="text">{{ $t("trials:reading:button:upload") }}</div>
+            <div class="text">{{ $t('trials:reading:button:upload') }}</div>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -505,7 +509,7 @@
             <div class="icon" @click.prevent="openUploadImage('download')">
               <i class="el-icon-download svg-icon" />
             </div>
-            <div class="text">{{ $t("trials:reading:button:download") }}</div>
+            <div class="text">{{ $t('trials:reading:button:download') }}</div>
           </div>
         </el-tooltip>
 
@@ -515,17 +519,19 @@
               v-if="isExistsManual"
               type="text"
               @click="previewManuals"
-            >{{ $t("trials:reading:button:handbooks") }}</el-button>
+              >{{ $t('trials:reading:button:handbooks') }}</el-button
+            >
             <!-- 临床数据 -->
             <el-button
               v-if="isExistsClinicalData"
               type="text"
               @click="previewCD"
-            >{{ $t("trials:reading:button:clinicalData") }}</el-button>
+              >{{ $t('trials:reading:button:clinicalData') }}</el-button
+            >
             <!-- <el-button v-if="isExistsNoDicomFile" type="text" @click="previewNoneDicoms">非Dicom文件</el-button> -->
 
             <el-button type="text" @click="previewConfig">{{
-              $t("trials:reading:button:customCfg")
+              $t('trials:reading:button:customCfg')
             }}</el-button>
           </div>
         </div>
@@ -625,7 +631,7 @@
       :fullscreen="isFullscreen"
     >
       <span slot="title" class="dialog-footer">
-        <span>{{ $t("trials:reading:button:handbooks") }}</span>
+        <span>{{ $t('trials:reading:button:handbooks') }}</span>
         <span style="position: absolute; right: 20px; font-size: 20px">
           <svg-icon
             :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
@@ -646,12 +652,29 @@
     <!--    <button :title="$t('trials:dicom-show:Eraser')" class="btn-link" data-tool="Eraser" @click="setToolActive($event,'Eraser')">-->
     <!--      <svg-icon icon-class="clear" style="font-size:20px;" />-->
     <!--    </button>-->
-    <upload-image
+    <!-- <upload-image
       v-if="uploadImageVisible"
       :visible.sync="uploadImageVisible"
       :subject-id="subjectId"
       :criterion="trialCriterion"
       :status="uploadStatus"
+    /> -->
+    <upload-dicom-and-nonedicom
+      v-if="uploadImageVisible"
+      :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion"
+      :visible.sync="uploadImageVisible"
+      :VisitTaskId="taskId"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+    />
+    <download-dicom-and-nonedicom
+      v-if="downloadImageVisible"
+      :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion"
+      :TaskId="taskId"
+      :visible.sync="downloadImageVisible"
     />
   </div>
 </template>
@@ -676,7 +699,8 @@ import DicomEvent from './../components/DicomEvent'
 import { mapGetters } from 'vuex'
 import store from '@/store'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
-import uploadImage from '@/components/uploadImage'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import { getCriterionReadingInfo } from '@/api/trials'
 export default {
   name: 'DicomViewer',
@@ -688,48 +712,49 @@ export default {
     Others,
     Manuals,
     MeasurementList,
-    'upload-image': uploadImage
+    'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
+    'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
   },
   props: {
     isExistsClinicalData: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isExistsNoDicomFile: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isExistsManual: {
       type: Boolean,
-      required: true
+      required: true,
     },
     isReadingShowSubjectInfo: {
       type: Boolean,
-      required: true
+      required: true,
     },
     isReadingTaskViewInOrder: {
       type: Number,
-      required: true
+      required: true,
     },
     IseCRFShowInDicomReading: {
       type: Boolean,
-      required: true
+      required: true,
     },
     subjectId: {
       type: String,
       required: true,
-      default: ''
+      default: '',
     },
     trialReadingCriterionId: {
       type: String,
       required: true,
-      default: ''
+      default: '',
     },
     trialId: {
       type: String,
       required: true,
-      default: ''
-    }
+      default: '',
+    },
   },
   data() {
     return {
@@ -738,7 +763,7 @@ export default {
         { index: 0, row: 1, col: 1, name: 'A' },
         { index: 1, row: 1, col: 2, name: 'A|A' },
         { index: 2, row: 1, col: 2, name: 'A|B' },
-        { index: 3, row: 2, col: 2, name: 'A|A|A|A' }
+        { index: 3, row: 2, col: 2, name: 'A|A|A|A' },
         // { index: 2, row: 2, col: 1 },
         // { index: 3, row: 2, col: 2 }
       ],
@@ -747,7 +772,7 @@ export default {
         { label: this.$t('trials:reading:button:rotateVertical'), val: 2 }, // 垂直翻转
         { label: this.$t('trials:reading:button:rotateHorizontal'), val: 3 }, // 水平翻转
         { label: this.$t('trials:reading:button:rotateTurnLeft'), val: 4 }, // 左转90度
-        { label: this.$t('trials:reading:button:rotateTurnRight'), val: 5 } // 右转90度
+        { label: this.$t('trials:reading:button:rotateTurnRight'), val: 5 }, // 右转90度
       ],
       maxCanvas: 1,
       layoutRow: 1,
@@ -755,8 +780,8 @@ export default {
       currentDicomCanvasIndex: 0,
       currentDicomCanvas: {
         toolState: {
-          clipPlaying: false
-        }
+          clipPlaying: false,
+        },
       },
       colormapsList: [],
       rotateList: [],
@@ -773,7 +798,7 @@ export default {
           text: this.$t('trials:reading:button:length'),
           icon: 'length',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         // 长短径测量
         {
@@ -781,7 +806,7 @@ export default {
           text: this.$t('trials:reading:button:bidirectional'),
           icon: 'bidirection',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         // 矩形工具
         {
@@ -789,7 +814,7 @@ export default {
           text: this.$t('trials:reading:button:rectangle'),
           icon: 'rectangle',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         // 圆形工具
         {
@@ -797,7 +822,7 @@ export default {
           text: this.$t('trials:reading:button:elliptical'),
           icon: 'oval',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         // 箭头工具
         {
@@ -805,8 +830,8 @@ export default {
           text: this.$t('trials:reading:button:arrowAnnotate'),
           icon: 'arrow',
           isDisabled: false,
-          disabledReason: ''
-        }
+          disabledReason: '',
+        },
       ],
 
       fitType: 0,
@@ -818,25 +843,25 @@ export default {
           label: this.$t('trials:reading:button:wwwcDefault'),
           val: -1,
           ww: null,
-          wc: null
+          wc: null,
         }, // 默认值
         {
           label: this.$t('trials:reading:button:wwwcCustom'),
           val: 0,
           ww: null,
-          wc: null
+          wc: null,
         }, // 自定义
         {
           label: this.$t('trials:reading:button:wwwcRegion'),
           val: 1,
           ww: null,
-          wc: null
+          wc: null,
         }, // 区域窗宽
         { label: 'CT Brain', wc: 40, ww: 80 },
         { label: 'CT Lungs', wc: -400, ww: 1500 },
         { label: 'CT Abdomen', wc: 60, ww: 400 },
         { label: 'CT Liver', wc: 40, ww: 400 },
-        { label: 'CT Bone', wc: 300, ww: 1500 }
+        { label: 'CT Bone', wc: 300, ww: 1500 },
       ],
       activeSeries: {},
       seriesStack: [],
@@ -844,13 +869,13 @@ export default {
       isScrollSync: false,
       imageIndexSync: {
         sourceCanvas: '',
-        targetCanvas: []
+        targetCanvas: [],
       },
       isFirstRender: false,
       customWwc: { visible: false, title: null }, // 自定义调窗
       personalConfigDialog: {
         visible: false,
-        title: this.$t('trials:reading:button:customCfg')
+        title: this.$t('trials:reading:button:customCfg'),
       }, // 个性化配置
       layout: '',
       isFirstNotLinked: false,
@@ -861,15 +886,20 @@ export default {
       manualsDialog: { visible: false },
       clipPlaying: false,
       fps: 15,
-      // 上传
-      uploadImageVisible: false,
       trialCriterion: {},
-      uploadStatus: 'upload'
+      // 上传
+      downloadImageVisible: false,
+      uploadImageVisible: false,
+      uploadSubjectId: null,
+      uploadSubjectCode: null,
+      uploadTrialCriterion: {},
+      uploadStatus: 'upload',
+      taskId: '',
     }
   },
 
   computed: {
-    ...mapGetters(['visitTaskList', 'currentReadingTaskState'])
+    ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
   },
   watch: {
     currentReadingTaskState: {
@@ -888,7 +918,7 @@ export default {
             this.activeTool = ''
           }
         }
-      }
+      },
     },
     currentDicomCanvasIndex: {
       immediate: true,
@@ -905,8 +935,8 @@ export default {
           this.clipPlaying = false
           this.fps = 15
         }
-      }
-    }
+      },
+    },
   },
   mounted() {
     this.getTrialCriterion()
@@ -919,7 +949,7 @@ export default {
     // cornerstone.imageCache.setMaximumSizeBytes(maximumSizeInBytes)
     this.customWwc = {
       visible: false,
-      title: this.$t('trials:reading:dagTitle:wwwcCustom')
+      title: this.$t('trials:reading:dagTitle:wwwcCustom'),
     }
     this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
     if (this.CriterionType === 10) {
@@ -929,15 +959,15 @@ export default {
           text: this.$t('trials:reading:button:arrowAnnotate'),
           icon: 'arrow',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         {
           toolName: 'RectangleRoi',
           text: this.$t('trials:reading:button:rectangle'),
           icon: 'rectangle',
           isDisabled: false,
-          disabledReason: ''
-        }
+          disabledReason: '',
+        },
       ]
     } else if (this.CriterionType === 17) {
       this.measuredTools = [
@@ -946,22 +976,22 @@ export default {
           text: this.$t('trials:reading:button:length'),
           icon: 'length',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         {
           toolName: 'RectangleRoi',
           text: this.$t('trials:reading:button:rectangle'),
           icon: 'rectangle',
           isDisabled: false,
-          disabledReason: ''
+          disabledReason: '',
         },
         {
           toolName: 'ArrowAnnotate',
           text: this.$t('trials:reading:button:arrowAnnotate'),
           icon: 'arrow',
           isDisabled: false,
-          disabledReason: ''
-        }
+          disabledReason: '',
+        },
       ]
     }
     this.rotateList[0] = '1'
@@ -976,7 +1006,7 @@ export default {
     window.addEventListener('resize', this.setCanvasStyle)
 
     // DicomEvent.$on('updateImage', (instanceId) => {
-      
+
     //   for (let i = 0; i < this.maxCanvas; i++) {
     //     var stack = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack
     //     if (stack.studyId) {
@@ -993,7 +1023,7 @@ export default {
       }
       console.log('getMeasureData')
     })
-    
+
     DicomEvent.$on('getScreenshots', (callback) => {
       var base64Str =
         this.$refs[
@@ -1041,7 +1071,7 @@ export default {
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.trialId,
-        TrialReadingCriterionId: this.trialReadingCriterionId
+        TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
           this.trialCriterion = res.Result
@@ -1049,26 +1079,32 @@ export default {
         .catch(() => {})
     },
     openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex((i) => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
+      this.uploadSubjectCode = this.$route.query.subjectCode||localStorage.getItem("subjectCode")
+      this.uploadSubjectId = this.$route.query.subjectId||localStorage.getItem("subjectId")
+      this.uploadTrialCriterion = this.trialCriterion
       this.uploadStatus = status
-      this.uploadImageVisible = true
+      this[`${status}ImageVisible`] = true
     },
     async getWwcTpl() {
       // const loading = this.$loading({ fullscreen: true })
       try {
         let res = await getUserWLTemplateList()
         this.customWwcTpl = []
-          res.Result.map((i) => {
-            this.customWwcTpl.push({
-              label: i.TemplateName,
-              wc: i.WL,
-              ww: i.WW
-            })
+        res.Result.map((i) => {
+          this.customWwcTpl.push({
+            label: i.TemplateName,
+            wc: i.WL,
+            ww: i.WW,
           })
-          this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
-      } catch(e) {
+        })
+        this.wwwcArr = [...this.defaultWwwc, ...this.customWwcTpl]
+      } catch (e) {
         console.log(e)
       }
-      
     },
     async getHotKeys() {
       // const loading = this.$loading({ fullscreen: true })
@@ -1084,11 +1120,11 @@ export default {
             key: item.Keyboardkey,
             code: item.Code,
             text: item.Text,
-            shortcutKeyEnum: item.ShortcutKeyEnum
+            shortcutKeyEnum: item.ShortcutKeyEnum,
           })
         })
         this.bindHotKey()
-      } catch(e) {
+      } catch (e) {
         console.log(e)
       }
     },
@@ -1105,7 +1141,7 @@ export default {
           key: item.keys.controlKey.key,
           code: item.keys.controlKey.code,
           text: item.keys.text,
-          shortcutKeyEnum: item.label
+          shortcutKeyEnum: item.label,
         })
       })
 
@@ -1148,7 +1184,7 @@ export default {
           DicomEvent.$emit('selectSeries', {
             seriesId: series.seriesId,
             studyId: series.studyId,
-            offset: -1
+            offset: -1,
           })
         } else if (shortcutKeyEnum === 4) {
           // 下一个序列
@@ -1157,7 +1193,7 @@ export default {
           DicomEvent.$emit('selectSeries', {
             seriesId: series.seriesId,
             studyId: series.studyId,
-            offset: 1
+            offset: 1,
           })
         } else if (shortcutKeyEnum === 5) {
           // 上一张图像
@@ -1287,7 +1323,7 @@ export default {
           top: '72px',
           left: '205px',
           right: '350px',
-          zIndex: 10
+          zIndex: 10,
         }
         this.canvasW = window.innerWidth - 570 + 'px'
         this.canvasH = window.innerHeight - 130 + 'px'
@@ -1387,10 +1423,7 @@ export default {
         // this.$refs['measurementList'].initPage(dicomSeries)
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
-          store.dispatch(
-            'reading/setLastCanvasTaskId',
-            dicomSeries.visitTaskId
-          )
+          store.dispatch('reading/setLastCanvasTaskId', dicomSeries.visitTaskId)
         }
       })
     },
@@ -1421,10 +1454,7 @@ export default {
 
         store.dispatch('reading/setActiveSeries', dicomSeries)
         if (this.currentDicomCanvasIndex === this.maxCanvas - 1) {
-          store.dispatch(
-            'reading/setLastCanvasTaskId',
-            dicomSeries.visitTaskId
-          )
+          store.dispatch('reading/setLastCanvasTaskId', dicomSeries.visitTaskId)
         }
       })
     },
@@ -1474,7 +1504,7 @@ export default {
               visitTaskId = this.visitTaskList[i].VisitTaskId
             }
             this.getFirstSeries(activeSeries, visitTaskId).then(
-              async(baseSerires) => {
+              async (baseSerires) => {
                 this.seriesStack = [baseSerires, activeSeries]
                 this.currentDicomCanvasIndex = 1
                 store.dispatch(
@@ -1502,7 +1532,7 @@ export default {
             activeSeries,
             activeSeries,
             activeSeries,
-            activeSeries
+            activeSeries,
           ]
           this.currentDicomCanvasIndex = 3
           store.dispatch(
@@ -1521,9 +1551,7 @@ export default {
         for (let i = 0; i < this.maxCanvas && i < seriesStack.length; i++) {
           this.canvasObj[i] = seriesStack[i]
           let s = Object.assign({}, seriesStack[i])
-          promiseArr.push(
-            this.$refs[`dicomCanvas${i}`][0].loadImageStack(s)
-          )
+          promiseArr.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(s))
         }
         Promise.all(promiseArr)
           .then(() => {
@@ -1585,24 +1613,24 @@ export default {
                 trialId: this.trialId,
                 subjectVisitId: this.visitTaskList[taskIdx].VisitId,
                 visitTaskId: this.visitTaskList[taskIdx].VisitTaskId,
-                taskBlindName: this.visitTaskList[taskIdx].TaskBlindName
+                taskBlindName: this.visitTaskList[taskIdx].TaskBlindName,
               })
             }
             if (!this.visitTaskList[taskIdx].readingQuestionsInit) {
               await store.dispatch('reading/getReadingQuestionAndAnswer', {
                 trialId: this.trialId,
-                visitTaskId: this.visitTaskList[taskIdx].VisitTaskId
+                visitTaskId: this.visitTaskList[taskIdx].VisitTaskId,
               })
             }
             if (!this.visitTaskList[taskIdx].questionsInit) {
               await store.dispatch('reading/getDicomReadingQuestionAnswer', {
                 trialId: this.trialId,
-                visitTaskId: this.visitTaskList[taskIdx].VisitTaskId
+                visitTaskId: this.visitTaskList[taskIdx].VisitTaskId,
               })
             }
 
             await store.dispatch('reading/setStatus', {
-              visitTaskId: this.visitTaskList[taskIdx].VisitTaskId
+              visitTaskId: this.visitTaskList[taskIdx].VisitTaskId,
             })
           }
           firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, obj)
@@ -1696,8 +1724,7 @@ export default {
           var studyList = this.visitTaskList[index].StudyList
           var studyId = this.visitTaskList[index].MeasureData[idx].StudyId
           var seriesId = this.visitTaskList[index].MeasureData[idx].SeriesId
-          var instanceId =
-            this.visitTaskList[index].MeasureData[idx].InstanceId
+          var instanceId = this.visitTaskList[index].MeasureData[idx].InstanceId
           var studyIdx = studyList.findIndex(
             (study) => study.StudyId === studyId
           )
@@ -1706,10 +1733,15 @@ export default {
               (s) => s.seriesId === seriesId
             )
             if (seriesIdx > -1) {
-              var series = studyList[studyIdx].SeriesList[seriesIdx];
-              let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
-              let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
-              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+              var series = studyList[studyIdx].SeriesList[seriesIdx]
+              let frame =
+                this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+              let filterStr = series.isExistMutiFrames
+                ? `frame=${frame}&instanceId=${instanceId}`
+                : `instanceId=${instanceId}`
+              var instanceIdx = series.imageIds.findIndex((imageId) =>
+                imageId.includes(filterStr)
+              )
               // var instanceIdx = series.instanceList.findIndex(
               //   (imageId) => !!~imageId.indexOf(instanceId)
               // );
@@ -1738,16 +1770,14 @@ export default {
             i.description,
             baseSeries.description
           ),
-          index
+          index,
         }
       })
       similarArr = similarArr.sort((a, b) => {
         return b.similar - a.similar
       })
       const i =
-        similarArr[0] && similarArr[0].similar > 0.85
-          ? similarArr[0].index
-          : -1
+        similarArr[0] && similarArr[0].similar > 0.85 ? similarArr[0].index : -1
       if (i > -1) {
         obj = seriesList[i]
       }
@@ -1822,7 +1852,7 @@ export default {
           trialId: this.trialId,
           subjectVisitId: this.visitTaskList[index].VisitId,
           visitTaskId: this.visitTaskList[index].VisitTaskId,
-          taskBlindName: this.visitTaskList[index].TaskBlindName
+          taskBlindName: this.visitTaskList[index].TaskBlindName,
         })
 
         await store.dispatch(
@@ -1841,16 +1871,14 @@ export default {
             i.description,
             baseSeries.description
           ),
-          index
+          index,
         }
       })
       similarArr = similarArr.sort((a, b) => {
         return b.similar - a.similar
       })
       const i =
-        similarArr[0] && similarArr[0].similar > 0.85
-          ? similarArr[0].index
-          : -1
+        similarArr[0] && similarArr[0].similar > 0.85 ? similarArr[0].index : -1
       if (i > -1) {
         obj = seriesList[i]
       }
@@ -2025,9 +2053,7 @@ export default {
     },
     // 鼠标移入测量工具时，判断工具是否可激活
     enter(e, toolName) {
-      var i = this.measuredTools.findIndex(
-        (item) => item.toolName === toolName
-      )
+      var i = this.measuredTools.findIndex((item) => item.toolName === toolName)
       if (i === -1) return
       var isCurrentTask =
         this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0]
@@ -2089,8 +2115,11 @@ export default {
               `dicomCanvas${this.currentDicomCanvasIndex}`
             ][0].setToolActive(toolName)
           }
-        } else if (dicomSeries.isCurrentTask &&
-          isMeasuredTool && dicomSeries.readingTaskState >= 2) {
+        } else if (
+          dicomSeries.isCurrentTask &&
+          isMeasuredTool &&
+          dicomSeries.readingTaskState >= 2
+        ) {
           if (this.activeTool === toolName) {
             this.$refs[
               `dicomCanvas${this.currentDicomCanvasIndex}`
@@ -2162,9 +2191,7 @@ export default {
         ][0].fitToWindow()
       } else if (toolName === 'fitToImage') {
         this.fitType = 1
-        this.$refs[
-          `dicomCanvas${this.currentDicomCanvasIndex}`
-        ][0].fitToImage()
+        this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].fitToImage()
       }
       this.activeTool = toolName
     },
@@ -2181,7 +2208,9 @@ export default {
       const isLoaded = this.getSeriesLoadStatus()
       if (!isLoaded) return
       this.clipPlaying = isPlay
-      this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(this.fps)
+      this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(
+        this.fps
+      )
       this.$refs[
         `dicomCanvas${this.currentDicomCanvasIndex}`
       ][0].toggleClipPlay(isPlay)
@@ -2297,8 +2326,8 @@ export default {
     previewManuals() {
       this.isFullscreen = false
       this.manualsDialog.visible = true
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index 8952b7d0..ad2b12f8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -25,14 +25,14 @@
     </div>
     <div class="questions-footer">
       <i class="el-icon-question feedback-icon" @click="openFeedBackTable" />
-      <el-button v-if="readingTaskState<2" style="margin-right: 10px" size="small" @click="handleSave(true)">
+      <el-button v-if="readingTaskState<2" style="margin-right: 10px" type="primary" size="small" @click="handleSave(true)">
         {{$t('common:button:save')}}
       </el-button>
-      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" size="small" @click="skipTask">
+      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" style="margin-right: 10px" size="small" @click="skipTask">
         <!-- 跳过 -->
         {{ $t('trials:readingReport:button:skip') }}
       </el-button>
-      <el-button style="margin-right: 10px" size="small" v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
+      <el-button style="margin-right: 10px" type="primary" size="small" v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
         {{ $t('common:button:submit') }}</el-button>
     </div>
     <!-- 签名框 -->
@@ -244,6 +244,7 @@ export default {
         params.StudyId = params.questionInfo.StudyId
         params.SeriesId = params.questionInfo.SeriesId
         params.InstanceId = params.questionInfo.InstanceId
+        params.NumberOfFrames = measureData.frame
         submitCustomTag(params).then(() => {
           this.measuredDataVisible = false
           DicomEvent.$emit('updateImage')
@@ -282,6 +283,7 @@ export default {
        } else {
         let params = JSON.parse(JSON.stringify(this.measureData))
         params.measureData = JSON.stringify(this.measureData)
+        params.NumberOfFrames = this.measureData.frame
         submitCustomTag(params).then(async (res) => {
           this.measuredDataVisible = false
           this.form.measuredDataName = ''
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index c40d341a..bf289f13 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -239,7 +239,7 @@
 <!--            </span>-->
 <!--          </div>-->
         </el-upload>
-        <el-dialog
+        <!-- <el-dialog
           v-if="question.Type==='upload'"
           append-to-body
           :visible.sync="imgVisible"
@@ -250,7 +250,20 @@
               加载中<span class="dot">...</span>
             </div>
           </el-image>
-        </el-dialog>
+        </el-dialog> -->
+        <viewer
+          v-if="question.Type==='upload' && imgVisible"
+          :ref="imageUrl"
+          style="margin:0 10px;"
+          :images="[imageUrl]"
+        >
+          <img
+            v-show="false"
+            crossorigin="anonymous"
+            :src="imageUrl"
+            alt="Image"
+          >
+        </viewer>
       </el-form-item>
     </template>
 
@@ -801,6 +814,9 @@ export default {
       }else{
         this.imageUrl = this.OSSclientConfig.basePath + file.url
         this.imgVisible = true
+        this.$nextTick(()=>{
+          this.$refs[this.imageUrl].$viewer.show()
+        })
       }
     },
     // 删除图片
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
index d6e7223a..ec700485 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
@@ -138,27 +138,41 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <img
-              class="el-upload-list__item-thumbnail"
-              :src="OSSclientConfig.basePath + file.url"
-              alt=""
+            <viewer
+              :ref="file.url"
+              :images="[imageUrl]"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+              "
             >
-            <span class="el-upload-list__item-actions">
-              <span
-                class="el-upload-list__item-preview"
-                @click="handlePictureCardPreview(file)"
-              >
-                <i class="el-icon-zoom-in" />
-              </span>
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                crossOrigin="anonymous"
+                alt=""
+                style="max-width: 100%; max-height: 100%"
+              />
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
+                >
+                  <i class="el-icon-zoom-in" />
+                </span>
 
-              <span
-                v-if="readingTaskState < 2"
-                class="el-upload-list__item-delete"
-                @click="handleRemove(file)"
-              >
-                <i class="el-icon-delete" />
+                <span
+                  v-if="readingTaskState < 2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
               </span>
-            </span>
+            </viewer>
           </div>
         </el-upload>
         <el-dialog
@@ -308,7 +322,7 @@ export default {
         window.open(this.OSSclientConfig.basePath + file.url,'_blank')
       }else{
         this.imageUrl = this.OSSclientConfig.basePath + file.url
-        this.imgVisible = true
+        this.$refs[file.url].$viewer.show();
       }
     },
     // 删除图片
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index 54122c9b..501f72dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -148,27 +148,41 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <img
-              class="el-upload-list__item-thumbnail"
-              :src="OSSclientConfig.basePath + file.url"
-              alt=""
+            <viewer
+              :ref="file.url"
+              :images="[imageUrl]"
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+              "
             >
-            <span class="el-upload-list__item-actions">
-              <span
-                class="el-upload-list__item-preview"
-                @click="handlePictureCardPreview(file)"
-              >
-                <i class="el-icon-zoom-in" />
-              </span>
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                crossOrigin="anonymous"
+                alt=""
+                style="max-width: 100%; max-height: 100%"
+              />
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
+                >
+                  <i class="el-icon-zoom-in" />
+                </span>
 
-              <span
-                v-if="readingTaskState < 2"
-                class="el-upload-list__item-delete"
-                @click="handleRemove(file)"
-              >
-                <i class="el-icon-delete" />
+                <span
+                  v-if="readingTaskState < 2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
               </span>
-            </span>
+            </viewer>
           </div>
         </el-upload>
         <el-dialog
@@ -492,7 +506,8 @@ export default {
         window.open(this.OSSclientConfig.basePath + file.url,'_blank')
       }else{
         this.imageUrl = this.OSSclientConfig.basePath + file.url
-        this.imgVisible = true
+        // this.imgVisible = true
+        this.$refs[file.url].$viewer.show()
       }
       
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
index cd6aa01c..db9855ae 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
@@ -82,7 +82,7 @@ export default {
           var answers = []
           for (const k in this.questionForm) {
             if (this.questionForm[k] instanceof Array) {} else {
-              answers.push({ id: k, answer: this.questionForm[k].toString() })
+              answers.push({ id: k, answer: this.questionForm[k] })
             }
           }
           var params = {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
index d53bf99d..5d075688 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
@@ -14,41 +14,43 @@
     >
       <i slot="default" class="el-icon-plus" />
       <div slot="file" slot-scope="{file}">
-        <img
-          class="el-upload-list__item-thumbnail"
-          crossOrigin="Anonymous"
-          :src="OSSclientConfig.basePath + file.url"
-          alt=""
+        <viewer
+          :ref="file.url"
+          :images="[imageUrl]"
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+          "
         >
-        <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <i class="el-icon-zoom-in" />
-                      </span>
+          <img
+            class="el-upload-list__item-thumbnail"
+            :src="OSSclientConfig.basePath + file.url"
+            crossOrigin="anonymous"
+            alt=""
+            style="max-width: 100%; max-height: 100%"
+          />
+          <span class="el-upload-list__item-actions">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
+              <i class="el-icon-zoom-in" />
+            </span>
 
-                      <span
-                        v-if="readingTaskState < 2"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete" />
-                      </span>
-                    </span>
+            <span
+              v-if="readingTaskState < 2"
+              class="el-upload-list__item-delete"
+              @click="handleRemove(file)"
+            >
+              <i class="el-icon-delete" />
+            </span>
+          </span>
+        </viewer>
       </div>
     </el-upload>
-    <el-dialog
-      append-to-body
-      :visible.sync="imgVisible"
-      width="600px"
-    >
-      <el-image :src="imageUrl" width="100%" crossOrigin="Anonymous">
-        <div slot="placeholder" class="image-slot">
-          加载中<span class="dot">...</span>
-        </div>
-      </el-image>
-    </el-dialog>
   </div>
 </template>
 
@@ -142,7 +144,8 @@ name: "CustomizeReportPageUpload",
         window.open(this.OSSclientConfig.basePath + file.url,'_blank')
       }else{
         this.imageUrl = this.OSSclientConfig.basePath + file.url
-        this.imgVisible = true
+        // this.imgVisible = true
+        this.$refs[file.url].$viewer.show()
       }
     },
     // 删除图片
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 411bca95..3b94abff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -87,7 +87,7 @@
                                         </div> -->
                             <div>
                               <div>{{ instance.InstanceNumber }}</div>
-                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                              <div>{{ `${instance.NumberOfFrames > 0 ? instance.KeyFramesList.length > 0 ? instance.KeyFramesList.length : instance.NumberOfFrames : 1} frame` }}</div>
                             </div>
 
                           </div>
@@ -279,7 +279,14 @@ export default {
             store.dispatch('reading/setImageloadedInfo', item)
           }
         })
-        var i = res.findIndex(s => s.isCurrentTask)
+        var i = -1
+        var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+        if (isReadingTaskViewInOrder === 2) {
+          // 受试者内随机
+          i = res.length === 2 ? 1 : -1
+        } else {
+          i = res.findIndex(s => s.isCurrentTask)
+        }
         if (i > -1) {
           var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
           if (idx > -1) {
@@ -356,7 +363,22 @@ export default {
       var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
-      if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) {
+      if (isReadingTaskViewInOrder === 2) {
+        // 受试者内随机
+        const studyList = this.visitTaskList[idx].StudyList.filter(i => i.IsDicom)
+        const seriesArr = studyList.map(s => s.SeriesList).flat()
+        if (seriesArr.length === 1) {
+          seriesList.push(seriesArr[0], seriesArr[0])
+          this.studyIndex = seriesArr[0].studyIndex
+          this.seriesIndex = seriesArr[0].seriesIndex
+          this.activeNames = [`${seriesArr[0].studyId}`]
+        } else if (seriesArr.length > 1) {
+          seriesList.push(seriesArr[0], seriesArr[1])
+          this.studyIndex = seriesArr[1].studyIndex
+          this.seriesIndex = seriesArr[1].seriesIndex
+          this.activeNames = [`${seriesArr[1].studyId}`]
+        }
+      } else if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder === 0){
         // 基线
         const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList])
         if (Object.keys(obj).length !== 0) {
@@ -533,19 +555,18 @@ export default {
           obj.series = seriesObj.series
           obj.seriesId = seriesObj.series.seriesId
           obj.isMarked = false
-        } else {
-          const sIdx = studyList.findIndex(s => s.IsDicom)
-          if (sIdx > -1) {
-          // 判断是否存在层厚为5的序列，否则显示第一个检查的第一个序列
-            const series = studyList[sIdx].SeriesList[0]
-            var imageIdIndex = series.imageIds.length > 1 ? Math.floor(series.imageIds.length / 2) - 1 : 0
-            obj.studyIndex = sIdx
-            obj.seriesIndex = 0
-            obj.series = series
-            obj.series.imageIdIndex = imageIdIndex >= 0 ? imageIdIndex : 0
-            obj.seriesId = series.seriesId
-            obj.isMarked = false
-          }
+        }
+      }
+      if (Object.keys(obj).length === 0) {
+        const sIdx = studyList.findIndex(s => s.IsDicom)
+        if (sIdx > -1) {
+          obj.studyIndex = sIdx
+          obj.seriesIndex = 0
+          obj.series = studyList[obj.studyIndex].SeriesList[obj.seriesIndex]
+          const imageIdIndex = Math.floor(obj.series.imageIds.length / 2)
+          obj.series.imageIdIndex = imageIdIndex >= 0 ? imageIdIndex : 0
+          // obj.seriesId = series.seriesId
+          obj.isMarked = false
         }
       }
 
@@ -652,7 +673,11 @@ export default {
       this.studyList[studyIndex].SeriesList[seriesIndex].measureData = this.measureData
       var dicomStatck = Object.assign({},this.studyList[studyIndex].SeriesList[seriesIndex])
       const imageIds = []
-      if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
+      if (instanceInfo.KeyFramesList.length > 0) {
+        instanceInfo.KeyFramesList.map(i => {
+          imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${i}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
+        })
+      } else if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
         for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
           imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${instanceInfo.Path}?frame=${j}&instanceId=${instanceInfo.Id}&visitTaskId=${this.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${idx}`)
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue b/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
index bab4f6e9..fd4babe4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/Manuals.vue
@@ -21,7 +21,7 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
@@ -44,7 +44,8 @@ export default {
       },
       fileList: [],
       loading: false,
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index e353be3f..00b535fd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -19,11 +19,12 @@
             :is-exists-clinical-data="isExistsClinicalData"
             :is-exists-no-dicom-file="isExistsNoDicomFile"
             :is-exists-manual="isExistsManual"
+            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
             @previewCD="previewCD"
           />
         </el-tab-pane>
         <!-- 报告 -->
-        <el-tab-pane :label="$t('trials:reading:tabTitle:report')" name="report">
+        <el-tab-pane v-if="!IseCRFShowInDicomReading" :label="$t('trials:reading:tabTitle:report')" name="report">
           <ReportPage v-if="tabs.includes('report') && isShow" ref="reportPage" :question-form-change-state="questionFormChangeState" :visit-task-id="visitTaskId" />
         </el-tab-pane>
       </el-tabs>
@@ -267,7 +268,7 @@ export default {
     // this.readingTool = this.$router.currentRoute.query.readingTool
     this.TrialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
     // this.isNewSubject = this.$router.currentRoute.query.isNewSubject
-    localStorage.setItem('isReadingTaskViewInOrder', this.isReadingTaskViewInOrder)
+
     // if (this.isNewSubject && this.isReadingTaskViewInOrder !== 0) {
     //   // 已开始受试者${this.subjectCode}阅片任务
     //   var msg = this.$t('trials:reading:warnning:msg1')
@@ -318,6 +319,7 @@ export default {
         //   }
         // }
         this.subjectId = res.Result.SubjectId
+        localStorage.setItem('subjectId', res.Result.SubjectId)
         this.subjectCode = res.Result.SubjectCode
         localStorage.setItem('subjectCode', res.Result.SubjectCode)
         this.taskBlindName = res.Result.TaskBlindName
@@ -332,6 +334,7 @@ export default {
         this.digitPlaces = res.Result.DigitPlaces
         this.IseCRFShowInDicomReading = res.Result.IseCRFShowInDicomReading
         this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder
+        localStorage.setItem('isReadingTaskViewInOrder', this.isReadingTaskViewInOrder)
         localStorage.setItem('CriterionType', res.Result.CriterionType)
         localStorage.setItem('digitPlaces', res.Result.DigitPlaces)
         this.readingCategory = res.Result.ReadingCategory
diff --git a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
index fe4aac74..355fed85 100644
--- a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue
@@ -15,7 +15,7 @@
           </div>
           <!-- 文件层级 -->
           <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
-            <slot name="empty">暂无数据</slot>
+            <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
           </div>
           <div v-else id="imgList" style="height:100%;">
             <div
@@ -28,7 +28,14 @@
               class="img-box"
               @click="selected(item,i,j,true)"
             >
-              {{ `${j+1}. ${item.FileName}` }}
+              <div v-if="item.FileName.length < 15" class="img-text">
+                {{ `${j+1}. ${item.FileName}` }}
+              </div>
+              <el-tooltip v-else :content="item.FileName" placement="bottom">
+                <div class="img-text">
+                  {{ `${j+1}. ${item.FileName}` }}
+                </div>
+              </el-tooltip>
             </div>
 
           </div>
@@ -96,7 +103,7 @@ export default {
       visistTaskId: '',
       taskBlindName: '',
       readingTaskState: 2,
-      bp:[]
+      bp: []
     }
   },
   async mounted() {
@@ -188,7 +195,7 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
       })
       return newArr.join(' | ')
     }
@@ -265,13 +272,19 @@ export default {
     display: inline-block;
     box-sizing: border-box;
     border-bottom: 2px solid #f3f3f3;
-    width: 180px;
-    height: 50px;
-    line-height: 50px;
     cursor: pointer;
     // margin-bottom: 5px;
     padding-left: 5px;
   }
+  .img-text{
+    display: inline-block;
+    width: 200px;
+    height: 50px;
+    line-height: 50px;
+    overflow: hidden;
+    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    white-space: nowrap;
+  }
   .img-box:nth-last-child(1){
     margin-bottom: 0px;
   }
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index 1280f856..5a8c2668 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -143,7 +143,6 @@ import { getMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from './FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
   name: 'ChatForm',
   components: { FeedbackForm },
@@ -177,7 +176,6 @@ export default {
     }
   },
   mounted() {
-    this.initializeViewer()
     this.getMessageList()
   },
   methods: {
@@ -213,11 +211,6 @@ export default {
       this.imagePath = `${this.OSSclientConfig.basePath}${path}`
       this.previewDialog = true
       this.$refs[path][0].$viewer.show()
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
     }
   }
 
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
index 33a6899f..69501103 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue
@@ -486,9 +486,13 @@ export default {
 }
 /deep/  .el-upload-list__item {
     transition: none !important;
+    width: 140px;
+    height: 140px;
+    margin: 0 10px 5px 0;
   }
   /deep/  .el-upload-list__item-thumbnail {
       /* 图片在方框内显示长边 */
+      width: 100%;
       object-fit: scale-down !important;
   }
 }
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 272555a2..b2012239 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -171,7 +171,6 @@ import { getMedicalReviewDialog, sendMedicalReviewDialog } from '@/api/trials'
 import FeedbackForm from '@/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm'
 import mimAvatar from '@/assets/MIM.png'
 import irAvatar from '@/assets/IR.png'
-import Viewer from 'v-viewer'
 export default {
   name: 'ChatForm',
   components: {
@@ -207,7 +206,6 @@ export default {
     }
   },
   mounted() {
-    this.initializeViewer()
     this.getMessageList()
   },
   methods: {
@@ -261,11 +259,6 @@ export default {
       this.irFeedbackForm.title = this.$t('trials:medicalFeedback:title:feedback')
 
       this.irFeedbackForm.visible = true
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
-      })
     }
   }
 
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 6956cc0b..6cf4e87e 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -197,7 +197,6 @@
 import { saveMedicalReviewInfo } from "@/api/trials";
 import ChatForm from "./ChatForm";
 import CloseQC from "./CloseQC";
-import Viewer from "v-viewer";
 export default {
   name: "AuditConclusions",
   components: {
@@ -253,7 +252,6 @@ export default {
     };
   },
   mounted() {
-    this.initializeViewer();
     this.initForm();
   },
   methods: {
@@ -435,21 +433,9 @@ export default {
       var idx = this.fileList.findIndex((i) => i.url === file.url);
       if (idx === -1) return;
       this.fileList.splice(idx, 1);
-    },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: {
-          zoomIn: true,
-          zoomOut: true,
-          rotateLeft: true,
-          rotateRight: true,
-          flipHorizontal: true,
-          flipVertical: true,
-        },
-      });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .conclusions {
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue
index fb009954..c9ef1bb6 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/Criterions.vue
@@ -1,17 +1,15 @@
 <template>
-  <!--  <el-tabs v-model="activeName" v-loading="loading" style="min-height:500px">-->
-  <!--    <el-tab-pane-->
-  <!--      v-for="criterion in criterions"-->
-  <!--      :key="criterion.ReadingQuestionCriterionTrialId"-->
-  <!--      :label="criterion.ReadingQuestionCriterionTrialName"-->
-  <!--      :name="criterion.ReadingQuestionCriterionTrialId"-->
-  <!--    >-->
-  <div v-loading="loading" style="min-height:500px">
+  <div style="min-height:500px">
+    <h3 v-if="isReadingShowSubjectInfo" style="padding: 5px 0px;margin: 0;">
+      <span v-if="subjectCode">{{ subjectCode }} </span>
+      <span style="margin-left:5px;">{{ taskBlindName }}</span>
+    </h3>
     <ECRF
       :trial-id="trialId"
       :subject-id="subjectId"
       :criterion-id="criterionId"
       :visit-task-id="visitTaskId"
+      :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
     />
   </div>
 
@@ -43,6 +41,22 @@ export default {
     criterionId: {
       type: String,
       required: true
+    },
+    subjectCode: {
+      type: String,
+      required: true
+    },
+    taskBlindName: {
+      type: String,
+      required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    iseCRFShowInDicomReading: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/ECRF.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/ECRF.vue
index 95a11518..71ff3fda 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/ECRF.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/ECRF.vue
@@ -77,13 +77,13 @@
 
       <el-form-item v-if="readingTaskState < 2">
         <div style="text-align:center;">
-          <el-button type="primary" @click="skipTask">
+          <el-button type="primary" @click="skipTask" v-if="iseCRFShowInDicomReading">
             {{ $t('trials:readingReport:button:skip') }}
           </el-button>
-          <el-button type="primary" @click="handleSave">
+          <el-button type="primary" @click="handleSave"> 
             {{ $t('common:button:save') }}
           </el-button>
-          <el-button type="primary" @click="handleSubmit">
+          <el-button type="primary" @click="handleSubmit" v-if="iseCRFShowInDicomReading">
             {{ $t('common:button:submit') }}
           </el-button>
         </div>
@@ -116,7 +116,7 @@ import const_ from '@/const/sign-code'
 import FormItem from './FormItem'
 import SignForm from '@/views/trials/components/newSignForm'
 // import { getToken } from '@/utils/auth'
-// import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
   name: 'ECRF',
   components: {
@@ -139,6 +139,10 @@ export default {
     visitTaskId: {
       type: String,
       required: true
+    },
+    iseCRFShowInDicomReading: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -158,6 +162,9 @@ export default {
   },
   mounted() {
     this.getQuestions()
+    DicomEvent.$on('refreshQuestionAnswer', _ => {
+      this.getQuestions()
+    })
   },
   methods: {
     async getQuestions() {
@@ -243,6 +250,7 @@ export default {
       try {
         const res = await saveVisitTaskQuestions(params)
         if (res.IsSuccess) {
+          DicomEvent.$emit('getReportInfo', true)
           this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
         this.loading = false
@@ -285,6 +293,7 @@ export default {
         const res = await submitVisitTaskQuestionsInDto(params)
         this.loading = false
         if (res.IsSuccess) {
+          DicomEvent.$emit('getReportInfo', true)
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
           this.$refs['signForm'].btnLoading = false
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/FormItem.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/FormItem.vue
index bc9b032e..f22de0ef 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/FormItem.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/FormItem.vue
@@ -120,11 +120,26 @@
         </el-checkbox-group>
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input-number
-          v-if="question.Type==='number'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState >= 2"
-        />
+        <template v-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            precision="0"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+          />
+        </template>
+
         <!-- 上传图像 -->
         <el-upload
           v-if="question.Type==='upload'"
@@ -222,7 +237,8 @@ export default {
       accept: '.png,.jpg,.jpeg',
       imgVisible: false,
       imageUrl: '',
-      urls: []
+      urls: [],
+      digitPlaces: null
     }
   },
   watch: {
@@ -245,6 +261,7 @@ export default {
         })
       }
     }
+    this.digitPlaces = parseInt(localStorage.getItem('digitPlaces'))
   },
   methods: {
     formItemChange(v, question) {
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue
new file mode 100644
index 00000000..050df293
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue
@@ -0,0 +1,956 @@
+<template>
+  <div class="report-wrapper">
+    <el-card v-loading="loading" shadow="never" style="display:flex;flex-direction: column;">
+      <div slot="header" class="clearfix report-header">
+        <h3 style="margin:0;padding:0;">{{ $t('trials:readingReport:title:eicrf') }}</h3>
+        <div style="margin-left:auto">
+          <!-- <el-switch
+            v-model="isShowDetail"
+            :active-text="$t('trials:readingReport:title:expandDetails')"
+            :inactive-text="$t('trials:readingReport:title:collapseDetails')"
+            style="margin-right:5px"
+            @change="handleShowDetail"
+          /> -->
+          <el-button
+            v-if="readingTaskState<2"
+            type="primary"
+            size="small"
+            @click="skipTask"
+          >
+            <!-- 跳过 -->
+            {{ $t('trials:readingReport:button:skip') }}
+          </el-button>
+          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="getReportInfo">{{ $t('trials:readingReport:button:refresh') }}</el-button>
+          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleSave(true)">{{ $t('common:button:save') }}</el-button>
+          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleConfirm">{{ $t('common:button:submit') }}</el-button>
+        </div>
+      </div>
+      <div style="flex: 1">
+        <el-table
+          v-if="taskQuestions.length > 0"
+          ref="reportList"
+          v-adaptive="{bottomOffset:0}"
+          :data="taskQuestions"
+          row-key="Id"
+          border
+          default-expand-all
+          height="100"
+          :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
+          size="mini"
+        >
+          <el-table-column
+            prop=""
+            label=""
+            show-overflow-tooltip
+            width="350px"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName : scope.row.QuestionName }}</span>
+              <span
+                v-else
+                style="font-weight: bold;font-size: 16px;color: #f44336;"
+              >
+                {{ scope.row.GroupName }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-for="task in visitTaskList"
+            :key="task.VisitTaskId"
+            prop="date"
+            show-overflow-tooltip
+            width="200px"
+          >
+            <template slot="header">
+              <div v-if="task.IsCurrentTask">
+                {{ task.BlindName }}
+              </div>
+              <div v-else>
+                <div>
+                  {{ task.BlindName }}
+                  <el-button type="text" size="small" @click="previewDicoms(task)">
+                    <span class="el-icon-view" />
+                  </el-button>
+                </div>
+                <!--                <div v-if="task.LatestScanDate">-->
+                <!--                  {{ task.LatestScanDate.split(' ')[0] }}-->
+                <!--                </div>-->
+                <!-- {{ `（影像点击跳转）` }} -->
+                <!--                {{ $t('trials:readingReport:button:jump') }}-->
+              </div>
+            </template>
+            <template slot-scope="scope">
+              <template v-if="readingTaskState<2 && task.VisitTaskId === visitTaskId && (scope.row.Type==='input' || scope.row.Type==='number' || scope.row.Type==='select' || scope.row.Type==='textarea' || scope.row.Type==='radio')">
+                <template>
+                  <!-- 输入框 -->
+                  <div>
+                    <template v-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
+                    <el-input
+                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type==='input' || scope.row.Type==='textarea') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
+                      size="mini"
+                    />
+                    <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type==='input' || scope.row.Type==='textarea')">
+                      {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
+                    </span>
+                    <el-input
+                      v-else-if="(scope.row.Type==='input' || scope.row.Type==='textarea') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId]"
+                      size="mini"
+                    />
+                    <span v-else-if="scope.row.Type==='input' || scope.row.Type==='textarea'">
+                      {{ questionForm[scope.row.QuestionId] }}
+                    </span>
+                    <el-select
+                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type==='select' || scope.row.Type==='radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
+                      size="mini"
+                      clearable
+                    >
+                      <template>
+                        <el-option
+                          v-for="val in scope.row.TypeValue.split('|')"
+                          :key="val"
+                          :label="val"
+                          :value="val"
+                        />
+                      </template>
+                    </el-select>
+                    <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='select'">
+                      {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
+                    </span>
+                    <el-select
+                      v-else-if="(scope.row.Type==='select' || scope.row.Type==='radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId]"
+                      size="mini"
+                      clearable
+                    >
+                      <template>
+                        <el-option
+                          v-for="val in scope.row.TypeValue.split('|')"
+                          :key="val"
+                          :label="val"
+                          :value="val"
+                        />
+                      </template>
+                    </el-select>
+                    <span v-else-if="scope.row.Type==='select' || scope.row.Type==='radio'">
+                      {{ questionForm[scope.row.QuestionId] }}
+                    </span>
+                    <el-input
+                      v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
+                      :disabled="scope.row.DataSource === 1"
+                      size="mini"
+                      @blur="limitBlur(questionForm[scope.row.QuestionId][scope.row.xfIndex], scope.row.TableQuestionId, scope.row.ValueType)"
+                      @focus="() => {questionId = scope.row.QuestionId}"
+                    >
+                      <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}</template>
+                      <template v-else-if="scope.row.ValueType === 2" slot="append">%</template>
+                    </el-input>
+                    <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='number' && (scope.row.xfIndex || scope.row.xfIndex === 0)">
+                      <template v-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]))? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+                      </template>
+                      <template v-else-if="scope.row.ValueType === 2">
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])) ? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]} %` }}
+                      </template>
+                      <template v-else>
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])) ? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]}` }}
+                      </template>
+                    </span>
+                    <el-input
+                      v-else-if="scope.row.DataSource !== 1 && scope.row.Type==='number' && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                      v-model="questionForm[scope.row.QuestionId]"
+                      :disabled="scope.row.DataSource === 1"
+                      size="mini"
+                      @blur="limitBlur(questionForm, scope.row.QuestionId, scope.row.ValueType)"
+                      @focus="() => {questionId = scope.row.QuestionId}"
+                    >
+                      <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}</template>
+                      <template v-else-if="scope.row.ValueType === 2" slot="append">%</template>
+                    </el-input>
+                    <span v-else-if="scope.row.Type==='number'">
+                      <template v-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId]))? questionForm[scope.row.QuestionId]:`${questionForm[scope.row.QuestionId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+                      </template>
+                      <template v-else-if="scope.row.ValueType === 2">
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ? questionForm[scope.row.QuestionId]:`${questionForm[scope.row.QuestionId]} %` }}
+                      </template>
+                      <template v-else>
+                        {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ? questionForm[scope.row.QuestionId] : questionForm[scope.row.QuestionId] }}
+                      </template>
+                    </span>
+                  </div>
+                </template>
+              </template>
+              <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.Type === 'upload'">
+                <UploadFile
+                  v-if="scope.row.Type==='upload' && (scope.row.xfIndex || scope.row.xfIndex === 0)"
+                  :visit-task-id="visitTaskId"
+                  :question="scope.row"
+                  :task="task"
+                  :reading-task-state="readingTaskState"
+                  :init-url="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
+                  @setImageUrl="(url) => {setImageUrl(scope.row.QuestionId, scope.row.xfIndex, scope.row.TableQuestionId, url, scope.row.RowId)}"
+                />
+                <UploadFile
+                  v-else-if="scope.row.Type==='upload'"
+                  :visit-task-id="visitTaskId"
+                  :question="scope.row"
+                  :task="task"
+                  :reading-task-state="readingTaskState"
+                  :init-url="questionForm[scope.row.QuestionId]"
+                  @setImageUrl="(url) => {setImageUrl(scope.row.QuestionId, scope.row.xfIndex, scope.row.TableQuestionId, url)}"
+                />
+              </template>
+              <template v-else-if="scope.row.Type === 'upload'">
+                <UploadFile
+                  v-if="scope.row.Type==='upload' && (scope.row.xfIndex || scope.row.xfIndex === 0)"
+                  :visit-task-id="visitTaskId"
+                  :question="scope.row"
+                  :task="task"
+                  :reading-task-state="readingTaskState"
+                  :init-url="scope.row.Answers[task.VisitTaskId]"
+                />
+                <UploadFile
+                  v-else-if="scope.row.Type==='upload'"
+                  :visit-task-id="visitTaskId"
+                  :question="scope.row"
+                  :task="task"
+                  :reading-task-state="readingTaskState"
+                  :init-url="scope.row.Answers[task.VisitTaskId]"
+                />
+              </template>
+              <template v-else-if="scope.row.QuestionType=== 22">
+                {{ scope.row.Answers[task.VisitTaskId] === '-1' ? '未知' : scope.row.Answers[task.VisitTaskId] }}
+              </template>
+              <template v-else-if="scope.row.DictionaryCode">
+                {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
+              </template>
+              <template v-else-if="CriterionType === 10">
+                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}` }}
+              </template>
+              <template v-else-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
+              <template v-else-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
+                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+              </template>
+              <template v-else-if="scope.row.ValueType === 2">
+                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]} %` }}
+              </template>
+              <template v-else-if="scope.row.Answers && scope.row.Answers.hasOwnProperty(task.VisitTaskId)">
+                {{ scope.row.Answers[task.VisitTaskId] }}
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+
+    <!-- 签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <div slot="title">
+        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+      </div>
+      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { changeCalculationAnswer, getReadingReportEvaluation, submitDicomVisitTask, verifyVisitTaskQuestions, getQuestionCalculateRelation } from '@/api/trials'
+import { setSkipReadingCache } from '@/api/reading'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import UploadFile from './UploadFile'
+import const_ from '@/const/sign-code'
+import SignForm from '@/views/trials/components/newSignForm'
+import { getToken } from '@/utils/auth'
+import store from '@/store'
+export default {
+  name: 'Report',
+  components: { SignForm, UploadFile },
+  props: {
+    trialId: {
+      type: String,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    subjectId: {
+      type: String,
+      required: true
+    },
+    readingTool: {
+      type: String,
+      required: true
+    },
+    criterionType: {
+      type: String,
+      required: true
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+      currentUser: zzSessionStorage.getItem('userName'),
+      signVisible: false,
+      signCode: null,
+      visitTaskList: [],
+      taskQuestions: [],
+      loading: false,
+      answers: [],
+      readingTaskState: 2,
+      tumorEvaluate: null,
+      currentEvaluateResult: null,
+      isExistDisease: null,
+      currentExistDisease: null,
+      currentTaskReason: '',
+      answerArr: [],
+      questions: [],
+      isShowDetail: false,
+      CriterionType: 0,
+      CalculationList: [],
+      TrialReadingCriterionId: null,
+      tableAnswers: {},
+      questionForm: {},
+      questionId: null
+    }
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v, oldv) {
+        try {
+          if (!v[this.questionId] || !oldv[this.questionId]) return
+        } catch (e) {
+        }
+        this.formItemNumberChange(this.questionId, false)
+      }
+    },
+    taskQuestions() {
+      this.$nextTick(() => {
+        this.setScrollTop()
+      })
+    }
+  },
+  async mounted() {
+    this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
+    this.digitPlaces = parseInt(localStorage.getItem('digitPlaces'))
+    this.TrialReadingCriterionId = this.$route.query.TrialReadingCriterionId
+    window.addEventListener('resize', () => {
+      this.handleResize()
+      this.setScrollTop()
+    })
+    DicomEvent.$on('getReportInfo', isRefresh => {
+      if (!isRefresh) return
+      this.getReportInfo()
+    })
+    await this.getQuestionCalculateRelation()
+    this.getReportInfo()
+  },
+  beforeDestroy() {
+    DicomEvent.$off('getReportInfo')
+  },
+  methods: {
+    limitBlur(questionForm, id, valueType) {
+      const value = questionForm[id]
+      if (valueType === 0) {
+        this.$set(questionForm, id, parseInt(value))
+      } else if (valueType === 3) {
+        this.$set(questionForm, id, parseFloat(value))
+      } else {
+        this.$set(questionForm, id, parseFloat(value).toFixed(this.digitPlaces))
+      }
+    },
+    setImageUrl(qid, index, tqid, url, RowId) {
+      if (index || index === 0) {
+        // 表格问题
+        this.$set(this.questionForm[qid][index], tqid, url)
+        this.$set(this.questionForm[qid][index], tqid + '_RowId', RowId)
+        // this.questionForm[qid][index][tqid] = url
+      } else {
+        // 非表格问题
+        this.questionForm[qid] = url
+      }
+    },
+    getTagterAnswers(list, questionId) {
+      list.forEach(v => {
+        if (v.QuestionId === questionId) {
+          return Object.assign({}, v.Answers)
+        } else if (v.Childrens.length > 0) {
+          return this.getTagterAnswers(v.Childrens, questionId)
+        }
+      })
+    },
+    formItemNumberChange(questionId, isTable) {
+      if (isTable) {
+        this.CalculationList.forEach((v, i) => {
+          var find = v.CalculateQuestionList.filter(o => {
+            return o.QuestionId === questionId
+          })
+          // find的自动计算值number
+          if (find) {
+            var num = this.logic(v)
+            if (num !== false) {
+              this.$set(this.questionForm, v.QuestionId, num)
+              // this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+            }
+          }
+        })
+      } else {
+        this.CalculationList.forEach(v => {
+          var find = v.CalculateQuestionList.filter(o => {
+            return o.TableQuestionId === questionId
+          })
+          // find的自动计算值number
+          if (find) {
+            var num = this.logic(v)
+            if (num !== false) {
+              this.$set(this.questionForm, v.QuestionId, num)
+              // this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+            }
+          }
+        })
+      }
+      // this.$emit('formItemNumberChange')
+    },
+    getTableAnswers(QuestionId, list) {
+      var arr = []
+      window.xfList = list
+      list.forEach((v, i) => {
+        var obj = {}
+        v.Childrens.forEach((o) => {
+          this.$set(o, 'xfIndex', i)
+          obj[o.TableQuestionId + '_RowId'] = o.RowId
+          obj[o.TableQuestionId] = o.Answers[this.visitTaskId]
+        })
+        arr.push(obj)
+      })
+      return arr
+    },
+    InitVisitTaskQuestionForm() {
+      this.taskQuestions.map((v, i) => {
+        if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table') return
+        if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+          this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId])
+        }
+        if (v.Type === 'table') {
+          var tableAnswers = this.getTableAnswers(v.QuestionId, v.Childrens, i)
+          this.$set(this.questionForm, v.QuestionId, tableAnswers)
+          // this.$set(v, 'xfIndex', i)
+        }
+        if (v.Type === 'number') {
+          let val = null
+          if (v.ValueType === 0) {
+            val = parseInt(v.Answers[this.visitTaskId])
+          } else if (v.ValueType === 3) {
+            val = v.Answers[this.visitTaskId]
+          } else {
+            val = v.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : v.Answers[this.visitTaskId]
+          }
+          this.$set(this.questionForm, v.QuestionId, val)
+        }
+        if (v.Childrens.length > 0) {
+          this.setChild(v.Childrens)
+        }
+      })
+      this.formItemNumberChange(this.questionId, false)
+    },
+    setChild(obj) {
+      obj.forEach((i, index) => {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table') {
+          this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId])
+        }
+        if (i.Type === 'table') {
+          var tableAnswers = this.getTableAnswers(i.QuestionId, i.Childrens, index)
+          this.$set(this.questionForm, i.QuestionId, tableAnswers)
+        }
+        if (i.Type === 'number') {
+          let val = null
+          if (i.ValueType === 0) {
+            val = parseInt(i.Answers[this.visitTaskId])
+          } else if (i.ValueType === 3) {
+            val = i.Answers[this.visitTaskId]
+          } else {
+            val = i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId]
+          }
+          this.$set(this.questionForm, i.QuestionId, val)
+        }
+        if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table') {
+          this.setChild(i.Childrens)
+        }
+      })
+    },
+    getQuestionCalculateRelation() {
+      return new Promise(resolve => {
+        getQuestionCalculateRelation({
+          TrialReadingCriterionId: this.TrialReadingCriterionId
+        }).then(res => {
+          this.CalculationList = res.Result
+          resolve()
+        })
+      })
+    },
+    logic(rules, num = 0) {
+      try {
+        if (rules.CalculateQuestionList.length === 0) {
+          return false
+        }
+        rules.CalculateQuestionList.forEach((o, i) => {
+          if (i === 0) {
+            if (rules.CustomCalculateMark > 4) {
+              switch (rules.CustomCalculateMark) {
+                case 5:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num *= parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  break
+                case 6:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = isNaN(parseFloat(q[o.TableQuestionId])) ? null : parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num += isNaN(parseFloat(q[o.TableQuestionId])) ? null : parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  break
+                case 7:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num += parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
+                  break
+                case 8:
+                  var arr = []
+                  this.questionForm[o.QuestionId].forEach(q => {
+                    arr.push(q[o.TableQuestionId])
+                  })
+                  num = arr.length === 0 ? 0 : Math.max(...arr)
+                  break
+                case 9:
+                  // eslint-disable-next-line no-redeclare
+                  var arr = []
+                  this.questionForm[o.QuestionId].forEach(q => {
+                    arr.push(q[o.TableQuestionId])
+                  })
+                  num = arr.length === 0 ? 0 : Math.min(...arr)
+                  break
+              }
+            } else {
+              num = parseFloat(this.questionForm[o.TableQuestionId])
+            }
+          } else {
+            switch (rules.CustomCalculateMark) {
+              case 1:
+                num += parseFloat(this.questionForm[o.TableQuestionId])
+                break
+              case 2:
+                num -= parseFloat(this.questionForm[o.TableQuestionId])
+                break
+              case 3:
+                num *= parseFloat(this.questionForm[o.TableQuestionId])
+                break
+              case 4:
+                num /= parseFloat(this.questionForm[o.TableQuestionId])
+                // num /= parseFloat(this.questionForm[o.TableQuestionId])
+                break
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      var digitPlaces = parseInt(localStorage.getItem('digitPlaces'))
+      if (rules.ValueType === 2) {
+        num = num * 100
+      }
+      return isNaN(num) ? '' : isFinite(num) ? num.toFixed(digitPlaces) : '∞'
+    },
+    getReportInfo() {
+      this.loading = true
+      var params = {
+        visitTaskId: this.visitTaskId,
+        trialId: this.$router.currentRoute.query.trialId
+      }
+      this.taskQuestions = []
+      getReadingReportEvaluation(params).then(res => {
+        this.readingTaskState = res.Result.ReadingTaskState
+        this.tumorEvaluate = res.Result.CalculateResult.TumorEvaluate ? parseInt(res.Result.CalculateResult.TumorEvaluate) : null
+        this.isExistDisease = res.Result.CalculateResult.IsExistDisease ? parseInt(res.Result.CalculateResult.IsExistDisease) : null
+        this.answerArr = []
+        this.questions = res.Result.TaskQuestions.concat()
+        var taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null, null)
+        taskQuestions.forEach(item => {
+          this.$set(this.taskQuestions, this.taskQuestions.length, item)
+        })
+        this.visitTaskList = res.Result.VisitTaskList
+        this.InitVisitTaskQuestionForm()
+        this.handleResize()
+        this.setScrollTop()
+        this.loading = false
+      }).catch(() => { this.loading = false })
+    },
+    setScrollTop(a) {
+      setTimeout(() => {
+        this.$nextTick(() => {
+          if (this.$refs.reportList) {
+            this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
+            this.$refs.reportList.bodyWrapper.scrollTop = this.$refs.reportList.bodyWrapper.scrollHeight
+          }
+        })
+      }, 50)
+    },
+    getQuestions(questions, isNTFilterLength, lesionType, isLymphNodes) {
+      const arr = []
+      if (questions.length !== 0) {
+        questions.forEach((item) => {
+          // 过滤病灶标识  病灶名称  部位  器官  位置  是否淋巴结
+          // 非靶病灶和新病灶 过滤长径和短径信息
+          // 非淋巴结靶病灶 过滤短径
+
+          lesionType = item.LesionType
+          var filterArr = []
+          if ((item.LesionType === 1 || item.LesionType === 2) && isNTFilterLength) {
+            filterArr = [0, 1, 3, 4, 5, 6, 2, 8, 10]
+          } else {
+            filterArr = [3, 4, 5, 6, 2, 8, 10]
+          }
+          if (lesionType === 0 && isLymphNodes === 0 && !this.isShowDetail && this.CriterionType === 1) {
+            filterArr.push(1)
+          }
+          if (!(filterArr.includes(item.QuestionMark))) {
+            const obj = item
+            this.$set(obj, 'Answers', {})
+            // obj.Answers = {}
+            if (item.RowIndex > 0) {
+              var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
+              var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10)
+
+              if (idx > -1) {
+                if (item.Childrens[idx].Answer.length > 0) {
+                  var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '')
+                  var part = ''
+                  if (obj.IsCanEditPosition) {
+                    part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}`
+                  } else {
+                    part = `${item.Childrens[idx].Answer[k].Answer}`
+                  }
+
+                  if (item.SplitOrMergeLesionName && k > -1) {
+                    obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})`
+                    // obj.QuestionName = `${obj.QuestionName} `
+                  } else if (!item.SplitOrMergeLesionName && k > -1) {
+                    obj.QuestionName = `${obj.QuestionName} --${part}`
+                    // obj.QuestionName = `${obj.QuestionName} `
+                  } else {
+                    obj.QuestionName = `${obj.QuestionName} `
+                  }
+
+                  if (this.CriterionType === 1) {
+                    var idxLymphNode = item.Childrens.findIndex(i => i.QuestionMark === 2)
+                    if (idxLymphNode > -1) {
+                      isLymphNodes = item.Childrens[idxLymphNode].Answer[k].Answer ? parseInt(item.Childrens[idxLymphNode].Answer[k].Answer) : null
+                    }
+                  }
+                }
+              }
+            }
+            var digitPlaces = parseInt(localStorage.getItem('digitPlaces')) || 0
+            item.Answer.forEach(i => {
+              if (item.DictionaryCode) {
+                this.$set(obj.Answers, i.VisitTaskId, i.Answer ? parseInt(i.Answer) : null)
+                // obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
+              } else {
+                if (item.Type === 'number') {
+                  let val = null
+                  if (item.ValueType === 0) {
+                    val = parseInt(i.Answer)
+                  } else if (item.ValueType === 3) {
+                    val = i.Answer
+                  } else {
+                    val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(digitPlaces)
+                  }
+                  this.$set(obj.Answers, i.VisitTaskId, val)
+                } else {
+                  this.$set(obj.Answers, i.VisitTaskId, i.Answer)
+                }
+                // obj.Answers[i.VisitTaskId] = i.Answer
+              }
+            })
+            if (item.Childrens.length >= 1) {
+              obj.Childrens = this.getQuestions(item.Childrens, isNTFilterLength, lesionType, isLymphNodes)
+            }
+            arr.push(obj)
+          }
+        })
+      }
+      return arr
+    },
+    handleShowDetail(val) {
+      this.getReportInfo()
+      // this.taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null)
+    },
+    handleExistDiseaseChange(val) {
+      // this.currentExistDisease = parseInt(val)
+
+      if (val === this.isExistDisease && this.tumorEvaluate === this.currentEvaluateResult) {
+        this.currentTaskReason = ''
+        this.evaluateReasonChange('')
+      }
+      var idx = this.answerArr.findIndex(i => i.questionType === 15)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+    },
+    handleEvaluateResultChange(val) {
+      // this.currentEvaluateResult = parseInt(val)
+      if (val === this.tumorEvaluate && this.isExistDisease === this.currentExistDisease) {
+        this.currentTaskReason = ''
+        this.evaluateReasonChange('')
+      }
+      var idx = this.answerArr.findIndex(i => i.questionType === 13)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+    },
+
+    evaluateReasonChange(val) {
+      var idx = this.answerArr.findIndex(i => i.questionType === 14)
+      if (idx > -1) {
+        this.answerArr[idx].answer = val
+      }
+    },
+    async handleConfirm() {
+      await this.handleSave(false)
+      await this.verifyVisitTaskQuestions()
+      const { ImageAssessmentReportConfirmation } = const_.processSignature
+      this.signCode = ImageAssessmentReportConfirmation
+      this.signVisible = true
+    },
+    verifyVisitTaskQuestions() {
+      return new Promise((resolve, reject) => {
+        this.loading = true
+        verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId }).then(res => {
+          this.loading = false
+          resolve()
+        }).catch(() => {
+          this.loading = false
+          reject()
+        })
+      })
+    },
+    handleResize() {
+      this.$nextTick(() => {
+        this.$refs.reportList ? this.$refs.reportList.doLayout() : ''
+      })
+    },
+    // 关闭签名框
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo)
+      } else {
+        this.signVisible = false
+      }
+    },
+    // 签名并确认
+    signConfirm(signInfo) {
+      this.loading = true
+      var params = {
+        data: {
+          visitTaskId: this.visitTaskId
+        },
+        signInfo: signInfo
+      }
+      submitDicomVisitTask(params).then(res => {
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          if (this.$refs['signForm']) {
+            this.$refs['signForm'].btnLoading = false
+          }
+
+          this.signVisible = false
+          // window.location.reload()
+          // window.opener.postMessage('refreshTaskList', window.location)
+
+          // 设置当前任务阅片状态为已读
+          this.readingTaskState = 2
+          store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
+          DicomEvent.$emit('setReadingState', 2)
+          window.opener.postMessage('refreshTaskList', window.location)
+          this.$confirm(this.$t('trials:oncologyReview:title:msg2'), {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          })
+            .then(() => {
+              // var token = getToken()
+              // var subjectCode = this.$router.currentRoute.query.subjectCode
+              // var subjectId = this.$router.currentRoute.query.subjectId
+              // var trialId = this.$router.currentRoute.query.trialId
+
+              // this.$router.push({
+              //   path: `/readingPage?subjectCode=${subjectCode}&subjectId=${subjectId}&trialId=${trialId}&TokenKey=${token}`
+              // })
+              // DicomEvent.$emit('getNextTask')
+              window.location.reload()
+            })
+            .catch(action => {
+
+            })
+        }
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+        if (this.$refs['signForm'] && this.$refs['signForm'].btnLoading) {
+          this.$refs['signForm'].btnLoading = false
+        }
+      })
+    },
+    previewDicoms(task) {
+      var token = getToken()
+      // var subjectCode = this.$router.currentRoute.query.subjectCode
+      var subjectCode = localStorage.getItem('subjectCode')
+      var subjectId = this.subjectId
+      var trialId = this.trialId
+      var isReadingTaskViewInOrder = this.isReadingTaskViewInOrder
+      var criterionType = this.criterionType
+      var readingTool = this.readingTool
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
+      var path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      const routeData = this.$router.resolve({ path })
+      window.open(routeData.href, '_blank')
+    },
+    handleSave(isPrompt) {
+      return new Promise((resolve, reject) => {
+        this.loading = true
+        var answers = []
+        var tableQuestionAnswer = []
+        for (const k in this.questionForm) {
+          if (this.questionForm[k] instanceof Array) {
+            this.questionForm[k].forEach((v, i) => {
+              Object.keys(v).forEach(o => {
+                if (o.indexOf('_RowId') === -1) {
+                  tableQuestionAnswer.push({
+                    questionId: k,
+                    answer: v[o],
+                    tableQuestionId: o,
+                    rowId: v[o + '_RowId']
+                  })
+                }
+              })
+            })
+            // tableQuestionAnswer.push({})
+          } else {
+            answers.push({ questionId: k, answer: this.questionForm[k].toString() })
+          }
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          questionAnswer: answers,
+          tableQuestionAnswer: tableQuestionAnswer
+        }
+        changeCalculationAnswer(params).then(res => {
+          if (isPrompt) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          }
+          DicomEvent.$emit('refreshQuestionAnswer')
+          this.loading = false
+          resolve()
+        }).catch(() => {
+          this.loading = false
+          reject()
+        })
+      })
+    },
+    async skipTask() {
+      try {
+        // 是否确认跳过？
+        const confirm = await this.$confirm(
+          this.$t('trials:readingReport:message:skipConfirm'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          window.location.reload()
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.report-wrapper{
+
+  height: 100%;
+  // background-color: #fff;
+  // background-color: #000;
+  ::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    // background: #d0d0d0;
+  }
+  .report-header{
+    display: flex;
+  }
+  .el-card{
+    // background-color: #000;
+    // color: #ffffff;
+    border:none;
+  }
+  /deep/ .el-table--border th.gutter:last-of-type{
+    border: none;
+  }
+  /deep/ .el-card__header{
+    border: none;
+    padding: 10px;
+  }
+  /deep/ .el-upload-list--picture-card .el-upload-list__item{
+    width: 30px;
+    height: 30px;
+  }
+  /deep/ .el-upload--picture-card{
+    width: 30px;
+    height: 30px;
+    line-height: 40px;
+  }
+}
+/deep/ .el-switch__label.is-active{
+  color: #428bca;
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue
new file mode 100644
index 00000000..f326253e
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue
@@ -0,0 +1,167 @@
+<template>
+  <div>
+    <el-upload
+      :action="accept"
+      :limit="question.ImageCount"
+      :on-preview="handlePictureCardPreview"
+      :before-upload="handleBeforeUpload"
+      :http-request="uploadScreenshot"
+      list-type="picture-card"
+      :on-remove="handleRemove"
+      :file-list="fileList"
+      :class="{disabled:readingTaskState >= 2 || (fileList.length >= question.ImageCount) || (task.VisitTaskId !== visitTaskId) || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))}"
+      :disabled="readingTaskState >= 2  || task.VisitTaskId !== visitTaskId || question.IsShowInDicom || ((task.IsBaseLine && question.LimitEdit === 2) || (!task.IsBaseLine && question.LimitEdit === 1))"
+    >
+      <i slot="default" class="el-icon-plus" />
+      <div slot="file" slot-scope="{file}">
+        <viewer
+          :ref="file.url"
+          :images="[imageUrl]"
+          style="
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+          "
+        >
+          <img
+            class="el-upload-list__item-thumbnail"
+            :src="OSSclientConfig.basePath + file.url"
+            crossOrigin="anonymous"
+            alt=""
+            style="max-width: 100%; max-height: 100%"
+          />
+          <span class="el-upload-list__item-actions">
+            <span
+              class="el-upload-list__item-preview"
+              @click="handlePictureCardPreview(file)"
+            >
+              <i class="el-icon-zoom-in" />
+            </span>
+
+            <span
+              v-if="readingTaskState < 2"
+              class="el-upload-list__item-delete"
+              @click="handleRemove(file)"
+            >
+              <i class="el-icon-delete" />
+            </span>
+          </span>
+        </viewer>
+      </div>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+export default {
+name: "UploadFile",
+  props: {
+    task: {
+      Type: Object,
+      required: true
+    },
+    question: {
+      Type: Object,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      required: true
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    initUrl: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      imgVisible: false,
+      imageUrl: null,
+      accept: '.png,.jpg,.jpeg',
+      fileList: [],
+    }
+  },
+  mounted() {
+    this.urls = this.initUrl === '' ? [] : this.initUrl.split('|')
+    console.log(this.visitTaskId, this.urls)
+    this.fileList = []
+    this.urls.map(url => {
+      this.fileList.push({ name: '', url: `${url}` })
+    })
+    console.log(this.fileList)
+  },
+  methods: {
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
+    async uploadScreenshot(param) {
+      if (!this.visitTaskId) return
+      const loading = this.$loading({
+        target: document.querySelector('.ecrf-wrapper'),
+        fullscreen: false,
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading'
+      })
+      var trialId = this.$route.query.trialId
+      var subjectId = this.$route.query.trialId
+      var file = await this.fileToBlob(param.file)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
+      console.log(res)
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
+      this.urls.push(this.$getObjectName(res.url))
+      this.$emit('setImageUrl', this.urls.length > 0 ? this.urls.join('|') : '')
+      loading.close()
+    },
+    handleBeforeUpload(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        // this.fileList = []
+        return true
+      } else {
+        this.$alert(`必须是 ${this.accept} 格式`)
+        return false
+      }
+    },
+    // 预览图片
+    handlePictureCardPreview(file) {
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        // this.imgVisible = true
+        this.$refs[file.url].$viewer.show()
+      }
+    },
+    // 删除图片
+    handleRemove(file, fileList) {
+      this.imageUrl = ''
+      this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
+      this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
+      this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.disabled{
+  /deep/ .el-upload--picture-card {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
index d6c92fc4..c3a6bc3f 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue
@@ -1,9 +1,9 @@
 <template>
-  <div v-loading="loading" class="img-container">
-    <el-card class="box-card left">
-      <div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title">
-        <span>{{ $t('trials:auditRecord:table:subject') }}：{{ otherInfo.SubjectCode }} </span>
-        <span>({{ otherInfo.TaskBlindName }})</span>
+  <div class="img-container">
+    <el-card v-loading="loading" class="box-card left">
+      <div v-if="isReadingShowSubjectInfo" class="title">
+        <h4>{{ subjectCode }} </h4>
+        <h4>{{ taskBlindName }}</h4>
       </div>
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane :label="$t('trials:clinicaldara:title:currentTask')" name="first" class="left-content">
@@ -30,7 +30,14 @@
                   class="img-box"
                   @click="selected(item,i,j,true)"
                 >
-                  {{ `${j+1}. ${item.FileName}` }}
+                  <div v-if="item.FileName.length < 15" class="img-text">
+                    {{ `${j+1}. ${item.FileName}` }}
+                  </div>
+                  <el-tooltip v-else :content="item.FileName" placement="bottom">
+                    <div class="img-text">
+                      {{ `${j+1}. ${item.FileName}` }}
+                    </div>
+                  </el-tooltip>
                 </div>
 
               </div>
@@ -53,9 +60,15 @@
                 class="img-box"
                 @click="handleImageRead(task)"
               >
-                {{ `${j+1}. ${task.TaskBlindName}` }}
+                <div v-if="task.TaskBlindName.length < 15" class="img-text">
+                  {{ `${j+1}. ${task.TaskBlindName}` }}
+                </div>
+                <el-tooltip v-else :content="task.TaskBlindName" placement="bottom">
+                  <div class="img-text">
+                    {{ `${j+1}. ${task.TaskBlindName}` }}
+                  </div>
+                </el-tooltip>
               </div>
-
             </div>
           </div>
         </el-tab-pane>
@@ -63,7 +76,7 @@
 
     </el-card>
     <!-- 预览图像 -->
-    <el-card class="box-card right">
+    <el-card v-loading="loading" class="box-card right">
       <div style="width:100%;height: 100%;">
         <Preview
           v-if="previewImage.imgList.length > 0"
@@ -93,6 +106,10 @@
         :subject-id="subjectId"
         :visit-task-id="visitTaskId"
         :criterion-id="otherInfo.TrialCriterionId"
+        :subject-code="subjectCode"
+        :task-blind-name="taskBlindName"
+        :is-reading-show-subject-info="isReadingShowSubjectInfo"
+        :ise-c-r-f-show-in-dicom-reading="iseCRFShowInDicomReading"
       />
     </el-card>
   </div>
@@ -127,9 +144,33 @@ export default {
       type: String,
       required: true
     },
+    taskBlindName: {
+      type: String,
+      required: true
+    },
     readingCategory: {
       type: Number,
       required: true
+    },
+    isReadingShowSubjectInfo: {
+      type: Boolean,
+      required: true
+    },
+    readingTool: {
+      type: String,
+      required: true
+    },
+    criterionType: {
+      type: String,
+      required: true
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      required: true
+    },
+    iseCRFShowInDicomReading: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -156,7 +197,8 @@ export default {
       currentTaskId: '',
       otherInfo: null,
       isReadingShowPreviousResults: false,
-      bp: []
+      bp: [],
+      openWindow: null
     }
   },
   computed: {
@@ -170,6 +212,11 @@ export default {
 
     this.getNoneDicomList(this.isReadingShowPreviousResults)
   },
+  beforeDestroy() {
+    if (this.openWindow) {
+      this.openWindow.close()
+    }
+  },
   methods: {
     // 获取非Dicom检查信息
     getNoneDicomList() {
@@ -250,18 +297,21 @@ export default {
       })
     },
     handleImageRead(task) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
       this.currentTaskId = task.VisitTaskId
-      var criterionType = this.$router.currentRoute.query.criterionType
-      var readingTool = this.$router.currentRoute.query.readingTool
-      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
+      var criterionType = this.criterionType
+      var readingTool = this.readingTool
+      var isReadingTaskViewInOrder = this.isReadingTaskViewInOrder
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var token = getToken()
-      const path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      const path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&visitTaskId=${task.VisitTaskId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       // const routeData = this.$router.resolve({
       //   path: `/readingPage?subjectId=${this.subjectId}&trialId=${this.trialId}&visitTaskId=${task.VisitTaskId}&TokenKey=${token}`
       // })
       const routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      this.openWindow = window.open(routeData.href, '_blank')
     },
     previewCD() {
       var token = getToken()
@@ -295,7 +345,7 @@ export default {
   flex: 1;
   width: 100%;
   height: 100%;
-  padding: 10px;
+  padding-bottom: 10px;
   display: flex;
   ::-webkit-scrollbar {
     width: 7px;
@@ -326,13 +376,19 @@ export default {
     flex-direction: column;
   }
   .title{
-    height: 40px;
-    line-height: 40px;
+    // height: 40px;
+    // line-height: 40px;
     border: 1ppx solid;
     border: 1px solid #ebe7e7;
-    padding-left: 10px;
+    // padding-left: 10px;
     background-color: #4e4e4e;
     color: #ffffff;
+    h4{
+      padding: 5px 0px;
+      margin: 0;
+      text-align: center;
+      background-color: #4c4c4c;
+    }
   }
   .left-content{
     flex: 1;
@@ -359,13 +415,19 @@ export default {
     display: inline-block;
     box-sizing: border-box;
     border-bottom: 2px solid #f3f3f3;
-    width: 180px;
-    height: 50px;
-    line-height: 50px;
     cursor: pointer;
     // margin-bottom: 5px;
     padding-left: 5px;
   }
+  .img-text{
+    display: inline-block;
+    width: 200px;
+    height: 50px;
+    line-height: 50px;
+    overflow: hidden;
+    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    white-space: nowrap;
+  }
   .img-box:nth-last-child(1){
     margin-bottom: 0px;
   }
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/index.vue b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
index dfc43b00..40c9965c 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
@@ -1,15 +1,40 @@
 <template>
   <div ref="container" v-loading="loading" class="none-dicom-reading-container">
     <!-- 访视阅片 -->
-    <VisitReview
-      v-if="isShow && readingCategory && readingCategory=== 1"
-      :trial-id="trialId"
-      :subject-id="subjectId"
-      :subject-code="subjectCode"
-      :visit-task-id="visitTaskId"
-      :reading-category="readingCategory"
-      :is-exists-clinical-data="isExistsClinicalData"
-    />
+    <div v-if="isShow && readingCategory && readingCategory=== 1" class="reading-wrapper">
+      <el-tabs v-model="activeName" :before-leave="beforeLeave">
+        <!-- 阅片 -->
+        <el-tab-pane :label="$t('trials:reading:tabTitle:review')" name="read">
+          <VisitReview
+            :trial-id="trialId"
+            :subject-id="subjectId"
+            :subject-code="subjectCode"
+            :visit-task-id="visitTaskId"
+            :task-blind-name="taskBlindName"
+            :reading-category="readingCategory"
+            :readingTool="readingTool"
+            :criterionType="criterionType"
+            :isReadingShowSubjectInfo="isReadingShowSubjectInfo"
+            :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+            :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
+          />
+        </el-tab-pane>
+        <!-- 报告 -->
+        <el-tab-pane :label="$t('trials:reading:tabTitle:report')" name="report" v-if="!iseCRFShowInDicomReading">
+          <Report 
+            v-if="tabs.includes('report')"
+            ref="reportPage"
+            :trialId="trialId"
+            :visit-task-id="visitTaskId"
+            :subject-id="subjectId"
+            :readingTool="readingTool"
+            :criterionType="criterionType"
+            :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    
     <!-- 全局阅片 -->
     <GlobalReview
       v-else-if="isShow && readingCategory && readingCategory === 2"
@@ -83,6 +108,7 @@ import { getNextTask, readClinicalData } from '@/api/trials'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import Report from './components/Report'
 import VisitReview from './components/VisitReview'
 import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
 import AdReview from '@/views/trials/trials-panel/reading/ad-review'
@@ -93,6 +119,7 @@ export default {
   name: 'NoneDicomReading',
   components: {
     VisitReview,
+    Report,
     AdReview,
     GlobalReview,
     OncologyReview,
@@ -113,18 +140,21 @@ export default {
       isExistsClinicalData: false,
       isNeedReadClinicalData: false,
       isReadClinicalData: false,
+      iseCRFShowInDicomReading: false,
       criterionType: null,
       readingTool: null,
       isNewSubject: null,
       dialogVisible: false,
       dialogH: 0,
-      isShow: false
+      isShow: false,
+      activeName:'',
+      tabs: []
     }
   },
   mounted() {
     DicomEvent.$on('getNextTask', () => {
       this.getTaskInfo()
-    })
+    }) 
     this.trialId = this.$router.currentRoute.query.trialId
     this.subjectCode = this.$router.currentRoute.query.subjectCode
     this.subjectId = this.$router.currentRoute.query.subjectId
@@ -169,6 +199,10 @@ export default {
         //   var token = getToken()
         //   window.location.href = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingShowPreviousResults=${this.isReadingShowPreviousResults}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&isNewSubject=1&isReadingTaskViewInOrder=${res.Result.IsReadingTaskViewInOrder}&TokenKey=${token}`
         // }
+        if (res.Result.ReadingCategory === 1) {
+          this.activeName = 'read'
+          this.tabs = [this.activeName]
+        }
         this.subjectId = res.Result.SubjectId
         this.visitTaskId = res.Result.VisitTaskId
         this.subjectCode = res.Result.SubjectCode
@@ -176,7 +210,8 @@ export default {
         this.isExistsClinicalData = res.Result.IsExistsClinicalData
         this.isReadClinicalData = res.Result.IsReadClinicalData
         this.isNeedReadClinicalData = res.Result.IsNeedReadClinicalData
-
+        this.iseCRFShowInDicomReading = res.Result.IseCRFShowInDicomReading
+        this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder
         this.isReadingShowSubjectInfo = res.Result.IsReadingShowSubjectInfo
         this.isReadingShowPreviousResults = res.Result.IsReadingShowPreviousResults
         this.digitPlaces = res.Result.DigitPlaces
@@ -201,7 +236,21 @@ export default {
       } catch (e) {
         this.loading = false
       }
-    }
+    },
+    beforeLeave(activeName, oldActiveName) {
+      if (!this.tabs.includes(activeName)) {
+        this.tabs.push(activeName)
+      }
+      if (oldActiveName === 'read') {
+        this.$nextTick(() => {
+          if (this.$refs.reportPage) {
+            // DicomEvent.$emit('getReportInfo', true)
+            this.$refs.reportPage.setScrollTop(1)
+          }
+        })
+      }
+      return Promise.resolve(true)
+    },
   }
 }
 </script>
@@ -221,7 +270,38 @@ export default {
       padding: 10px;
     }
   }
+  .reading-wrapper{
+    width: 100%;
+    height: 100%;
+    padding: 0 10px;
+    box-sizing: border-box;
+    /deep/.el-tabs{
+      box-sizing: border-box;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      .el-tabs__item{
+        // color: #fff;
+      }
+      .el-tabs__header{
+        height: 50px;
+        margin:0px;
+        box-sizing: border-box;
+      }
+      .el-tabs__content{
+        flex: 1;
+        margin:0px;
+        box-sizing: border-box;
+      }
+      .el-tabs__item{
+        // color: #fff;
+      }
+      .el-tab-pane{
+        height: 100%;
+      }
 
+    }
+  }
 /deep/ .dialog-container{
     margin-top: 50px !important;
 
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 1c828c19..e46e1c6f 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -18,7 +18,7 @@
           v-if="
             (isReadingTaskViewInOrder === 1 ||
               isReadingTaskViewInOrder === 2) &&
-              TrialReadingCriterionId === item.TrialReadingCriterionId
+            TrialReadingCriterionId === item.TrialReadingCriterionId
           "
         >
           <div slot="search-container">
@@ -41,7 +41,7 @@
                   icon="el-icon-search"
                   @click="handleSearch"
                 >
-                  {{ $t("common:button:search") }}
+                  {{ $t('common:button:search') }}
                 </el-button>
                 <!-- 重置 -->
                 <el-button
@@ -49,7 +49,7 @@
                   icon="el-icon-refresh-left"
                   @click="handleReset"
                 >
-                  {{ $t("common:button:reset") }}
+                  {{ $t('common:button:reset') }}
                 </el-button>
               </el-form-item>
             </el-form>
@@ -75,10 +75,11 @@
                       scope.row.UrgentColor === 1
                         ? 'danger'
                         : scope.row.UrgentColor === 2
-                          ? 'warning'
-                          : 'primary'
+                        ? 'warning'
+                        : 'primary'
                     "
-                  >{{ $fd("YesOrNo", scope.row.IsUrgent) }}</el-tag>
+                    >{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag
+                  >
                 </template>
               </el-table-column>
               <!-- 受试者编号 -->
@@ -113,10 +114,11 @@
                         scope.row.UrgentColor === 1
                           ? '#F56C6C'
                           : scope.row.UrgentColor === 2
-                            ? '#E6A23C'
-                            : '#409EFF',
+                          ? '#E6A23C'
+                          : '#409EFF',
                     }"
-                  >{{ scope.row.UrgentCount }}</span>
+                    >{{ scope.row.UrgentCount }}</span
+                  >
                 </template>
               </el-table-column>
               <!-- 建议完成时间 -->
@@ -130,7 +132,7 @@
                 sortable="custom"
               >
                 <template slot-scope="scope">
-                  {{ scope.row.SuggesteFinishedTime.split(":")[0] + ":00:00" }}
+                  {{ scope.row.SuggesteFinishedTime.split(':')[0] + ':00:00' }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -146,8 +148,8 @@
                     :title="
                       scope.row.ExistReadingApply
                         ? $t(
-                          'trials:pendingReadingTasks:button:ExistReadingApply'
-                        )
+                            'trials:pendingReadingTasks:button:ExistReadingApply'
+                          )
                         : $t('trials:pendingReadingTasks:button:review')
                     "
                     icon="el-icon-edit-outline"
@@ -156,9 +158,9 @@
                   <!-- 上传 -->
                   <el-button
                     v-if="
-                      item.CriterionType === 0 &&
-                        item.ImageUploadEnum > 0 &&
-                        item.IsReadingTaskViewInOrder > 0
+                      item.ImageUploadEnum > 0 &&
+                      item.IsReadingTaskViewInOrder > 1 &&
+                      !scope.row.IsSubjectJudge
                     "
                     v-hasPermi="['role:ir']"
                     circle
@@ -169,9 +171,9 @@
                   <!-- 下载 -->
                   <el-button
                     v-if="
-                      item.CriterionType === 0 &&
-                        item.ImageDownloadEnum === 1 &&
-                        item.IsReadingTaskViewInOrder > 0
+                      item.ImageDownloadEnum > 0 &&
+                      item.IsReadingTaskViewInOrder > 1 &&
+                      !scope.row.IsSubjectJudge
                     "
                     v-hasPermi="['role:ir']"
                     circle
@@ -194,7 +196,7 @@
         <div
           v-else-if="
             isReadingTaskViewInOrder === 0 &&
-              TrialReadingCriterionId === item.TrialReadingCriterionId
+            TrialReadingCriterionId === item.TrialReadingCriterionId
           "
         >
           <el-descriptions :column="2" border style="width: 800px">
@@ -248,48 +250,66 @@
                 :disabled="
                   randomReadInfo.UnReadTaskCount +
                     randomReadInfo.UnReadJudgeTaskCount ===
-                    0
+                  0
                 "
                 @click="handleOutOfOrderReading"
               >
-                {{ $t("trials:pendingReadingTasks:button:beginRandomReview") }}
+                {{ $t('trials:pendingReadingTasks:button:beginRandomReview') }}
               </el-button>
             </el-descriptions-item>
           </el-descriptions>
         </div>
       </el-tab-pane>
     </el-tabs>
-    <upload-image
+    <!-- <upload-image
       v-if="uploadImageVisible"
       :visible.sync="uploadImageVisible"
       :subject-id="uploadSubjectId"
       :criterion="uploadTrialCriterion"
       :status="uploadStatus"
       @getList="getList"
+    /> -->
+    <upload-dicom-and-nonedicom
+      v-if="uploadImageVisible"
+      :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion"
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder"
+      :visible.sync="uploadImageVisible"
+    />
+    <download-dicom-and-nonedicom
+      v-if="downloadImageVisible"
+      :SubjectId="uploadSubjectId"
+      :SubjectCode="uploadSubjectCode"
+      :Criterion="uploadTrialCriterion"
+      :visible.sync="downloadImageVisible"
     />
   </BaseContainer>
 </template>
 <script>
-import {
-  getIRUnReadSubjectTaskList,
-  verifyReadingRestTime
-} from '@/api/trials'
+import { getIRUnReadSubjectTaskList, verifyReadingRestTime } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import { clearSkipReadingCache } from '@/api/reading'
 import BaseContainer from '@/components/BaseContainer'
-import uploadImage from '@/components/uploadImage'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 export default {
   name: 'ReadingTaskList',
-  components: { BaseContainer, Pagination, 'upload-image': uploadImage },
+  components: {
+    BaseContainer,
+    Pagination,
+    'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
+    'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
+  },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -308,10 +328,12 @@ export default {
       openWindow: null,
 
       // 上传
+      downloadImageVisible: false,
       uploadImageVisible: false,
       uploadSubjectId: null,
+      uploadSubjectCode: null,
       uploadTrialCriterion: {},
-      uploadStatus: 'upload'
+      uploadStatus: 'upload',
     }
   },
   watch: {
@@ -319,7 +341,7 @@ export default {
       if (v) {
         this.getList()
       }
-    }
+    },
   },
   mounted() {
     window.addEventListener('message', this.receiveMsg)
@@ -335,10 +357,11 @@ export default {
   methods: {
     // 打开上传下载弹框
     openUploadImage(item, trialCriterion, status) {
+      this.uploadSubjectCode = item.SubjectCode
       this.uploadSubjectId = item.SubjectId
       this.uploadTrialCriterion = trialCriterion
       this.uploadStatus = status
-      this.uploadImageVisible = true
+      this[`${status}ImageVisible`] = true
     },
     async getTrialCriterionList() {
       try {
@@ -360,8 +383,7 @@ export default {
         this.isRender = false
         const res = await getIRUnReadSubjectTaskList(this.searchData)
         if (res.IsSuccess) {
-          this.isReadingTaskViewInOrder =
-            res.OtherInfo.IsReadingTaskViewInOrder
+          this.isReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder
           this.readingTool = res.OtherInfo.ReadingTool
           this.criterionType = res.OtherInfo.CriterionType
           if (res.OtherInfo.IsReadingTaskViewInOrder) {
@@ -395,7 +417,10 @@ export default {
         await clearSkipReadingCache()
         await verifyReadingRestTime()
         this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
+        window.localStorage.setItem(
+          'TrialReadingCriterionId',
+          this.TrialReadingCriterionId
+        )
         var token = getToken()
         var path = ''
         if (this.readingTool === 0) {
@@ -420,7 +445,10 @@ export default {
         await clearSkipReadingCache()
         await verifyReadingRestTime()
         this.loading = false
-        window.localStorage.setItem('TrialReadingCriterionId', this.TrialReadingCriterionId)
+        window.localStorage.setItem(
+          'TrialReadingCriterionId',
+          this.TrialReadingCriterionId
+        )
         var token = getToken()
         var path = ''
         if (this.readingTool === 0) {
@@ -450,7 +478,7 @@ export default {
       this.searchData.SortField = column.prop
       this.searchData.PageIndex = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 05c3dd7a..4ed7f0e8 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -381,7 +381,7 @@
             />
             <!-- 退回 -->
             <el-button
-              :disabled="scope.row.ReadingTaskState === 2 || scope.row.ReadingCategory !== 1 || scope.row.TaskState !== 0"
+              :disabled="scope.row.ReadingTaskState === 2 || scope.row.ReadingCategory !== 1 || scope.row.TaskState !== 0 || scope.row.IsManualGeneration"
               v-if="hasPermi(['trials:trials-panel:readingTracking:edit'])"
               icon="el-icon-back"
               circle
diff --git a/src/views/trials/trials-panel/setting/attachment/components/previewFile.vue b/src/views/trials/trials-panel/setting/attachment/components/previewFile.vue
index 2bc5d680..ba8679db 100644
--- a/src/views/trials/trials-panel/setting/attachment/components/previewFile.vue
+++ b/src/views/trials/trials-panel/setting/attachment/components/previewFile.vue
@@ -9,7 +9,7 @@
     />
     <!-- <embed v-else-if="fileType.indexOf('pdf') !== -1" :src="filePath" style="width: 100%; height: 100%"> -->
     <!-- <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${filePath}`" width="100%" height="100%" frameborder="0" /> -->
-    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+    <iframe v-else-if="fileType.indexOf('pdf') !== -1" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
     <div v-else>
       {{ $t('common:message:downloadFile') }}
       <el-link type="primary" @click="downLoadFile">{{ $t('common:button:download') }}</el-link>
@@ -32,7 +32,8 @@ export default {
   },
   data() {
     return {
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   methods: {
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index b926a0d5..ba88606c 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -7,6 +7,7 @@
         <el-form-item :label="$t('trials:attachment:table:fileType')">
           <el-select
             v-model="searchData.FileTypeId"
+            clearable
             style="width:150px;"
           >
             <el-option
@@ -40,6 +41,7 @@
         <el-form-item :label="$t('trials:attachment:table:userType')">
           <el-select
             v-model="searchData.UserTypeId"
+            clearable
             style="width:100%;"
           >
             <el-option
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index 19a12d90..bab12043 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -84,7 +84,7 @@
               </el-button>
               <!-- 预览 -->
               <el-button
-                :disabled="otherInfo.QuestionCount===0"
+                :disabled="!otherInfo.IsHaveQuestion"
                 type="primary"
                 icon="el-icon-view"
                 @click="preview.visible = true"
@@ -118,7 +118,7 @@
               </el-button>
               <el-button
                 v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
-                :disabled="otherInfo.QuestionCount===0"
+                :disabled="!otherInfo.IsHaveQuestion"
                 type="danger"
                 icon="el-icon-circle-check"
                 @click="handleConfirm"
@@ -443,7 +443,7 @@ export default {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
         this.isShow = true
-        this.otherInfo.IsConfirmMedicineQuestion = false
+        // this.otherInfo.IsConfirmMedicineQuestion = false
         this.otherInfo = res.OtherInfo
       }).catch(() => { this.loading = false })
     },
@@ -503,7 +503,7 @@ export default {
 
     // 确认前签名
     handleConfirm() {
-      if (this.otherInfo.QuestionCount === 0) {
+      if (!this.otherInfo.IsHaveQuestion) {
         // '请先配置医学审核问题再进行确认！'
         this.$alert(this.$t('trials:medicalFeedbackCfg:message:msg1'))
         return
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
index 10217fd6..a6daf168 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue
@@ -8,7 +8,7 @@
         style="float: right"
         v-if="status === 'add'"
       >
-        {{ $t("common:button:add") }}
+        {{ $t('common:button:add') }}
       </el-button>
       <el-table v-loading="loading" :data="list" stripe>
         <!-- AE 名称 -->
@@ -44,6 +44,11 @@
           prop="action"
           :label="$t('trials:sitesList:dicomAEList:table:action')"
           min-width="120"
+          v-if="
+            hasPermi([
+              'trials:trials-panel:setting:personnel-manage:edit-dicom',
+            ])
+          "
         >
           <template slot-scope="scope">
             <el-button
@@ -67,9 +72,9 @@
   </base-model>
 </template>
 <script>
-import BaseModel from "@/components/BaseModel";
-import dicomForm from "./dicomForm.vue";
-import { getTrialSiteDicomAEList, deleteTrialSiteDicomAE } from "@/api/trials";
+import BaseModel from '@/components/BaseModel'
+import dicomForm from './dicomForm.vue'
+import { getTrialSiteDicomAEList, deleteTrialSiteDicomAE } from '@/api/trials'
 const defaultSearchData = () => {
   return {
     TrialSiteId: null,
@@ -77,88 +82,93 @@ const defaultSearchData = () => {
     Ip: null,
     Port: null,
     Description: null,
-  };
-};
+  }
+}
 export default {
-  name: "dicomAE",
+  name: 'dicomAE',
   components: { BaseModel, dicomForm },
   data() {
     return {
       config: {
         visible: false,
         title: null,
-        width: "800px",
+        width: '800px',
         appendToBody: true,
       },
-      status: "add",
+      status: 'add',
       TrialSiteId: null,
       loading: false,
       list: [],
       searchData: defaultSearchData(),
       siteData: {},
-    };
+    }
   },
   methods: {
-    open(row, status = "add") {
-      this.status = status;
-      this.TrialSiteId = row.TrialSiteId;
+    open(row, status = 'add') {
+      this.status = status
+      this.TrialSiteId = row.TrialSiteId
       this.config.title = this.$t(
-        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
-      ).replace("xxx", `${row.TrialSiteCode}、${row.TrialSiteAliasName}`);
-      this.siteData = row;
-      this.config.visible = true;
-      this.getList();
+        'trials:trials-panel:setting:personnel-manage:dicomAETitle'
+      ).replace('xxx', `${row.TrialSiteCode}、${row.TrialSiteAliasName}`)
+      this.siteData = row
+      this.config.visible = true
+      this.getList()
+      console.log(
+        this.hasPermi([
+          'trials:trials-panel:setting:personnel-manage:edit-site',
+        ])
+      )
     },
     // 获取dicomAE列表
     async getList() {
       try {
-        this.searchData.TrialSiteId = this.TrialSiteId;
-        this.loading = true;
-        let res = await getTrialSiteDicomAEList(this.searchData);
-        this.loading = false;
+        this.searchData.TrialSiteId = this.TrialSiteId
+        this.loading = true
+        let res = await getTrialSiteDicomAEList(this.searchData)
+        this.loading = false
         if (res.IsSuccess) {
-          this.list = res.Result;
+          this.list = res.Result
         }
       } catch (err) {
-        console.log(err);
-        this.loading = false;
+        console.log(err)
+        this.loading = false
       }
     },
     // 新增
     openAdd() {
-      this.$refs.dicomForm.open(this.siteData, null, "add");
+      this.$refs.dicomForm.open(this.siteData, null, 'add')
     },
     save() {
-      this.$emit("getList");
+      this.$emit('getList')
     },
     // 修改dicom
     editDicom(row) {
-      this.$refs.dicomForm.open(this.siteData, row, "edit");
-    },  
+      this.$refs.dicomForm.open(this.siteData, row, 'edit')
+    },
     // 删除dicom
     async delDicom(row) {
       try {
         let confirm = await this.$confirm(
-          this.$t("trials:sitesList:dicomAEList:confirm:delMessage"),
+          this.$t('trials:sitesList:dicomAEList:confirm:delMessage'),
           {
-            type: "warning",
+            type: 'warning',
             distinguishCancelAndClose: true,
-            confirmButtonText: this.$t("common:button:confirm"),
-            cancelButtonText: this.$t("common:button:cancel"),
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
           }
-        );
-        if (confirm !== "confirm") return;
-        let res = await deleteTrialSiteDicomAE(row.Id);
+        )
+        if (confirm !== 'confirm') return
+        let res = await deleteTrialSiteDicomAE(row.Id)
         if (res.IsSuccess) {
-          this.getList();
-          this.save();
-          this.$t("common:message:deletedSuccessfully");
+          this.getList()
+          this.save()
+          this.$t('common:message:deletedSuccessfully')
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index 3919a5ff..fed20e1a 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -16,140 +16,267 @@
         </el-form-item> -->
         <!-- 关键词 -->
         <el-form-item :label="$t('trials:sitesList:form:keyWord')">
-          <el-input v-model="listQuery.UserKeyInfo" style="width: 200px" class="mr" clearable
-            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')" />
+          <el-input
+            v-model="listQuery.UserKeyInfo"
+            style="width: 200px"
+            class="mr"
+            clearable
+            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')"
+          />
         </el-form-item>
         <!-- 状态 -->
         <el-form-item :label="$t('trials:sitesList:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option v-for="item of $d.IsSiteDisable" :key="item.label" :label="item.label" :value="item.value" />
+            <el-option
+              v-for="item of $d.IsSiteDisable"
+              :key="item.label"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            {{ $t("common:button:reset") }}
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
           </el-button>
           <!-- 中心调研 -->
-          <el-button v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:questionnaire-record',
-          ]" type="primary" icon="el-icon-info" @click="handleResearchList">
-            {{ $t("trials:sitesList:button:siteResearch") }}
+          <el-button
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:questionnaire-record',
+            ]"
+            type="primary"
+            icon="el-icon-info"
+            @click="handleResearchList"
+          >
+            {{ $t('trials:sitesList:button:siteResearch') }}
           </el-button>
           <!-- 添加中心 -->
-          <el-button v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:add-site',
-          ]" type="primary" icon="el-icon-plus" @click="handleAdd">
-            {{ $t("trials:sitesList:dialogTitle:assignSite") }}
+          <el-button
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:add-site',
+            ]"
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleAdd"
+          >
+            {{ $t('trials:sitesList:dialogTitle:assignSite') }}
           </el-button>
-          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0"
-            @click="handleResearchListExport">
-            {{ $t("common:button:export") }}
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :disabled="list.length === 0"
+            @click="handleResearchListExport"
+          >
+            {{ $t('common:button:export') }}
           </el-button>
           <!-- 下载模板 -->
-          <el-button type="primary" icon="el-icon-download" @click="handleDownload">
-            {{ $t("common:button:downloadTpl") }}
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:download',
+            ]"
+            @click="handleDownload"
+          >
+            {{ $t('common:button:downloadTpl') }}
           </el-button>
-          <el-button v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:add-site',
-          ]" type="primary" icon="el-icon-upload2" @click="handleUpload">
-            {{ $t("common:button:upload") }}
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:personnel-manage:upload']"
+            type="primary"
+            icon="el-icon-upload2"
+            @click="handleUpload"
+          >
+            {{ $t('common:button:upload') }}
           </el-button>
         </el-form-item>
       </el-form>
     </div>
-    <el-table v-loading="listLoading" :data="list" stripe @sort-change="handleSortByColumn">
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      stripe
+      @sort-change="handleSortByColumn"
+    >
       <el-table-column type="index" width="50" />
       <!-- 中心编号 -->
-      <el-table-column prop="TrialSiteCode" :label="$t('trials:sitesList:table:siteId')" show-overflow-tooltip
-        sortable="custom" width="120">
+      <el-table-column
+        prop="TrialSiteCode"
+        :label="$t('trials:sitesList:table:siteId')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="120"
+      >
         <template slot-scope="scope">
           <span v-if="!!scope.row.TrialSiteCode">{{
             scope.row.TrialSiteCode
           }}</span>
-          <i v-else class="el-icon-warning" style="color: #f44336; font-size: 14px" />
+          <i
+            v-else
+            class="el-icon-warning"
+            style="color: #f44336; font-size: 14px"
+          />
         </template>
       </el-table-column>
       <!-- 中心名称 -->
-      <el-table-column prop="TrialSiteName" :label="$t('trials:sitesList:table:siteName')" show-overflow-tooltip
-        sortable="custom" min-width="120" />
+      <el-table-column
+        prop="TrialSiteName"
+        :label="$t('trials:sitesList:table:siteName')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="120"
+      />
       <!-- 中心别名 -->
-      <el-table-column prop="TrialSiteAliasName" :label="$t('trials:sitesList:table:siteAliasName')"
-        show-overflow-tooltip sortable="custom" min-width="120" />
+      <el-table-column
+        prop="TrialSiteAliasName"
+        :label="$t('trials:sitesList:table:siteAliasName')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="120"
+      />
       <!-- 参与者 -->
-      <el-table-column prop="UserNameList" :label="$t('trials:sitesList:table:staff')" show-overflow-tooltip
-        min-width="100">
+      <el-table-column
+        prop="UserNameList"
+        :label="$t('trials:sitesList:table:staff')"
+        show-overflow-tooltip
+        min-width="100"
+      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.UserCount > 0" size="small" type="text" @click="getCrcList(scope.row)">
+          <el-button
+            v-if="scope.row.UserCount > 0"
+            size="small"
+            type="text"
+            @click="getCrcList(scope.row)"
+          >
             {{
               scope.row.UserNameList.length > 0
-                ? scope.row.UserNameList.join(", ")
-                : ""
+                ? scope.row.UserNameList.join(', ')
+                : ''
             }}
           </el-button>
         </template>
       </el-table-column>
       <!-- Subjects -->
-      <el-table-column prop="SubjectCount" min-width="100" :label="$t('trials:site:table:subjects')"
-        show-overflow-tooltip sortable="custom" />
+      <el-table-column
+        prop="SubjectCount"
+        min-width="100"
+        :label="$t('trials:site:table:subjects')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <!-- Visits -->
-      <el-table-column prop="VisitCount" min-width="100" :label="$t('trials:site:table:visits')" show-overflow-tooltip
-        sortable="custom" />
+      <el-table-column
+        prop="VisitCount"
+        min-width="100"
+        :label="$t('trials:site:table:visits')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <!-- 状态 -->
-      <el-table-column prop="IsDeleted" :label="$t('trials:sitesList:table:status')" show-overflow-tooltip sortable
-        min-width="100">
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('trials:sitesList:table:status')"
+        show-overflow-tooltip
+        sortable
+        min-width="100"
+      >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-            $fd("IsSiteDisable", scope.row.IsDeleted)
+            $fd('IsSiteDisable', scope.row.IsDeleted)
           }}</el-tag>
           <el-tag v-else>{{
-            $fd("IsSiteDisable", scope.row.IsDeleted)
+            $fd('IsSiteDisable', scope.row.IsDeleted)
           }}</el-tag>
         </template>
       </el-table-column>
       <!-- DICOM AE -->
-      <el-table-column prop="CallingAEList" :label="$t('trials:sitesList:table:AE')" show-overflow-tooltip sortable
-        min-width="100">
+      <el-table-column
+        prop="CallingAEList"
+        :label="$t('trials:sitesList:table:AE')"
+        show-overflow-tooltip
+        sortable
+        min-width="100"
+      >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.CallingAEList.length > 0" size="small" type="text"
-            @click="handleConfig(scope.row, 'view')">
+          <el-button
+            v-if="scope.row.CallingAEList.length > 0"
+            size="small"
+            type="text"
+            @click="handleConfig(scope.row, 'view')"
+          >
             {{
               scope.row.CallingAEList.length > 0
-                ? scope.row.CallingAEList.join(", ")
-                : ""
+                ? scope.row.CallingAEList.join(', ')
+                : ''
             }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 授权时间 -->
-      <el-table-column prop="EnabledTime" :label="$t('trials:sitesList:table:timeAdded')" show-overflow-tooltip sortable
-        min-width="150" />
-      <el-table-column v-if="
-        hasPermi([
-          'trials:trials-panel:setting:personnel-manage:edit-site',
-          'trials:trials-panel:setting:personnel-manage:remove-site',
-        ])
-      " :label="$t('common:action:action')" min-width="120">
+      <el-table-column
+        prop="EnabledTime"
+        :label="$t('trials:sitesList:table:timeAdded')"
+        show-overflow-tooltip
+        sortable
+        min-width="150"
+      />
+      <el-table-column
+        v-if="
+          hasPermi([
+            'trials:trials-panel:setting:personnel-manage:edit-site',
+            'trials:trials-panel:setting:personnel-manage:remove-site',
+            'trials:trials-panel:setting:personnel-manage:edit-dicom',
+          ])
+        "
+        :label="$t('common:action:action')"
+        min-width="120"
+      >
         <template slot-scope="scope">
-          <el-button circle :title="$t('trials:sitesList:action:assign')" icon="el-icon-user"
-            :disabled="scope.row.IsDeleted" @click="getCrcList(scope.row)" />
+          <el-button
+            circle
+            :title="$t('trials:sitesList:action:assign')"
+            icon="el-icon-user"
+            :disabled="scope.row.IsDeleted"
+            @click="getCrcList(scope.row)"
+          />
 
           <!-- Edit -->
-          <el-button v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:edit-site',
-          ]" circle :title="$t('common:button:edit')" icon="el-icon-edit-outline" @click="handleEdit(scope.row)" />
-          <el-button circle :title="$t('common:button:config')" icon="el-icon-setting"
-            @click="handleConfig(scope.row, 'add')" />
+          <el-button
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:edit-site',
+            ]"
+            circle
+            :title="$t('common:button:edit')"
+            icon="el-icon-edit-outline"
+            @click="handleEdit(scope.row)"
+          />
+          <el-button
+            circle
+            :title="$t('common:button:config')"
+            icon="el-icon-setting"
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:edit-dicom',
+            ]"
+            @click="handleConfig(scope.row, 'add')"
+          />
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination" style="text-align: right">
-      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
-        @pagination="getList" />
+      <pagination
+        :total="total"
+        :page.sync="listQuery.PageIndex"
+        :limit.sync="listQuery.PageSize"
+        @pagination="getList"
+      />
     </div>
 
     <!-- 给site分配crc -->
@@ -162,9 +289,17 @@
     <!-- 修改site信息 -->
     <base-model v-if="edit_model.visible" :config="edit_model">
       <template slot="dialog-body">
-        <el-form ref="editForm" :model="form" label-width="100px" :rules="rules">
+        <el-form
+          ref="editForm"
+          :model="form"
+          label-width="100px"
+          :rules="rules"
+        >
           <!-- 中心编号 -->
-          <el-form-item :label="$t('trials:sitesList:table:siteId')" prop="TrialSiteCode">
+          <el-form-item
+            :label="$t('trials:sitesList:table:siteId')"
+            prop="TrialSiteCode"
+          >
             <el-input v-model="form.TrialSiteCode" />
           </el-form-item>
           <!-- 中心名称 -->
@@ -184,21 +319,38 @@
             ></el-autocomplete>
           </el-form-item>
           <!-- 中心别称 -->
-          <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
+          <el-form-item
+            :label="$t('trials:sitesList:table:siteAliasName')"
+            prop="TrialSiteAliasName"
+          >
             <el-input v-model="form.TrialSiteAliasName" />
           </el-form-item>
           <!-- 状态 -->
           <el-form-item :label="$t('trials:sitesList:table:status')">
-            <el-switch v-model="form.IsDeleted" :active-value="false" :inactive-value="true" />
+            <el-switch
+              v-model="form.IsDeleted"
+              :active-value="false"
+              :inactive-value="true"
+            />
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button type="primary" size="small" :disabled="saveBtnLoading" @click="edit_model.visible = false">
-          {{ $t("common:button:cancel") }}
+        <el-button
+          type="primary"
+          size="small"
+          :disabled="saveBtnLoading"
+          @click="edit_model.visible = false"
+        >
+          {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button type="primary" size="small" :loading="saveBtnLoading" @click="handleUpdateSiteID">
-          {{ $t("common:button:save") }}
+        <el-button
+          type="primary"
+          size="small"
+          :loading="saveBtnLoading"
+          @click="handleUpdateSiteID"
+        >
+          {{ $t('common:button:save') }}
         </el-button>
       </template>
     </base-model>
@@ -206,17 +358,32 @@
     <!-- 修改参与者人员状态 -->
     <base-model v-if="status_model.visible" :config="status_model">
       <template slot="dialog-body">
-        <span>{{ $t("trials:internalStaff:table:status") }}:</span>
+        <span>{{ $t('trials:internalStaff:table:status') }}:</span>
         <el-radio-group v-model="staffStatus">
-          <el-radio v-for="item of $d.IsUserExitTrial" :key="item.label" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio
+            v-for="item of $d.IsUserExitTrial"
+            :key="item.label"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="status_model.visible = false">
-          {{ $t("common:button:cancel") }}
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="status_model.visible = false"
+        >
+          {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="saveStatus">
-          {{ $t("common:button:save") }}
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="saveStatus"
+        >
+          {{ $t('common:button:save') }}
         </el-button>
       </template>
     </base-model>
@@ -225,54 +392,112 @@
     <base-model v-if="siteOfcrc_model.visible" :config="siteOfcrc_model">
       <template slot="dialog-body">
         <div style="text-align: right">
-          <el-button v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:assign-staff',
-          ]" type="primary" icon="el-icon-plus" size="small" @click="crc_model.visible = true">
-            {{ $t("common:button:add") }}
+          <el-button
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:assign-staff',
+            ]"
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            @click="crc_model.visible = true"
+          >
+            {{ $t('common:button:add') }}
           </el-button>
         </div>
-        <el-table v-loading="userListLoading" :data="userList" height="400" size="small">
+        <el-table
+          v-loading="userListLoading"
+          :data="userList"
+          height="400"
+          size="small"
+        >
           <!-- 姓名 -->
-          <el-table-column prop="UserRealName" :label="$t('trials:internalStaff:table:name')" min-width="100"
-            show-overflow-tooltip />
+          <el-table-column
+            prop="UserRealName"
+            :label="$t('trials:internalStaff:table:name')"
+            min-width="100"
+            show-overflow-tooltip
+          />
           <!-- 用户名 -->
-          <el-table-column prop="UserName" :label="$t('trials:internalStaff:table:uid')" min-width="100"
-            show-overflow-tooltip />
+          <el-table-column
+            prop="UserName"
+            :label="$t('trials:internalStaff:table:uid')"
+            min-width="100"
+            show-overflow-tooltip
+          />
           <!-- 用户类型 -->
-          <el-table-column prop="UserType" :label="$t('trials:internalStaff:table:userType')" min-width="100"
-            show-overflow-tooltip />
+          <el-table-column
+            prop="UserType"
+            :label="$t('trials:internalStaff:table:userType')"
+            min-width="100"
+            show-overflow-tooltip
+          />
           <!-- 电话 -->
-          <el-table-column prop="Phone" :label="$t('trials:internalStaff:table:phone')" show-overflow-tooltip
-            min-width="100" />
+          <el-table-column
+            prop="Phone"
+            :label="$t('trials:internalStaff:table:phone')"
+            show-overflow-tooltip
+            min-width="100"
+          />
           <!-- 邮箱 -->
-          <el-table-column prop="EMail" :label="$t('trials:internalStaff:table:email')" show-overflow-tooltip
-            min-width="100" />
+          <el-table-column
+            prop="EMail"
+            :label="$t('trials:internalStaff:table:email')"
+            show-overflow-tooltip
+            min-width="100"
+          />
           <!-- 单位 -->
-          <el-table-column prop="OrganizationName" :label="$t('trials:internalStaff:table:organization')" min-width="100" />
+          <el-table-column
+            prop="OrganizationName"
+            :label="$t('trials:internalStaff:table:organization')"
+            min-width="100"
+          />
           <!-- 状态 -->
-          <el-table-column prop="IsDeleted" :label="$t('trials:internalStaff:table:status')" show-overflow-tooltip
-            min-width="100">
+          <el-table-column
+            prop="IsDeleted"
+            :label="$t('trials:internalStaff:table:status')"
+            show-overflow-tooltip
+            min-width="100"
+          >
             <template slot-scope="scope">
               <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-                $fd("IsUserExitTrial", scope.row.IsDeleted)
+                $fd('IsUserExitTrial', scope.row.IsDeleted)
               }}</el-tag>
               <el-tag v-else>{{
-                $fd("IsUserExitTrial", scope.row.IsDeleted)
+                $fd('IsUserExitTrial', scope.row.IsDeleted)
               }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="CreateTime" :label="$t('trials:internalStaff:table:authorizationTime')"
-            show-overflow-tooltip sortable="custom" min-width="210" />
-          <el-table-column prop="DeletedTime" :label="$t('trials:internalStaff:table:disableTime')"
-            show-overflow-tooltip sortable min-width="210" />
-          <el-table-column v-hasPermi="[
-            'trials:trials-panel:setting:personnel-manage:assign-staff',
-          ]" :label="$t('common:action:action')" width="100">
+          <el-table-column
+            prop="CreateTime"
+            :label="$t('trials:internalStaff:table:authorizationTime')"
+            show-overflow-tooltip
+            sortable="custom"
+            min-width="210"
+          />
+          <el-table-column
+            prop="DeletedTime"
+            :label="$t('trials:internalStaff:table:disableTime')"
+            show-overflow-tooltip
+            sortable
+            min-width="210"
+          />
+          <el-table-column
+            v-hasPermi="[
+              'trials:trials-panel:setting:personnel-manage:assign-staff',
+            ]"
+            :label="$t('common:action:action')"
+            width="100"
+          >
             <template slot-scope="scope">
-              <el-button v-hasPermi="[
-                'trials:trials-panel:setting:personnel-manage:assign-staff',
-              ]" circle :title="$t('trials:internalStaff:action:status')" icon="el-icon-edit-outline"
-                @click="handleStatus(scope.row)" />
+              <el-button
+                v-hasPermi="[
+                  'trials:trials-panel:setting:personnel-manage:assign-staff',
+                ]"
+                circle
+                :title="$t('trials:internalStaff:action:status')"
+                icon="el-icon-edit-outline"
+                @click="handleStatus(scope.row)"
+              />
             </template>
           </el-table-column>
         </el-table>
@@ -281,7 +506,10 @@
     <!-- 导入 -->
     <base-model v-if="upload_model.visible" :config="upload_model">
       <template slot="dialog-body">
-        <UploadExcel @closeDialog="upload_model.visible = false" @getList="getList" />
+        <UploadExcel
+          @closeDialog="upload_model.visible = false"
+          @getList="getList"
+        />
       </template>
     </base-model>
     <!--dicom AE-->
@@ -298,29 +526,29 @@ import {
   trialSiteUserListExport,
   addTrialSites,
   getTrialSiteSelectList,
-} from "@/api/trials";
-import { DownloadCommonDoc } from "@/api/dictionary";
-import Pagination from "@/components/Pagination";
-import CRCForm from "./crcForm";
-import BaseModel from "@/components/BaseModel";
-import UploadExcel from "./uploadExcel";
-import moment from "moment";
-import dicomAEList from "./dicomAEList.vue";
+} from '@/api/trials'
+import { DownloadCommonDoc } from '@/api/dictionary'
+import Pagination from '@/components/Pagination'
+import CRCForm from './crcForm'
+import BaseModel from '@/components/BaseModel'
+import UploadExcel from './uploadExcel'
+import moment from 'moment'
+import dicomAEList from './dicomAEList.vue'
 const getListQueryDefault = () => {
   return {
-    UserKeyInfo: "",
-    TrialSiteCode: "",
-    TrialSiteAliasName: "",
+    UserKeyInfo: '',
+    TrialSiteCode: '',
+    TrialSiteAliasName: '',
     TrialSiteName: null,
     IsDeleted: null,
-    SortField: "TrialSiteCode",
+    SortField: 'TrialSiteCode',
     Asc: true,
     PageIndex: 1,
     PageSize: 20,
-  };
-};
+  }
+}
 export default {
-  name: "Participant",
+  name: 'Participant',
   components: { Pagination, CRCForm, BaseModel, UploadExcel, dicomAEList },
   data() {
     return {
@@ -328,42 +556,42 @@ export default {
       listQuery: getListQueryDefault(),
       listLoading: false,
       total: 0,
-      currentSiteId: "",
+      currentSiteId: '',
       site_model: {
         visible: false,
-        title: this.$t("trials:sitesList:dialogTitle:assignSite"),
-        width: "60%",
+        title: this.$t('trials:sitesList:dialogTitle:assignSite'),
+        width: '60%',
       },
       crc_model: {
         visible: false,
-        title: this.$t("trials:sitesList:dialogTitle:assignStaff").replace(
-          "xxx",
+        title: this.$t('trials:sitesList:dialogTitle:assignStaff').replace(
+          'xxx',
           this.$route.query.trialCode
         ),
-        width: "60%",
+        width: '60%',
       },
       edit_model: {
         visible: false,
-        title: this.$t("trials:sitesList:dialogTitle:editSite"),
-        width: "600px",
-        model_type: "add",
+        title: this.$t('trials:sitesList:dialogTitle:editSite'),
+        width: '600px',
+        model_type: 'add',
       },
       status_model: {
         visible: false,
-        title: this.$t("trials:sitesList:dialogTitle:editStaffStauts"),
-        width: "500px",
+        title: this.$t('trials:sitesList:dialogTitle:editStaffStauts'),
+        width: '500px',
       },
-      siteOfcrc_model: { visible: false, title: "", width: "70%" },
+      siteOfcrc_model: { visible: false, title: '', width: '70%' },
       form: {
-        TrialSiteCode: "",
-        TrialSiteName: "",
-        TrialSiteAliasName: "",
+        TrialSiteCode: '',
+        TrialSiteName: '',
+        TrialSiteAliasName: '',
         IsDeleted: true,
       },
       upload_model: {
         visible: false,
-        title: this.$t("common:button:upload"),
-        width: "500px",
+        title: this.$t('common:button:upload'),
+        width: '500px',
       },
       saveBtnLoading: false,
       staffStatus: null,
@@ -376,72 +604,72 @@ export default {
         TrialSiteCode: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             max: 100,
-            message: `${this.$t("common:ruleMessage:maxLength")} 100`,
-            trigger: "blur",
+            message: `${this.$t('common:ruleMessage:maxLength')} 100`,
+            trigger: 'blur',
           },
         ],
         TrialSiteName: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: ['blur', 'change'],
           },
           {
             max: 500,
-            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
-            trigger: "blur",
+            message: `${this.$t('common:ruleMessage:maxLength')} 500`,
+            trigger: 'blur',
           },
         ],
         TrialSiteAliasName: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             max: 500,
-            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
-            trigger: "blur",
+            message: `${this.$t('common:ruleMessage:maxLength')} 500`,
+            trigger: 'blur',
           },
         ],
       },
-      trialId: "",
+      trialId: '',
       TrialSiteSelectList: [],
-    };
+    }
   },
   mounted() {
-    this.trialId = this.$route.query.trialId;
-    this.getList();
-    this.getTrialSiteSelectList();
+    this.trialId = this.$route.query.trialId
+    this.getList()
+    this.getTrialSiteSelectList()
   },
   methods: {
     // 打开DICOMAE配置列表
     handleConfig(row, status) {
-      this.$refs.dicomAEList.open(row, status);
+      this.$refs.dicomAEList.open(row, status)
     },
     handleSelect(item) {
-      this.form.TrialSiteName = item.SiteName;
+      this.form.TrialSiteName = item.SiteName
       this.form.TrialSiteAliasName = item.AliasName
         ? item.AliasName
-        : item.SiteName;
-      this.form.SiteId = item.SiteId;
+        : item.SiteName
+      this.form.SiteId = item.SiteId
     },
     handleChange(v) {
       if (v) return
       this.form.TrialSiteAliasName = ''
     },
     querySearch(queryString, cb) {
-      var TrialSiteSelectList = this.TrialSiteSelectList;
+      var TrialSiteSelectList = this.TrialSiteSelectList
       var results = queryString
         ? TrialSiteSelectList.filter(this.createFilter(queryString))
-        : TrialSiteSelectList;
+        : TrialSiteSelectList
       // 调用 callback 返回建议列表的数据
-      cb(results);
+      cb(results)
     },
     createFilter(queryString) {
       return (TrialSiteSelectList) => {
@@ -452,13 +680,13 @@ export default {
           TrialSiteSelectList.AliasName.toLowerCase().indexOf(
             queryString.toLowerCase()
           ) >= 0
-        );
-      };
+        )
+      }
     },
     // 获取site可选列表
     async getTrialSiteSelectList() {
       try {
-        let res = await getTrialSiteSelectList();
+        let res = await getTrialSiteSelectList()
         if (res.IsSuccess) {
           this.TrialSiteSelectList = res.Result.map((item) => {
             let v = ''
@@ -470,67 +698,65 @@ export default {
             return {
               value: `${item.SiteName} ${v}`,
               ...item,
-            };
-          });
+            }
+          })
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 获取site列表
     getList() {
-      this.listLoading = true;
-      this.listQuery.TrialId = this.trialId;
+      this.listLoading = true
+      this.listQuery.TrialId = this.trialId
       getSiteCRCSimpleList(this.listQuery)
         .then((res) => {
-          this.listLoading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.listLoading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.listLoading = false;
-        });
+          this.listLoading = false
+        })
     },
     // 打开添加site弹窗
     handleAdd() {
-      this.edit_model.title = this.$t(
-        "trials:sitesList:dialogTitle:assignSite"
-      );
-      this.edit_model.model_type = "add";
+      this.edit_model.title = this.$t('trials:sitesList:dialogTitle:assignSite')
+      this.edit_model.model_type = 'add'
       Object.keys(this.form).forEach((key) => {
-        this.form[key] = "";
-        if (key === "IsDeleted") {
-          this.form[key] = true;
+        this.form[key] = ''
+        if (key === 'IsDeleted') {
+          this.form[key] = true
         }
-      });
-      this.edit_model.visible = true;
+      })
+      this.edit_model.visible = true
     },
     // 给site分配CRC
     handleAssignCRC(row) {
       if (!row.TrialSiteCode) {
-        this.$alert(this.$t("trials:sitesList:message:setSiteId"));
-        return;
+        this.$alert(this.$t('trials:sitesList:message:setSiteId'))
+        return
       }
-      this.currentSiteId = row.TrialSiteId;
-      var title = this.$t("trials:sitesList:dialogTitle:assignStaff");
-      console.log(title);
-      this.crc_model.title = title.replace("xxx", this.$route.query.trialCode);
-      this.crc_model.visible = true;
+      this.currentSiteId = row.TrialSiteId
+      var title = this.$t('trials:sitesList:dialogTitle:assignStaff')
+      console.log(title)
+      this.crc_model.title = title.replace('xxx', this.$route.query.trialCode)
+      this.crc_model.visible = true
     },
     // 编辑site信息
     handleEdit(row) {
       if (Object.keys(row).length) {
-        this.form = { ...row };
+        this.form = { ...row }
       }
-      this.edit_model.title = this.$t("trials:sitesList:dialogTitle:editSite");
-      this.edit_model.model_type = "edit";
-      this.edit_model.visible = true;
+      this.edit_model.title = this.$t('trials:sitesList:dialogTitle:editSite')
+      this.edit_model.model_type = 'edit'
+      this.edit_model.visible = true
     },
     // 更新site信息
     handleUpdateSiteID() {
-      this.$refs["editForm"].validate((valid) => {
-        if (!valid) return;
-        this.saveBtnLoading = true;
+      this.$refs['editForm'].validate((valid) => {
+        if (!valid) return
+        this.saveBtnLoading = true
         const param = {
           trialId: this.trialId,
           id: this.form.Id,
@@ -539,46 +765,46 @@ export default {
           trialSiteCode: this.form.TrialSiteCode,
           trialSiteAliasName: this.form.TrialSiteAliasName,
           isDeleted: this.form.IsDeleted,
-        };
-        if (this.edit_model.model_type === "add") {
+        }
+        if (this.edit_model.model_type === 'add') {
           addTrialSites([param])
             .then((res) => {
-              this.saveBtnLoading = false;
+              this.saveBtnLoading = false
               if (res.IsSuccess) {
-                this.edit_model.visible = false;
+                this.edit_model.visible = false
                 this.$message.success(
-                  this.$t("common:message:savedSuccessfully")
-                );
-                this.getList();
-                this.getTrialSiteSelectList();
+                  this.$t('common:message:savedSuccessfully')
+                )
+                this.getList()
+                this.getTrialSiteSelectList()
               }
             })
             .catch(() => {
-              this.saveBtnLoading = false;
-            });
+              this.saveBtnLoading = false
+            })
         } else {
           editTrialSite(param)
             .then((res) => {
-              this.saveBtnLoading = false;
+              this.saveBtnLoading = false
               if (res.IsSuccess) {
-                this.edit_model.visible = false;
+                this.edit_model.visible = false
                 this.$message.success(
-                  this.$t("common:message:savedSuccessfully")
-                );
-                this.getList();
-                this.getTrialSiteSelectList();
+                  this.$t('common:message:savedSuccessfully')
+                )
+                this.getList()
+                this.getTrialSiteSelectList()
               }
             })
             .catch(() => {
-              this.saveBtnLoading = false;
-            });
+              this.saveBtnLoading = false
+            })
         }
-      });
+      })
     },
     // 移除site
     handleDelete(row) {
-      this.$confirm(this.$t("trials:sitesList:message:removeSite"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:sitesList:message:removeSite'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         deleteTrialSite(row.Id, this.trialId).then((res) => {
@@ -586,129 +812,129 @@ export default {
             this.list.splice(
               this.list.findIndex((item) => item.Id === row.Id),
               1
-            );
+            )
             this.$message.success(
-              this.$t("trials:sitesList:message:removedSuccessfully")
-            );
+              this.$t('trials:sitesList:message:removedSuccessfully')
+            )
           }
-        });
-      });
+        })
+      })
     },
     handleStatus(row) {
-      const { IsDeleted } = { ...row };
-      this.currentRow = { ...row };
-      this.staffStatus = IsDeleted;
-      this.status_model.visible = true;
+      const { IsDeleted } = { ...row }
+      this.currentRow = { ...row }
+      this.staffStatus = IsDeleted
+      this.status_model.visible = true
     },
     // 修改某个site下的CRC状态
     saveStatus() {
-      this.btnLoading = true;
+      this.btnLoading = true
       deleteSiteCRC(this.currentRow.Id, this.trialId, this.staffStatus)
         .then((res) => {
-          this.btnLoading = false;
+          this.btnLoading = false
           if (res.IsSuccess) {
-            this.status_model.visible = false;
-            this.getTrialSiteCRCList();
-            this.getList();
-            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.status_model.visible = false
+            this.getTrialSiteCRCList()
+            this.getList()
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
         })
         .catch(() => {
-          this.btnLoading = false;
-        });
+          this.btnLoading = false
+        })
     },
     // 获取某个site下的crc列表
     getCrcList(row) {
-      this.currentRow = { ...row };
-      this.currentSiteId = row.TrialSiteId;
-      var title = this.$t("trials:sitesList:dialogTitle:staff");
-      this.siteOfcrc_model.title = title.replace("xxx", row.TrialSiteCode);
-      this.siteOfcrc_model.visible = true;
-      this.getTrialSiteCRCList();
+      this.currentRow = { ...row }
+      this.currentSiteId = row.TrialSiteId
+      var title = this.$t('trials:sitesList:dialogTitle:staff')
+      this.siteOfcrc_model.title = title.replace('xxx', row.TrialSiteCode)
+      this.siteOfcrc_model.visible = true
+      this.getTrialSiteCRCList()
     },
     getTrialSiteCRCList() {
-      this.userListLoading = true;
+      this.userListLoading = true
       getTrialSiteCRCList(this.trialId, this.currentRow.TrialSiteId)
         .then((res) => {
-          this.userListLoading = false;
-          this.userList = res.Result;
+          this.userListLoading = false
+          this.userList = res.Result
         })
         .catch(() => {
-          this.userListLoading = false;
-        });
+          this.userListLoading = false
+        })
     },
     // 导出
     handleResearchListExport() {
-      this.listQuery.TrialId = this.trialId;
-      this.listLoading = true;
+      this.listQuery.TrialId = this.trialId
+      this.listLoading = true
       // eslint-disable-next-line no-unused-vars
       const { SortField, Asc, PageIndex, PageSize, ...param } = {
         ...this.listQuery,
-      };
+      }
       trialSiteUserListExport({ ...param })
         .then((data) => {
-          this.listLoading = false;
+          this.listLoading = false
         })
         .catch(() => {
-          this.listLoading = false;
-        });
+          this.listLoading = false
+        })
     },
     handleResearchList() {
       this.$router.push({
         path: `/trials/trials-panel/attachments/site-research?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}`,
-      });
+      })
     },
     handleUpload() {
-      this.upload_model.visible = true;
+      this.upload_model.visible = true
     },
     handleDownload() {
-      this.loading = true;
-      DownloadCommonDoc("TrialSiteSurveyImportUser_Template")
+      this.loading = true
+      DownloadCommonDoc('TrialSiteSurveyImportUser_Template')
         .then((data) => {
-          this.loading = false;
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // site列表排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.listQuery.Asc = true;
+      if (column.order === 'ascending') {
+        this.listQuery.Asc = true
       } else {
-        this.listQuery.Asc = false;
+        this.listQuery.Asc = false
       }
-      this.listQuery.SortField = column.prop;
-      this.listQuery.PageIndex = 1;
-      this.getList();
+      this.listQuery.SortField = column.prop
+      this.listQuery.PageIndex = 1
+      this.getList()
     },
     // 查询
     handleSearch() {
-      this.listQuery.PageIndex = 1;
-      this.getList();
+      this.listQuery.PageIndex = 1
+      this.getList()
     },
     // 重置
     handleReset() {
-      this.listQuery = getListQueryDefault();
-      this.getList();
+      this.listQuery = getListQueryDefault()
+      this.getList()
     },
     // 关闭添加分配crc模态框
     closeDialog(isReresh) {
-      this.crc_model.visible = false;
+      this.crc_model.visible = false
       if (isReresh) {
-        this.listQuery = getListQueryDefault();
-        this.getList();
-        this.getTrialSiteCRCList();
+        this.listQuery = getListQueryDefault()
+        this.getList()
+        this.getTrialSiteCRCList()
       }
     },
     // 关闭添加site模态框
     closeSiteDialog() {
-      this.site_model.visible = false;
-      this.listQuery = getListQueryDefault();
-      this.getList();
+      this.site_model.visible = false
+      this.listQuery = getListQueryDefault()
+      this.getList()
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .assign-site {
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index 280eac3c..d6071671 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -103,6 +103,7 @@
               <el-button
                 circle
                 icon="el-icon-delete"
+                :disabled="scope.row.IsJoin"
                 :title="$t('trials:externalStaff:button:delete')"
                 @click="deleteTrialExternalUser(scope.row)"
               />
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index 1289e411..75a91c56 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -41,7 +41,7 @@
             type="primary"
             :disabled="OtherInfo.IsSign"
             @click="apply(item.ReadingQuestionTrialId, index)"
-            >{{ $t("common:button:save") }}</el-button
+            >{{ $t('common:button:save') }}</el-button
           >
           <el-button
             v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
@@ -50,12 +50,13 @@
             type="primary"
             :disabled="OtherInfo.IsSign"
             @click="reset(item.ReadingQuestionTrialId, index)"
-            >{{ $t("common:button:reset") }}</el-button
+            >{{ $t('common:button:reset') }}</el-button
           >
           <!-- 产生裁判阅片的条件 -->
           <el-form-item
             :label-width="'280px'"
             :label="$t('trials:adRules:title:judgeTypeEnum')"
+            style="width: 95%"
           >
             <el-radio-group
               v-model="QuestionList[index].JudgeType"
@@ -63,6 +64,7 @@
             >
               <template v-for="item of $d.JudgeTypeEnum">
                 <el-radio
+                  style="margin-bottom: 5px"
                   :key="item.id"
                   :disabled="
                     OtherInfo.IsSign ||
@@ -71,18 +73,15 @@
                   :label="item.value"
                   v-if="
                     (JudgyInfo.ArbitrationRule === 1 &&
-                      QuestionList[index].Type === 'number' &&
-                      item.value !== 2 &&
-                      item.value !== 3) ||
-                    (JudgyInfo.ArbitrationRule === 2 &&
-                      QuestionList[index].Type === 'number' &&
-                      item.value === 1) ||
-                    (QuestionList[index].Type !== 'number' &&
-                      item.value !== 4 &&
-                      item.value !== 5)
+                      (item.value < 4 ||
+                        (item.value > 3 &&
+                          (QuestionList[index].Type === 'number' ||
+                            QuestionList[index].Type === 'calculation')))) ||
+                    (JudgyInfo.ArbitrationRule === 2 && item.value < 4)
                   "
-                  >{{ item.label }}</el-radio
                 >
+                  {{ item.label }}
+                </el-radio>
               </template>
             </el-radio-group>
           </el-form-item>
@@ -98,7 +97,7 @@
             type="primary"
             :disabled="OtherInfo.IsSign"
             @click="addGroup(index, null)"
-            >{{ $t("trials:adRules:button:addRule") }}</el-button
+            >{{ $t('trials:adRules:button:addRule') }}</el-button
           >
         </div>
         <el-table
@@ -211,14 +210,14 @@
             </el-checkbox-group>
             <div style="margin-top: 20px">
               <!-- 当前选择答案分组: -->
-              {{ $t("trials:adRules:title:selectAnswerGroup") }}
+              {{ $t('trials:adRules:title:selectAnswerGroup') }}
               <el-tag
                 v-if="
                   QuestionList[index].grouping.length > 0 &&
                   QuestionList[index].QuestionGenre !== 3
                 "
                 >{{
-                  QuestionList[index].grouping.toString().replaceAll(",", "|")
+                  QuestionList[index].grouping.toString().replaceAll(',', '|')
                 }}</el-tag
               >
               <el-tag
@@ -235,7 +234,7 @@
                         ).label
                     )
                     .toString()
-                    .replaceAll(",", "|")
+                    .replaceAll(',', '|')
                 }}</el-tag
               >
               <el-button
@@ -245,7 +244,7 @@
                 @click="addGroup2(index)"
               >
                 <!-- 添加分组 -->
-                {{ $t("trials:adRules:title:addGroup") }}
+                {{ $t('trials:adRules:title:addGroup') }}
               </el-button>
             </div>
           </div>
@@ -253,7 +252,7 @@
             v-if="QuestionList[index].QuestionGenre !== 3"
             style="margin-top: 20px"
           >
-            {{ $t("trials:adRules:title:group") }}
+            {{ $t('trials:adRules:title:group') }}
             <el-tag
               v-for="itemA of QuestionList[index].AnswerGroup2List"
               :key="itemA"
@@ -261,7 +260,7 @@
               style="margin-right: 10px"
               @close="
                 () => {
-                  return tagClose2(index, indexA);
+                  return tagClose2(index, indexA)
                 }
               "
               >{{ itemA }}</el-tag
@@ -272,7 +271,7 @@
             style="margin-top: 20px"
           >
             <!-- 分组: -->
-            {{ $t("trials:adRules:title:group") }}
+            {{ $t('trials:adRules:title:group') }}
             <el-tag
               v-for="itemA of QuestionList[index].AnswerGroup2List"
               :key="itemA"
@@ -280,17 +279,17 @@
               style="margin-right: 10px"
               @close="
                 () => {
-                  return tagClose2(index, indexA);
+                  return tagClose2(index, indexA)
                 }
               "
             >
               {{
                 itemA
-                  .split("|")
+                  .split('|')
                   .map((v) =>
                     $fd(QuestionList[index].DictionaryCode, parseInt(v))
                   )
-                  .join("|")
+                  .join('|')
               }}
             </el-tag>
           </div>
@@ -340,11 +339,16 @@
               "
               prop="JudgeDifferenceValue"
             >
-              <el-input
-                v-model="QuestionList[index].JudgeDifferenceValue"
-                clearable
-                :disabled="OtherInfo.IsSign"
-              ></el-input>
+              <div style="display: flex">
+                <el-input
+                  v-model="QuestionList[index].JudgeDifferenceValue"
+                  clearable
+                  :disabled="OtherInfo.IsSign"
+                ></el-input>
+                <span style="margin-left: 10px">{{
+                  $fd('ValueUnit', QuestionList[index].Unit)
+                }}</span>
+              </div>
             </el-form-item>
           </el-form>
         </div>
@@ -457,12 +461,12 @@
           size="small"
           type="primary"
           @click="
-            QuestionVisible = false;
-            $set(QuestionList[selectIndex], 'groupingA', []);
-            $set(QuestionList[selectIndex], 'groupingB', []);
+            QuestionVisible = false
+            $set(QuestionList[selectIndex], 'groupingA', [])
+            $set(QuestionList[selectIndex], 'groupingB', [])
           "
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
@@ -471,7 +475,7 @@
           type="primary"
           @click="save"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </div>
     </el-dialog>
@@ -482,13 +486,13 @@ import {
   getTrialConfirmCriterionList,
   getTrialCriterionJudgeQuestionList,
   setTrialCriterionJudgeQuestionAnswerGroup,
-} from "@/api/trials/reading";
-import { setTrialJudgyInfo, getTrialJudgyInfo } from "@/api/trials/setting";
+} from '@/api/trials/reading'
+import { setTrialJudgyInfo, getTrialJudgyInfo } from '@/api/trials/setting'
 export default {
   props: {
     trialReadingCriterionId: {
       type: String,
-      default: "",
+      default: '',
     },
   },
   data() {
@@ -512,23 +516,23 @@ export default {
           {
             required: true,
             message: this.$t(
-              "trials:trials-list:setitng:JudgeDifferenceTypeRequired"
+              'trials:trials-list:setitng:JudgeDifferenceTypeRequired'
             ),
-            trigger: "blur",
+            trigger: 'blur',
           },
         ],
         JudgeDifferenceValue: [
           {
             required: true,
             message: this.$t(
-              "trials:trials-list:setitng:JudgeDifferenceValueRequired"
+              'trials:trials-list:setitng:JudgeDifferenceValueRequired'
             ),
-            trigger: "blur",
+            trigger: 'blur',
           },
           {
             pattern: /^[0-9]+(.[0-9]{2})?$/,
-            message: this.$t("trials:trials-list:setitng:JudgeDifferenceValue"),
-            trigger: "blur",
+            message: this.$t('trials:trials-list:setitng:JudgeDifferenceValue'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
@@ -536,115 +540,115 @@ export default {
                 callback(
                   new Error(
                     this.$t(
-                      "trials:trials-list:setitng:JudgeDifferenceValueMin"
+                      'trials:trials-list:setitng:JudgeDifferenceValueMin'
                     )
                   )
-                );
+                )
               } else {
-                callback();
+                callback()
               }
             },
-            trigger: "blur",
+            trigger: 'blur',
           },
         ],
       },
-    };
+    }
   },
   watch: {
     TrialReadingCriterionId(v) {
-      if (v === null) return;
-      this.loading = true;
+      if (v === null) return
+      this.loading = true
       getTrialCriterionJudgeQuestionList({
         TrialId: this.$route.query.trialId,
         // ReadingQuestionCriterionTrialId: v,
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.loading = false;
-          this.QuestionList = res.Result;
-          this.OtherInfo = res.OtherInfo;
+          this.loading = false
+          this.QuestionList = res.Result
+          this.OtherInfo = res.OtherInfo
           this.activeNames = this.QuestionList.map(
             (v) => v.ReadingQuestionTrialId
-          );
+          )
           this.QuestionList.forEach((v) => {
-            this.$set(v, "grouping", []);
-            this.$set(v, "groupingA", []);
-            this.$set(v, "groupingB", []);
+            this.$set(v, 'grouping', [])
+            this.$set(v, 'groupingA', [])
+            this.$set(v, 'groupingB', [])
             this.$set(
               v,
-              "AnswerGroupList",
+              'AnswerGroupList',
               Object.assign([], v.AnswerCombination)
-            );
-            this.$set(v, "AnswerGroup2List", Object.assign([], v.AnswerGroup));
-          });
+            )
+            this.$set(v, 'AnswerGroup2List', Object.assign([], v.AnswerGroup))
+          })
         })
         .catch(() => {
-          this.btnLoading = false;
-          this.loading = false;
-        });
+          this.btnLoading = false
+          this.loading = false
+        })
     },
   },
   mounted() {
-    this.getList();
-    this.getTrialJudgyInfo();
+    this.getList()
+    this.getTrialJudgyInfo()
   },
   methods: {
     // 修改仲裁规则
     changeArbitrationRule(value) {
       if (value !== 1) {
         this.QuestionList.forEach((item) => {
-          item.JudgeDifferenceValue = 0;
-          item.JudgeDifferenceType = 0;
-        });
+          item.JudgeDifferenceValue = 0
+          item.JudgeDifferenceType = 0
+        })
       }
     },
     JudgeTypeChange(value, index) {
       this.$nextTick(() => {
         if (value === 4 || value === 5) {
-          if (this.$refs["JudgeDifferenceValue" + value + index][0]) {
-            this.$refs["JudgeDifferenceValue" + value + index][0].resetFields();
+          if (this.$refs['JudgeDifferenceValue' + value + index][0]) {
+            this.$refs['JudgeDifferenceValue' + value + index][0].resetFields()
             // this.QuestionList[index].JudgeDifferenceValue = 0;
           }
         }
-      });
+      })
     },
     saveAllSync() {
       return new Promise((resolve, reject) => {
-        var arr = [];
+        var arr = []
         this.QuestionList.forEach((v, i) => {
-          arr.push(this.applySync(v.ReadingQuestionTrialId, i));
-        });
+          arr.push(this.applySync(v.ReadingQuestionTrialId, i))
+        })
         Promise.all(arr)
           .then((res) => {
-            console.log(res);
-            resolve(true);
+            console.log(res)
+            resolve(true)
           })
           .catch((res) => {
-            console.log("进入catch");
-            resolve(false);
-          });
-      });
+            console.log('进入catch')
+            resolve(false)
+          })
+      })
     },
     applySync(ReadingQuestionTrialId, index) {
       return new Promise(async (resolve, reject) => {
-        console.log(this.QuestionList[index].JudgeType);
+        console.log(this.QuestionList[index].JudgeType)
         if (this.QuestionList[index].JudgeType === 0) {
-          reject(false);
-          return;
+          reject(false)
+          return
         }
         if (
           this.QuestionList[index].JudgeType === 2 &&
           this.QuestionList[index].AnswerGroup2List.length === 0
         ) {
-          reject(false);
-          return;
+          reject(false)
+          return
         }
         if (
           this.QuestionList[index].JudgeType === 3 &&
           this.QuestionList[index].AnswerGroupList.length === 0
         ) {
-          reject(false);
-          return;
+          reject(false)
+          return
         }
         if (
           this.QuestionList[index].JudgeType === 4 ||
@@ -652,17 +656,17 @@ export default {
         ) {
           try {
             let validate = await this.$refs[
-              "JudgeDifferenceValue" +
+              'JudgeDifferenceValue' +
                 this.QuestionList[index].JudgeType +
                 index
-            ][0].validate();
-            if (!validate) return reject(false);
+            ][0].validate()
+            if (!validate) return reject(false)
           } catch (err) {
-            return reject(false);
+            return reject(false)
           }
         }
-        this.btnLoading = true;
-        this.loading = true;
+        this.btnLoading = true
+        this.loading = true
         setTrialCriterionJudgeQuestionAnswerGroup({
           ReadingQuestionTrialId: ReadingQuestionTrialId,
           AnswerGroup: this.QuestionList[index].AnswerGroup2List,
@@ -676,126 +680,126 @@ export default {
           ),
         })
           .then((res) => {
-            resolve();
-            this.btnLoading = false;
-            this.loading = false;
+            resolve()
+            this.btnLoading = false
+            this.loading = false
           })
           .catch(() => {
-            reject(false);
-            this.btnLoading = false;
-            this.loading = false;
-          });
-      });
+            reject(false)
+            this.btnLoading = false
+            this.loading = false
+          })
+      })
     },
     setTrialJudgyInfo() {
-      this.loading = true;
+      this.loading = true
       setTrialJudgyInfo({
         TrialId: this.$route.query.trialId,
         ArbitrationRule: this.JudgyInfo.ArbitrationRule,
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.loading = false;
-          this.$message.success(this.$t("common:message:savedSuccessfully")); // '保存成功'
+          this.loading = false
+          this.$message.success(this.$t('common:message:savedSuccessfully')) // '保存成功'
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     getTrialJudgyInfo() {
-      this.loading = true;
+      this.loading = true
       getTrialJudgyInfo({
         TrialId: this.$route.query.trialId,
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.JudgyInfo = res.Result;
-          this.loading = false;
+          this.JudgyInfo = res.Result
+          this.loading = false
         })
         .catch((v) => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     tagClose2(index, indexA) {
       // '删除该规则组？'
-      this.$confirm(this.$t("trials:adRules:message:msg1")).then(() => {
-        this.QuestionList[index].AnswerGroup2List.splice(indexA, 1);
-      });
+      this.$confirm(this.$t('trials:adRules:message:msg1')).then(() => {
+        this.QuestionList[index].AnswerGroup2List.splice(indexA, 1)
+      })
     },
     tagClose(index, indexA) {
       // '删除该规则组？'
-      this.$confirm(this.$t("trials:adRules:message:msg1")).then(() => {
-        this.QuestionList[index].AnswerGroupList.splice(indexA, 1);
-      });
+      this.$confirm(this.$t('trials:adRules:message:msg1')).then(() => {
+        this.QuestionList[index].AnswerGroupList.splice(indexA, 1)
+      })
     },
     save() {
-      var index = this.selectIndex;
-      var indexA = this.indexA;
+      var index = this.selectIndex
+      var indexA = this.indexA
       if (this.QuestionList[index].groupingA.length === 0) {
-        this.$alert(this.$t("trials:adRules:message:msg2")); // '请先选择答案A'
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg2')) // '请先选择答案A'
+        return
       }
       if (this.QuestionList[index].groupingB.length === 0) {
-        this.$alert(this.$t("trials:adRules:message:msg3")); // '请先选择答案B'
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg3')) // '请先选择答案B'
+        return
       }
-      if (this.type === "add") {
+      if (this.type === 'add') {
         this.QuestionList[index].AnswerGroupList.push({
           AnswerGroupA: this.QuestionList[index].groupingA,
           AnswerGroupB: this.QuestionList[index].groupingB,
-        });
+        })
       } else {
         this.$set(
           this.QuestionList[index].AnswerGroupList[indexA],
-          "AnswerGroupA",
+          'AnswerGroupA',
           this.QuestionList[index].groupingA
-        );
+        )
         this.$set(
           this.QuestionList[index].AnswerGroupList[indexA],
-          "AnswerGroupB",
+          'AnswerGroupB',
           this.QuestionList[index].groupingB
-        );
+        )
       }
-      this.$set(this.QuestionList[index], "groupingA", []);
-      this.$set(this.QuestionList[index], "groupingB", []);
-      this.$message.success(this.$t("trials:adRules:message:msg4")); // '成功新增答案规则'
-      this.QuestionVisible = false;
+      this.$set(this.QuestionList[index], 'groupingA', [])
+      this.$set(this.QuestionList[index], 'groupingB', [])
+      this.$message.success(this.$t('trials:adRules:message:msg4')) // '成功新增答案规则'
+      this.QuestionVisible = false
     },
     addGroup2(index) {
       if (this.QuestionList[index].grouping.length === 0) {
-        this.$alert(this.$t("trials:adRules:message:msg5")); // '请先选择答案,再添加分组'
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg5')) // '请先选择答案,再添加分组'
+        return
       }
       var grouping = this.QuestionList[index].grouping
         .toString()
-        .replaceAll(",", "|");
-      this.QuestionList[index].AnswerGroup2List.push(`|${grouping}|`);
-      this.$set(this.QuestionList[index], "grouping", []);
+        .replaceAll(',', '|')
+      this.QuestionList[index].AnswerGroup2List.push(`|${grouping}|`)
+      this.$set(this.QuestionList[index], 'grouping', [])
     },
     addGroup(index, indexA) {
-      this.selectIndex = index;
-      this.type = "add";
+      this.selectIndex = index
+      this.type = 'add'
       if (indexA !== null) {
-        this.indexA = indexA;
-        this.type = "edit";
+        this.indexA = indexA
+        this.type = 'edit'
         this.$set(
           this.QuestionList[index],
-          "groupingA",
+          'groupingA',
           this.QuestionList[index].AnswerGroupList[indexA].AnswerGroupA
-        );
+        )
         this.$set(
           this.QuestionList[index],
-          "groupingB",
+          'groupingB',
           this.QuestionList[index].AnswerGroupList[indexA].AnswerGroupB
-        );
+        )
       }
-      this.QuestionVisible = true;
+      this.QuestionVisible = true
     },
     reset(ReadingQuestionTrialId, index) {
       // '确定重置当前设置的裁判任务生成规则吗？'
-      this.$confirm(this.$t("trials:adRules:message:msg6")).then(() => {
-        this.btnLoading = true;
-        this.loading = true;
+      this.$confirm(this.$t('trials:adRules:message:msg6')).then(() => {
+        this.btnLoading = true
+        this.loading = true
         setTrialCriterionJudgeQuestionAnswerGroup({
           ReadingQuestionTrialId: ReadingQuestionTrialId,
           AnswerGroup: [],
@@ -805,39 +809,39 @@ export default {
           JudgeDifferenceType: 0,
         })
           .then((res) => {
-            this.$set(this.QuestionList[index], "AnswerGroup2List", []);
-            this.$set(this.QuestionList[index], "AnswerGroupList", []);
-            this.$set(this.QuestionList[index], "JudgeType", 0);
-            this.$set(this.QuestionList[index], "JudgeDifferenceValue", 0);
-            this.$set(this.QuestionList[index], "JudgeDifferenceType", 0);
-            this.$message.success(this.$t("trials:adRules:message:msg7")); // '重置成功'
-            this.btnLoading = false;
-            this.loading = false;
+            this.$set(this.QuestionList[index], 'AnswerGroup2List', [])
+            this.$set(this.QuestionList[index], 'AnswerGroupList', [])
+            this.$set(this.QuestionList[index], 'JudgeType', 0)
+            this.$set(this.QuestionList[index], 'JudgeDifferenceValue', 0)
+            this.$set(this.QuestionList[index], 'JudgeDifferenceType', 0)
+            this.$message.success(this.$t('trials:adRules:message:msg7')) // '重置成功'
+            this.btnLoading = false
+            this.loading = false
           })
           .catch(() => {
-            this.btnLoading = false;
-            this.loading = false;
-          });
-      });
+            this.btnLoading = false
+            this.loading = false
+          })
+      })
     },
     async apply(ReadingQuestionTrialId, index) {
       if (this.QuestionList[index].JudgeType === 0) {
-        this.$alert(this.$t("trials:adRules:message:msg8")); // '请先配置规则才能应用'
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg8')) // '请先配置规则才能应用'
+        return
       }
       if (
         this.QuestionList[index].JudgeType === 2 &&
         this.QuestionList[index].AnswerGroup2List.length === 0
       ) {
-        this.$alert(this.$t("trials:adRules:message:msg8")); // '请先配置规则才能应用'
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg8')) // '请先配置规则才能应用'
+        return
       }
       if (
         this.QuestionList[index].JudgeType === 3 &&
         this.QuestionList[index].AnswerGroupList.length === 0
       ) {
-        this.$alert(this.$t("trials:adRules:message:msg8"));
-        return;
+        this.$alert(this.$t('trials:adRules:message:msg8'))
+        return
       }
       if (
         this.QuestionList[index].JudgeType === 4 ||
@@ -845,15 +849,15 @@ export default {
       ) {
         try {
           let validate = await this.$refs[
-            "JudgeDifferenceValue" + this.QuestionList[index].JudgeType + index
-          ][0].validate();
-          if (!validate) return;
+            'JudgeDifferenceValue' + this.QuestionList[index].JudgeType + index
+          ][0].validate()
+          if (!validate) return
         } catch (err) {
-          return;
+          return
         }
       }
-      this.btnLoading = true;
-      this.loading = true;
+      this.btnLoading = true
+      this.loading = true
       setTrialCriterionJudgeQuestionAnswerGroup({
         ReadingQuestionTrialId: ReadingQuestionTrialId,
         AnswerGroup: this.QuestionList[index].AnswerGroup2List,
@@ -867,49 +871,49 @@ export default {
         ),
       })
         .then((res) => {
-          this.$message.success(this.$t("trials:adRules:message:msg9")); // '应用成功'
-          this.btnLoading = false;
-          this.loading = false;
+          this.$message.success(this.$t('trials:adRules:message:msg9')) // '应用成功'
+          this.btnLoading = false
+          this.loading = false
         })
         .catch(() => {
-          this.btnLoading = false;
-          this.loading = false;
-        });
+          this.btnLoading = false
+          this.loading = false
+        })
     },
     tabClick(v) {
       this.ReadingQuestionCriterionTrialId =
-        this.CriterionList[this.index].ReadingQuestionCriterionTrialId;
+        this.CriterionList[this.index].ReadingQuestionCriterionTrialId
     },
     getList() {
-      this.loading = true;
+      this.loading = true
       getTrialCriterionJudgeQuestionList({
         TrialId: this.$route.query.trialId,
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.loading = false;
-          this.QuestionList = res.Result;
-          this.OtherInfo = res.OtherInfo;
+          this.loading = false
+          this.QuestionList = res.Result
+          this.OtherInfo = res.OtherInfo
           this.activeNames = this.QuestionList.map(
             (v) => v.ReadingQuestionTrialId
-          );
+          )
           this.QuestionList.forEach((v) => {
-            this.$set(v, "grouping", []);
-            this.$set(v, "groupingA", []);
-            this.$set(v, "groupingB", []);
+            this.$set(v, 'grouping', [])
+            this.$set(v, 'groupingA', [])
+            this.$set(v, 'groupingB', [])
             this.$set(
               v,
-              "AnswerGroupList",
+              'AnswerGroupList',
               Object.assign([], v.AnswerCombination)
-            );
-            this.$set(v, "AnswerGroup2List", Object.assign([], v.AnswerGroup));
-          });
+            )
+            this.$set(v, 'AnswerGroup2List', Object.assign([], v.AnswerGroup))
+          })
         })
         .catch(() => {
-          this.btnLoading = false;
-          this.loading = false;
-        });
+          this.btnLoading = false
+          this.loading = false
+        })
     },
   },
-};
+}
 </script>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index d34b0cf7..bd98039d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -631,7 +631,7 @@
         </el-radio-group>
       </el-form-item>
       <!-- 是否裁判问题 -->
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'"
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
                     :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
         <el-radio-group
           v-model="form.IsJudgeQuestion"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index a99e4019..037c4de9 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -170,7 +170,7 @@
           </el-button>
           <!-- 表格问题 -->
           <el-button
-            v-if="scope.row.Type === 'table'"
+            v-if="scope.row.Type === 'table' || scope.row.Type === 'basicTable'"
             type="primary"
             size="mini"
             @click="handleConfig(scope.row)"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue
index fda5eb60..ea0191bb 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue
@@ -11,6 +11,7 @@
       <!-- '表单问题' -->
       <el-form-item :label="$t('trials:readingUnit:readingCriterion:title:formQs')">
         <QuestionsList
+          :ref="`questionList${trialReadingCriterionId}`"
           v-if="form.FormType===1"
           :trial-reading-criterion-id="trialReadingCriterionId"
           :list="readingInfo.TrialQuestionList"
@@ -170,6 +171,9 @@ export default {
         })
       })
     },
+    getQuestionLength() {
+      return this.$refs['questionList' + this.trialReadingCriterionId].tblList.length
+    },
     reloadArbitrationRules() {
       this.$emit('reloadArbitrationRules')
     },
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index b1d1d410..0fec6a0c 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -70,7 +70,7 @@
             :label="item.value"
             v-for="item in $d.YesOrNoModality"
             :key="item.id"
-            >
+          >
             {{ item.label }}
           </el-radio>
         </el-radio-group>
@@ -103,7 +103,13 @@
           @click.stop="handleCheckAllChange"
           type="success"
           >{{
-            $t("trials:readingUnit:readingRules:title:CriterionModalitysAll")
+            CriterionModalitys.length === modalityList.length
+              ? $t(
+                  'trials:readingUnit:readingRules:title:CriterionModalitysCancel'
+                )
+              : $t(
+                  'trials:readingUnit:readingRules:title:CriterionModalitysAll'
+                )
           }}</el-button
         >
       </el-form-item>
@@ -131,6 +137,7 @@
       <el-form-item
         :label="$t('trials:processCfg:form:IsAdditionalAssessment')"
         prop="IsAdditionalAssessment"
+        v-if="CriterionType === 1"
       >
         <el-radio-group
           v-model="form.IsAdditionalAssessment"
@@ -182,7 +189,7 @@
           "
           @change="
             () => {
-              form.IsArbitrationReading = false;
+              form.IsArbitrationReading = false
             }
           "
         >
@@ -232,8 +239,8 @@
           @change="
             (v) => {
               if (!v) {
-                form.IsGlobalReading = v;
-                form.IsOncologyReading = v;
+                form.IsGlobalReading = v
+                form.IsOncologyReading = v
               }
             }
           "
@@ -306,15 +313,15 @@
           "
           @change="
             (v) => {
-              form.ImageDownloadEnum = 0;
-              form.ImageUploadEnum = 0;
+              form.ImageDownloadEnum = 0
+              form.ImageUploadEnum = 0
               if (v) {
-                form.IsReadingShowSubjectInfo = true;
-                form.IsReadingShowPreviousResults = true;
-                form.ReadingTaskViewEnum = 0;
-                form.IseCRFShowInDicomReading = false;
+                form.IsReadingShowSubjectInfo = true
+                form.IsReadingShowPreviousResults = true
+                form.ReadingTaskViewEnum = 0
+                form.IseCRFShowInDicomReading = false
               } else {
-                form.ReadingTaskViewEnum = 2;
+                form.ReadingTaskViewEnum = 2
               }
             }
           "
@@ -351,19 +358,16 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--支持影像下载-->
+      <!--支持影像下载v-if="CriterionType === 0"-->
       <el-form-item
         :label="$t('trials:processCfg:form:ImageDownloadEnum')"
         prop="ImageDownloadEnum"
-        v-if="CriterionType === 0"
       >
         <el-radio-group
           v-model="form.ImageDownloadEnum"
           :disabled="
             isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
           <el-radio
@@ -379,15 +383,12 @@
       <el-form-item
         :label="$t('trials:processCfg:form:ImageUploadEnum')"
         prop="ImageUploadEnum"
-        v-if="CriterionType === 0"
       >
         <el-radio-group
           v-model="form.ImageUploadEnum"
           :disabled="
             isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
           <el-radio
@@ -442,7 +443,7 @@
           @change="
             (v) => {
               if (!v) {
-                form.IseCRFShowInDicomReading = true;
+                form.IseCRFShowInDicomReading = true
               }
             }
           "
@@ -541,7 +542,7 @@
             "
             @change="
               (v) => {
-                $set(form, 'AdditionalAssessmentType' + item.Id, v);
+                $set(form, 'AdditionalAssessmentType' + item.Id, v)
               }
             "
           >
@@ -563,21 +564,21 @@
       >
         <!-- 保存 -->
         <el-button type="primary" @click="handleSave(true)">
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { getCriterionReadingInfo, setCriterionReadingInfo } from "@/api/trials";
+import { getCriterionReadingInfo, setCriterionReadingInfo } from '@/api/trials'
 export default {
-  name: "ReadingRules",
+  name: 'ReadingRules',
   props: {
     trialReadingCriterionId: {
       type: String,
       default() {
-        return "";
+        return ''
       },
     },
     CriterionType: {
@@ -589,7 +590,7 @@ export default {
     return {
       additionalAssessmentOptionList: [],
       form: {
-        TrialId: "",
+        TrialId: '',
         ImagePlatform: null,
         ReadingTool: 0,
         ReadingTaskViewEnum: null,
@@ -624,151 +625,151 @@ export default {
         IsAutoCreate: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsAdditionalAssessment: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImagePlatform: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingTool: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImageDownloadEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ImageUploadEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsImageFilter: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingTaskViewEnum: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsImageLabeled: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingShowSubjectInfo: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingShowPreviousResults: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         ReadingType: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingTaskViewInOrder: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsGlobalReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsArbitrationReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsOncologyReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         DigitPlaces: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IseCRFShowInDicomReading: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         IsReadingPeriod: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
         CriterionModalitys: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
           {
             validator: (rule, value, callback) => {
               if (value && Array.isArray(value) && value.length < 0) {
-                callback(new Error(this.$t("common:ruleMessage:select")));
+                callback(new Error(this.$t('common:ruleMessage:select')))
               } else {
-                callback();
+                callback()
               }
             },
-            trigger: ["blur", "change"],
+            trigger: ['blur', 'change'],
           },
         ],
         // IsReadingTaskViewInOrder: [
@@ -785,15 +786,15 @@ export default {
       modalityList: [],
       CriterionModalitys: [],
       modalityIsCheck: false, // 是否允许影像筛选
-    };
+    }
   },
   mounted() {
-    this.initPage();
+    this.initPage()
   },
   watch: {
     CriterionModalitys: {
       handler() {
-        this.form.CriterionModalitys = this.CriterionModalitys.join("|");
+        this.form.CriterionModalitys = this.CriterionModalitys.join('|')
       },
       deep: true,
     },
@@ -802,19 +803,19 @@ export default {
     // 检查类型筛选值变更
     IsImageFilterChange(data) {
       if (data) {
-        this.CriterionModalitys = this.modalityList;
+        this.CriterionModalitys = this.modalityList
       } else {
-        this.CriterionModalitys = [];
+        this.CriterionModalitys = []
       }
     },
     // 影像模态全选
     handleCheckAllChange() {
       this.CriterionModalitys =
-        this.CriterionModalitys.length <= 0 ? this.modalityList : [];
+        this.CriterionModalitys.length <= 0 ? this.modalityList : []
     },
     initPage() {
-      this.loading = true;
-      const trialId = this.$route.query.trialId;
+      this.loading = true
+      const trialId = this.$route.query.trialId
       // getTrialCriterionAdditionalAssessmentOptionList(this.trialReadingCriterionId).then(res => {
       //   this.additionalAssessmentOptionList = res.Result
       //   if (this.additionalAssessmentOptionList.length > 0) {
@@ -827,46 +828,46 @@ export default {
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
-          this.loading = false;
-          this.modalityList = res.Result.TrialModalitys.split("|").filter(
+          this.loading = false
+          this.modalityList = res.Result.TrialModalitys.split('|').filter(
             (item) => item && item.trim()
-          );
+          )
           for (const k in this.form) {
             if (res.Result.hasOwnProperty(k)) {
-              this.form[k] = res.Result[k];
+              this.form[k] = res.Result[k]
             }
           }
           this.CriterionModalitys = this.form.CriterionModalitys
-            ? this.form.CriterionModalitys.split("|")
-            : [];
+            ? this.form.CriterionModalitys.split('|')
+            : []
           this.form.TrialCriterionAdditionalAssessmentTypeList.forEach((v) => {
-            this.$set(v, "IsSelected", v.IsSelected || false);
+            this.$set(v, 'IsSelected', v.IsSelected || false)
             this.$set(
               this.form,
-              "AdditionalAssessmentType" + v.Id,
+              'AdditionalAssessmentType' + v.Id,
               v.IsSelected
-            );
-          });
-          this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder;
-          this.isConfirm = res.Result.IsSign;
-          this.IsMustGlobalReading = res.Result.IsMustGlobalReading;
-          this.$emit("setConfirm", res.Result.IsSign);
-          this.$emit("setArbitrationReading", res.Result.IsArbitrationReading);
+            )
+          })
+          this.isReadingTaskViewInOrder = res.Result.IsReadingTaskViewInOrder
+          this.isConfirm = res.Result.IsSign
+          this.IsMustGlobalReading = res.Result.IsMustGlobalReading
+          this.$emit('setConfirm', res.Result.IsSign)
+          this.$emit('setArbitrationReading', res.Result.IsArbitrationReading)
           this.$emit(
-            "setAdditionalAssessment",
+            'setAdditionalAssessment',
             this.form.IsAdditionalAssessment
-          );
-          this.$emit("setIsClinicalReading", res.Result.IsClinicalReading);
-          this.$emit("setGlobalReading", res.Result.IsGlobalReading);
-          this.$emit("setOncologyReading", res.Result.IsOncologyReading);
-          this.$emit("setDigitPlaces", res.Result.DigitPlaces);
+          )
+          this.$emit('setIsClinicalReading', res.Result.IsClinicalReading)
+          this.$emit('setGlobalReading', res.Result.IsGlobalReading)
+          this.$emit('setOncologyReading', res.Result.IsOncologyReading)
+          this.$emit('setDigitPlaces', res.Result.DigitPlaces)
           if (res.Result.ReadingType === 1) {
-            this.$emit("setArbitrationReading", false);
+            this.$emit('setArbitrationReading', false)
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
       // }).catch(() => {
       //   this.loading = false
       // })
@@ -874,52 +875,52 @@ export default {
     // 配置信息保存
     handleSave(isPrompt = true) {
       return new Promise((resolve, reject) => {
-        this.$refs["readingRulesForm"].validate((valid) => {
+        this.$refs['readingRulesForm'].validate((valid) => {
           if (!valid) {
-            resolve(false);
+            resolve(false)
           } else {
-            this.loading = true;
+            this.loading = true
             if (this.form.ReadingType === 1) {
-              this.form.IsArbitrationReading = false;
+              this.form.IsArbitrationReading = false
             }
             // 保存配置信息
-            this.form.TrialReadingCriterionId = this.trialReadingCriterionId;
+            this.form.TrialReadingCriterionId = this.trialReadingCriterionId
             setCriterionReadingInfo(this.form)
               .then((res) => {
-                this.loading = false;
-                this.$emit("reloadArbitrationRules");
+                this.loading = false
+                this.$emit('reloadArbitrationRules')
                 this.$emit(
-                  "setArbitrationReading",
+                  'setArbitrationReading',
                   this.form.IsArbitrationReading
-                );
+                )
                 this.$emit(
-                  "setAdditionalAssessment",
+                  'setAdditionalAssessment',
                   this.form.IsAdditionalAssessment
-                );
-                this.$emit("setIsClinicalReading", this.form.IsClinicalReading);
-                this.$emit("setGlobalReading", this.form.IsGlobalReading);
-                this.$emit("setOncologyReading", this.form.IsOncologyReading);
-                this.$emit("setDigitPlaces", this.form.DigitPlaces);
+                )
+                this.$emit('setIsClinicalReading', this.form.IsClinicalReading)
+                this.$emit('setGlobalReading', this.form.IsGlobalReading)
+                this.$emit('setOncologyReading', this.form.IsOncologyReading)
+                this.$emit('setDigitPlaces', this.form.DigitPlaces)
                 if (this.form.ReadingType === 1) {
-                  this.$emit("setArbitrationReading", false);
+                  this.$emit('setArbitrationReading', false)
                 }
                 if (res.IsSuccess && isPrompt) {
                   this.$message.success(
-                    this.$t("common:message:savedSuccessfully")
-                  );
+                    this.$t('common:message:savedSuccessfully')
+                  )
                 }
-                resolve(true);
+                resolve(true)
               })
               .catch((_) => {
-                this.loading = false;
-                resolve(false);
-              });
+                this.loading = false
+                resolve(false)
+              })
           }
-        });
-      });
+        })
+      })
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .reading-rule-config-form {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index ad1d8c80..157f44d3 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -370,11 +370,11 @@ export default {
                 isCheck: readingRules,
                 msg: this.$t("trials:readingUnit:readingRules"), // '阅片规则'
               });
-              // var readingCriterions = await this.$refs['readingCriterions' + this.TrialReadingCriterionId][0].handleSave(false)
-              // isCheckList.push({
-              //   isCheck: readingCriterions,
-              //   msg: '阅片标准'
-              // })
+              var qsLength = this.$refs['readingCriterions' + this.TrialReadingCriterionId][0].getQuestionLength()
+              isCheckList.push({
+                isCheck: qsLength > 0,
+                msg: this.$t('trials:readingUnit:readingCriterion')
+              })
               if (
                 this.$refs["globalReading" + this.TrialReadingCriterionId] &&
                 this.$refs["globalReading" + this.TrialReadingCriterionId]
@@ -497,12 +497,16 @@ export default {
         });
     },
     reloadArbitrationRules() {
-      this.$refs[
+      if (this.$refs[
         "arbitrationRules" + this.TrialReadingCriterionId
-      ][0].getList();
-      this.$refs[
-        "arbitrationRules" + this.TrialReadingCriterionId
-      ][0].getTrialJudgyInfo();
+      ]) {
+        this.$refs[
+          "arbitrationRules" + this.TrialReadingCriterionId
+        ][0].getList();
+        this.$refs[
+          "arbitrationRules" + this.TrialReadingCriterionId
+        ][0].getTrialJudgyInfo();
+      }
     },
   },
 };
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
index e0fd6e5b..6c79f133 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
@@ -37,7 +37,7 @@
           <p class="form_p copyBox">
             {{ form.CalledAE }}
             <el-tooltip placement="right" effect="light" v-if="form.CalledAE">
-              <div slot="content">{{ $t("common:button:tip:copy") }}</div>
+              <div slot="content">{{ $t('common:button:tip:copy') }}</div>
               <i class="el-icon-document-copy" @click.stop="copyLink"></i>
             </el-tooltip>
           </p>
@@ -61,7 +61,7 @@
             effect="plain"
             v-if="form.IsTestOK !== null"
           >
-            {{ $fd("DicomTest", form.IsTestOK) }}
+            {{ $fd('DicomTest', form.IsTestOK) }}
           </el-tag>
           <!-- 测试DICOM AE style="position: absolute; right: 100px; top: 0"-->
           <el-button
@@ -74,7 +74,7 @@
             size="mini"
             @click.stop="testSCPServerConnect"
           >
-            {{ $t("common:button:DicomTest") }}
+            {{ $t('common:button:DicomTest') }}
           </el-button>
         </el-form-item>
       </template>
@@ -88,7 +88,7 @@
           type="primary"
           @click="addOrUpdateDicomAE"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
         <!-- 配置确认:disabled="!form.IsTestOK" -->
         <el-button
@@ -99,7 +99,7 @@
           type="primary"
           @click="handleConfirm"
         >
-          {{ $t("trials:trialCfg:button:confirm") }}
+          {{ $t('trials:trialCfg:button:confirm') }}
         </el-button>
         <!-- 配置更新 -->
         <el-button
@@ -111,7 +111,7 @@
           type="primary"
           @click="isEdit = true"
         >
-          {{ $t("trials:trialCfg:button:update") }}
+          {{ $t('trials:trialCfg:button:update') }}
         </el-button>
         <!-- 配置更新确认:disabled="!form.IsTestOK" -->
         <el-button
@@ -123,7 +123,7 @@
           type="primary"
           @click="handleUpdate"
         >
-          {{ $t("trials:trialCfg:button:updateAndConfirm") }}
+          {{ $t('trials:trialCfg:button:updateAndConfirm') }}
         </el-button>
         <!-- 取消 -->
         <el-button
@@ -135,7 +135,7 @@
           type="primary"
           @click.stop="confirmCancel"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
       </el-form-item>
     </el-form>
@@ -148,9 +148,9 @@
       custom-class="base-dialog-wrapper"
     >
       <div slot="title">
-        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
-          `(${$t("common:label:sign")}${currentUser})`
+          `(${$t('common:label:sign')}${currentUser})`
         }}</span>
       </div>
       <SignForm
@@ -190,7 +190,7 @@
       >
         <!-- 确认 -->
         <el-button size="small" type="primary" @click="handleConfirmConfigData">
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
+          {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
     </el-dialog>
@@ -243,7 +243,7 @@
       >
         <!-- 确认 -->
         <el-button size="small" type="primary" @click="handleUpdateConfigData">
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
+          {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
     </el-dialog>
@@ -256,11 +256,11 @@ import {
   testSCPServerConnect,
   ConfigTrialPACSInfoConfirm,
   getTrialPacsConfigInfo,
-} from "@/api/trials";
-import SignForm from "@/views/trials/components/newSignForm";
-import const_ from "@/const/sign-code";
+} from '@/api/trials'
+import SignForm from '@/views/trials/components/newSignForm'
+import const_ from '@/const/sign-code'
 export default {
-  name: "dicomConfig",
+  name: 'dicomConfig',
   components: { SignForm },
   data() {
     return {
@@ -279,91 +279,91 @@ export default {
         IsPACSConnect: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
         ],
         CalledAE: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
-              let reg = /[a-zA-Z0-9]/;
-              if (!reg.test(value) && value !== "") {
+              let reg = /[a-zA-Z0-9]/
+              if (!reg.test(value) && value !== '') {
                 callback(
-                  new Error(this.$t("common:ruleMessage:CallingAEPattern"))
-                );
+                  new Error(this.$t('common:ruleMessage:CallingAEPattern'))
+                )
               } else {
-                callback();
+                callback()
               }
             },
-            message: this.$t("common:ruleMessage:CallingAEPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:CallingAEPattern'),
+            trigger: 'blur',
           },
           {
             min: 1,
             max: 16,
-            message: this.$t("common:ruleMessage:CallingAEPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:CallingAEPattern'),
+            trigger: 'blur',
           },
         ],
         Ip: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
               if (
-                value === "" ||
-                typeof value === "undefined" ||
+                value === '' ||
+                typeof value === 'undefined' ||
                 value == null
               ) {
-                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                callback(new Error(this.$t('common:ruleMessage:ipPattern')))
               } else {
                 const reg =
-                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
-                if (!reg.test(value) && value !== "") {
-                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+                if (!reg.test(value) && value !== '') {
+                  callback(new Error(this.$t('common:ruleMessage:ipPattern')))
                 } else {
-                  callback();
+                  callback()
                 }
               }
             },
-            message: this.$t("common:ruleMessage:ipPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:ipPattern'),
+            trigger: 'blur',
           },
         ],
         Port: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
-            type: "number",
+            type: 'number',
             min: 0,
             max: 65535,
-            message: this.$t("common:ruleMessage:portPattern"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:portPattern'),
+            trigger: 'blur',
           },
           {
             validator: (rule, value, callback) => {
               if (
                 value &&
-                (String(value).includes(".") ||
+                (String(value).includes('.') ||
                   new RegExp(/\D/g).test(String(value)))
               ) {
-                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+                callback(new Error(this.$t('common:ruleMessage:portPattern')))
               } else {
-                callback();
+                callback()
               }
             },
-            trigger: "blur",
+            trigger: 'blur',
           },
         ],
       },
@@ -371,91 +371,94 @@ export default {
       Id: null,
       signVisible: false,
       signCode: null,
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       confirmData: [],
       confirmVisible: false,
       updateVisible: false,
       defaultObj: {},
-    };
+    }
   },
   methods: {
     copyLink() {
       this.$copyText(
-        `${this.$t("trials:dicomCfg:form:CalledAE")}: ${
+        `${this.$t('trials:dicomCfg:form:CalledAE')}: ${
           this.form.CalledAE
-        }\n${this.$t("trials:dicomCfg:form:Ip")}: ${this.form.Ip}\n${this.$t(
-          "trials:dicomCfg:form:Port"
+        }\n${this.$t('trials:dicomCfg:form:Ip')}: ${this.form.Ip}\n${this.$t(
+          'trials:dicomCfg:form:Port'
         )}: ${this.form.Port}\n${this.$t(
-          "trials:dicomCfg:form:Description"
-        )}: ${this.$t("trials:dicomCfg:Description:message2")}`
+          'trials:dicomCfg:form:Description'
+        )}: ${this.$t('trials:dicomCfg:Description:message').replace(
+          'xxx',
+          this.$company()
+        )}`
       )
         .then((res) => {
           // 复制成功
           this.$message.success(
-            this.$t("trials:researchRecord:message:copySuccessfully")
-          );
+            this.$t('trials:researchRecord:message:copySuccessfully')
+          )
         })
         .catch(() => {
           // 复制失败
-          this.$alert(this.$t("trials:researchRecord:message:copyFailed"));
-        });
+          this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
+        })
     },
     // 获取默认值
     async getTrialPacsConfigInfo() {
       try {
         let param = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getTrialPacsConfigInfo(param);
+        }
+        let res = await getTrialPacsConfigInfo(param)
         if (res.IsSuccess) {
-          this.defaultObj = res.Result;
+          this.defaultObj = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     changeConnect(val) {
       if (!val) {
-        this.form.CalledAE = null;
-        this.form.Ip = null;
-        this.form.Port = null;
-        this.form.Modality = null;
-        this.form.IsTestOK = null;
+        this.form.CalledAE = null
+        this.form.Ip = null
+        this.form.Port = null
+        this.form.Modality = null
+        this.form.IsTestOK = null
       } else {
-        this.form.CalledAE = this.defaultObj.TrialCalledAE;
-        this.form.Ip = this.defaultObj.Ip;
-        this.form.Port = this.defaultObj.Port;
-        this.testSCPServerConnect();
+        this.form.CalledAE = this.defaultObj.TrialCalledAE
+        this.form.Ip = this.defaultObj.Ip
+        this.form.Port = this.defaultObj.Port
+        this.testSCPServerConnect()
       }
     },
     initForm(res) {
-      this.getInfo();
-      this.getTrialPacsConfigInfo();
+      this.getInfo()
+      this.getTrialPacsConfigInfo()
     },
     // 取消配置更新
     confirmCancel() {
-      this.isEdit = false;
-      this.form = { ...this.initialForm };
+      this.isEdit = false
+      this.form = { ...this.initialForm }
     },
     // 测试dicomAE
     async testSCPServerConnect() {
       try {
-        let validate = await this.$refs.dicomConfigForm.validate();
-        if (!validate) return;
+        let validate = await this.$refs.dicomConfigForm.validate()
+        if (!validate) return
         let data = {
           CalledAE: this.form.CalledAE,
           Ip: this.form.Ip,
           Port: this.form.Port,
-        };
-        this.loading = true;
-        let d = await testSCPServerConnect(data);
-        this.loading = false;
+        }
+        this.loading = true
+        let d = await testSCPServerConnect(data)
+        this.loading = false
         if (d.IsSuccess) {
-          this.form.IsTestOK = d.Result;
+          this.form.IsTestOK = d.Result
         }
       } catch (err) {
-        console.log(err);
-        this.loading = false;
+        console.log(err)
+        this.loading = false
       }
     },
     // 获取配置
@@ -463,66 +466,66 @@ export default {
       try {
         let data = {
           TrialId: this.$route.query.trialId,
-        };
-        this.loading = true;
-        let res = await getTrialDicomAE(data);
-        this.loading = false;
+        }
+        this.loading = true
+        let res = await getTrialDicomAE(data)
+        this.loading = false
         if (res.IsSuccess) {
-          res.Result = res.Result || {};
-          this.form.IsPACSConnect = res.OtherInfo.IsPACSConnect;
-          this.form.IsTrialPACSConfirmed = res.OtherInfo.IsTrialPACSConfirmed;
+          res.Result = res.Result || {}
+          this.form.IsPACSConnect = res.OtherInfo.IsPACSConnect
+          this.form.IsTrialPACSConfirmed = res.OtherInfo.IsTrialPACSConfirmed
           if (!res.OtherInfo.IsTrialPACSConfirmed) {
-            this.isEdit = true;
+            this.isEdit = true
           }
-          this.form.IsTestOK = res.Result.IsTestOK || null;
-          this.form.CalledAE = res.Result.CalledAE;
-          this.form.Ip = res.Result.IP;
-          this.form.Port = res.Result.Port;
-          this.Id = res.Result.Id;
+          this.form.IsTestOK = res.Result.IsTestOK || null
+          this.form.CalledAE = res.Result.CalledAE
+          this.form.Ip = res.Result.IP
+          this.form.Port = res.Result.Port
+          this.Id = res.Result.Id
 
-          this.initialForm.IsPACSConnect = res.OtherInfo.IsPACSConnect;
+          this.initialForm.IsPACSConnect = res.OtherInfo.IsPACSConnect
           this.initialForm.IsTrialPACSConfirmed =
-            res.OtherInfo.IsTrialPACSConfirmed;
-          this.initialForm.IsTestOK = res.Result.IsTestOK;
-          this.initialForm.CalledAE = res.Result.CalledAE;
-          this.initialForm.Ip = res.Result.IP;
-          this.initialForm.Port = res.Result.Port;
+            res.OtherInfo.IsTrialPACSConfirmed
+          this.initialForm.IsTestOK = res.Result.IsTestOK
+          this.initialForm.CalledAE = res.Result.CalledAE
+          this.initialForm.Ip = res.Result.IP
+          this.initialForm.Port = res.Result.Port
         }
       } catch (err) {
-        console.log(err);
-        this.loading = false;
+        console.log(err)
+        this.loading = false
       }
     },
     // 新增或修改配置
     async addOrUpdateDicomAE() {
       try {
-        let validate = await this.$refs.dicomConfigForm.validate();
-        if (!validate) return;
+        let validate = await this.$refs.dicomConfigForm.validate()
+        if (!validate) return
         if (this.Id) {
-          this.form.Id = this.Id;
+          this.form.Id = this.Id
         }
-        this.form.TrialId = this.$route.query.trialId;
-        this.loading = true;
-        let res = await addOrUpdateDicomAE(this.form);
-        this.loading = false;
+        this.form.TrialId = this.$route.query.trialId
+        this.loading = true
+        let res = await addOrUpdateDicomAE(this.form)
+        this.loading = false
         if (res.IsSuccess) {
           // this.$emit("refresh");
-          this.Id = res.Result;
-          return res.Result || res.IsSuccess;
+          this.Id = res.Result
+          return res.Result || res.IsSuccess
         }
-        return false;
+        return false
       } catch (err) {
-        console.log(err);
-        this.loading = false;
-        return false;
+        console.log(err)
+        this.loading = false
+        return false
       }
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.signConfirm(signInfo);
+        this.signConfirm(signInfo)
       } else {
-        this.signVisible = false;
+        this.signVisible = false
       }
     },
     async signConfirm(signInfo) {
@@ -534,89 +537,89 @@ export default {
             IsTrialPACSConfirmed: true,
           },
           signInfo,
-        };
-        let res = await ConfigTrialPACSInfoConfirm(data);
+        }
+        let res = await ConfigTrialPACSInfoConfirm(data)
         if (res.IsSuccess) {
-          this.signVisible = false;
-          this.confirmVisible = false;
-          this.updateVisible = false;
-          this.isEdit = false;
-          res = await this.addOrUpdateDicomAE();
-          if (res) this.$emit("refresh");
+          this.signVisible = false
+          this.confirmVisible = false
+          this.updateVisible = false
+          this.isEdit = false
+          res = await this.addOrUpdateDicomAE()
+          if (res) this.$emit('refresh')
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 配置更新
     handleUpdateConfigData() {
-      const { DicomConfigUpdates } = const_.processSignature;
-      this.signCode = DicomConfigUpdates;
-      this.signVisible = true;
+      const { DicomConfigUpdates } = const_.processSignature
+      this.signCode = DicomConfigUpdates
+      this.signVisible = true
     },
     // 配置确认
     handleConfirmConfigData() {
-      const { DicomConfigConfirmation } = const_.processSignature;
-      this.signCode = DicomConfigConfirmation;
-      this.signVisible = true;
+      const { DicomConfigConfirmation } = const_.processSignature
+      this.signCode = DicomConfigConfirmation
+      this.signVisible = true
     },
     // 打开配置信息确认框
     handleConfirm() {
-      this.$refs["dicomConfigForm"].validate(async (valid) => {
-        if (!valid) return;
+      this.$refs['dicomConfigForm'].validate(async (valid) => {
+        if (!valid) return
         if (!this.form.IsTestOK && this.form.IsPACSConnect)
           return this.$message.warning(
-            this.$t("trials:dicomCfg:message:IsTestNo")
-          );
-        this.getConfigArr();
-        this.confirmVisible = true;
-      });
+            this.$t('trials:dicomCfg:message:IsTestNo')
+          )
+        this.getConfigArr()
+        this.confirmVisible = true
+      })
     },
 
     // 打开配置信息更新框
     handleUpdate() {
-      this.$refs["dicomConfigForm"].validate(async (valid) => {
-        if (!valid) return;
+      this.$refs['dicomConfigForm'].validate(async (valid) => {
+        if (!valid) return
         if (!this.form.IsTestOK && this.form.IsPACSConnect)
           return this.$message.warning(
-            this.$t("trials:dicomCfg:message:IsTestNo")
-          );
-        this.getConfigArr();
-        this.updateVisible = true;
-      });
+            this.$t('trials:dicomCfg:message:IsTestNo')
+          )
+        this.getConfigArr()
+        this.updateVisible = true
+      })
     },
     // 配置信息数组结构
     getConfigArr() {
       this.confirmData = [
         {
-          Name: this.$t("trials:dicomCfg:form:pacsLine"), // pacs直连
-          NewVal: this.$fd("PACSConnectMode", this.form.IsPACSConnect),
-          OldVal: this.$fd("PACSConnectMode", this.initialForm.IsPACSConnect),
+          Name: this.$t('trials:dicomCfg:form:pacsLine'), // pacs直连
+          NewVal: this.$fd('PACSConnectMode', this.form.IsPACSConnect),
+          OldVal: this.$fd('PACSConnectMode', this.initialForm.IsPACSConnect),
         },
         {
-          Name: this.$t("trials:dicomCfg:form:CalledAE"), // AE名称
+          Name: this.$t('trials:dicomCfg:form:CalledAE'), // AE名称
           NewVal: this.form.CalledAE,
           OldVal: this.initialForm.CalledAE,
         },
         {
-          Name: this.$t("trials:dicomCfg:form:Ip"), // IP地址
+          Name: this.$t('trials:dicomCfg:form:Ip'), // IP地址
           NewVal: this.form.Ip,
           OldVal: this.initialForm.Ip,
         },
         {
-          Name: this.$t("trials:dicomCfg:form:Port"),
+          Name: this.$t('trials:dicomCfg:form:Port'),
           NewVal: this.form.Port,
           OldVal: this.initialForm.Port,
         },
         {
-          Name: this.$t("trials:dicomCfg:form:IsTestOK"), // 状态
-          NewVal: this.$fd("DicomTest", this.form.IsTestOK),
-          OldVal: this.$fd("DicomTest", this.initialForm.IsTestOK),
+          Name: this.$t('trials:dicomCfg:form:IsTestOK'), // 状态
+          NewVal: this.$fd('DicomTest', this.form.IsTestOK),
+          OldVal: this.$fd('DicomTest', this.initialForm.IsTestOK),
         },
-      ];
+      ]
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .fontColor {
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index a037a345..8f6fa39d 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -225,7 +225,7 @@
           type="primary"
           @click="handleSave"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
         <!-- 配置确认 -->
         <el-button
@@ -236,7 +236,7 @@
           type="primary"
           @click="handleConfirm"
         >
-          {{ $t("trials:trialCfg:button:confirm") }}
+          {{ $t('trials:trialCfg:button:confirm') }}
         </el-button>
         <!-- 配置更新 -->
         <el-button
@@ -248,7 +248,7 @@
           type="primary"
           @click="isEdit = true"
         >
-          {{ $t("trials:trialCfg:button:update") }}
+          {{ $t('trials:trialCfg:button:update') }}
         </el-button>
         <!-- 配置更新确认 -->
         <el-button
@@ -260,7 +260,7 @@
           type="primary"
           @click="handleUpdate"
         >
-          {{ $t("trials:trialCfg:button:updateAndConfirm") }}
+          {{ $t('trials:trialCfg:button:updateAndConfirm') }}
         </el-button>
         <!-- 取消 -->
         <el-button
@@ -272,7 +272,7 @@
           type="primary"
           @click="confirmCancel"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
       </el-form-item>
     </el-form>
@@ -310,7 +310,7 @@
           :loading="btnLoading"
           @click="handleConfirmConfigData"
         >
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
+          {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
     </el-dialog>
@@ -367,7 +367,7 @@
           :loading="btnLoading"
           @click="handleUpdateConfigData"
         >
-          {{ $t("trials:trialCfg:button:confirmCfg") }}
+          {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
     </el-dialog>
@@ -381,9 +381,9 @@
       custom-class="base-dialog-wrapper"
     >
       <div slot="title">
-        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
-          `(${$t("common:label:sign")}${currentUser})`
+          `(${$t('common:label:sign')}${currentUser})`
         }}</span>
       </div>
       <SignForm
@@ -410,7 +410,7 @@
             icon="el-icon-plus"
             @click="handleAddClinicalData"
           >
-            {{ $t("common:button:new") }}
+            {{ $t('common:button:new') }}
           </el-button>
         </div>
         <el-table
@@ -440,7 +440,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd("ClinicalDataUploadRole", scope.row.UploadRole) }}
+              {{ $fd('ClinicalDataUploadRole', scope.row.UploadRole) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -449,12 +449,12 @@
             width="180"
           >
             <template slot-scope="scope">
-              {{ $fd("ClinicalLevel", scope.row.ClinicalDataLevel) }}
+              {{ $fd('ClinicalLevel', scope.row.ClinicalDataLevel) }}
             </template>
           </el-table-column>
           <el-table-column prop="ClinicalUploadType" label="传输方式">
             <template slot-scope="scope">
-              {{ $fd("ClinicalUploadType", scope.row.ClinicalUploadType) }}
+              {{ $fd('ClinicalUploadType', scope.row.ClinicalUploadType) }}
             </template>
           </el-table-column>
           <el-table-column
@@ -512,7 +512,7 @@
           :disabled="listLoading"
           @click="clinicalDataVisible = false"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           size="small"
@@ -520,7 +520,7 @@
           :disabled="listLoading"
           @click="handleConfirmClinicalData"
         >
-          {{ $t("common:button:confirm") }}
+          {{ $t('common:button:confirm') }}
         </el-button>
       </div>
     </el-dialog>
@@ -557,7 +557,7 @@
           @click="addBodyPart_model.visible = true"
           style="position: absolute; top: 10px; right: 10px; z-index: 9"
         >
-          {{ $t("common:button:add") }}
+          {{ $t('common:button:add') }}
         </el-button>
         <el-table
           ref="bodyPartTable"
@@ -603,7 +603,7 @@
           :disabled="listLoading"
           @click="bodyPartListVisible = false"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           size="small"
@@ -611,7 +611,7 @@
           :disabled="listLoading"
           @click="handleConfirmBodyParts"
         >
-          {{ $t("common:button:confirm") }}
+          {{ $t('common:button:confirm') }}
         </el-button>
       </div>
     </el-dialog>
@@ -673,7 +673,7 @@
           :disabled="listLoading"
           @click="modalityListVisible = false"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           size="small"
@@ -681,7 +681,7 @@
           :disabled="listLoading"
           @click="handleConfirmModality"
         >
-          {{ $t("common:button:confirm") }}
+          {{ $t('common:button:confirm') }}
         </el-button>
       </div>
     </el-dialog>
@@ -701,7 +701,7 @@
             label-width="150px"
           >
             <el-input
-              v-model="addBodyPartForm.bodyPartStr"
+              v-model.trim="addBodyPartForm.bodyPartStr"
               clearable
               type="textarea"
               :rows="2"
@@ -721,15 +721,15 @@
       </template>
       <template slot="dialog-footer">
         <el-button type="primary" @click="addOrUpdateTrialBodyPart">
-          {{ $t("common:button:confirm") }}
+          {{ $t('common:button:confirm') }}
         </el-button>
         <el-button
           @click="
-            (addBodyPart_model.visible = false),
+            ;(addBodyPart_model.visible = false),
               (addBodyPartForm.bodyPartStr = null)
           "
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
       </template>
     </base-model>
@@ -741,38 +741,38 @@ import {
   getTrialClinicalDataTrialSetList,
   deleteClinicalTrialSetData,
   DownloadTrialClinicalFile,
-} from "@/api/trials";
+} from '@/api/trials'
 import {
   ConfigTrialBasicInfoConfirm,
   getTrialBodyPartList,
   addOrUpdateTrialBodyPart,
-} from "@/api/trials/setting";
-import SignForm from "@/views/trials/components/newSignForm";
-import ClinicalDataForm from "./clinicalDataForm";
-import const_ from "@/const/sign-code";
-import BaseModel from "@/components/BaseModel";
+} from '@/api/trials/setting'
+import SignForm from '@/views/trials/components/newSignForm'
+import ClinicalDataForm from './clinicalDataForm'
+import const_ from '@/const/sign-code'
+import BaseModel from '@/components/BaseModel'
 export default {
-  name: "LogicalConfig",
+  name: 'LogicalConfig',
   components: { SignForm, ClinicalDataForm, BaseModel },
   data() {
     return {
       form: {
-        TrialId: "",
+        TrialId: '',
         IsNoticeSubjectCodeRule: false,
-        SubjectCodeRule: "",
+        SubjectCodeRule: '',
         IsSubjectSecondCodeView: false,
         IsVerifyVisitImageDate: false,
         IsHaveFirstGiveMedicineDate: true,
         IsHaveSubjectAge: false,
         IsSubjectSexView: false,
-        OutEnrollmentVisitName: "EOT",
+        OutEnrollmentVisitName: 'EOT',
         // ClinicalInformationTransmissionEnum: 1,
         IsImageReplicationAcrossTrial: false,
-        BodyPartTypes: "",
+        BodyPartTypes: '',
         BodyPartTypeList: [],
-        Modalitys: "",
+        Modalitys: '',
         ModalityList: [],
-        ModalityListStr: "",
+        ModalityListStr: '',
         ChangeDefalutDays: 5,
         IsTrialBasicLogicConfirmed: false,
         // ClinicalDataSetNames: [],
@@ -783,58 +783,58 @@ export default {
         IsNoticeSubjectCodeRule: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
           },
         ],
         SubjectCodeRule: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             max: 250,
-            message: `${this.$t("common:ruleMessage:maxLength")} 250`,
+            message: `${this.$t('common:ruleMessage:maxLength')} 250`,
           },
         ],
         IsSubjectSecondCodeView: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
           },
         ],
         IsVerifyVisitImageDate: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
           },
         ],
         IsHaveFirstGiveMedicineDate: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
           },
         ],
         OutEnrollmentVisitName: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:specify"),
-            trigger: "blur",
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
           },
           {
             max: 250,
-            message: `${this.$t("common:ruleMessage:maxLength")} 50`,
+            message: `${this.$t('common:ruleMessage:maxLength')} 50`,
           },
         ],
         BodyPartTypes: [
           {
             required: true,
-            message: this.$t("trials:trialCfg:formRule:bodyPart"),
-            trigger: "blur",
+            message: this.$t('trials:trialCfg:formRule:bodyPart'),
+            trigger: 'blur',
           },
         ],
         // Modalitys: [
@@ -844,8 +844,8 @@ export default {
         ModalityListStr: [
           {
             required: true,
-            message: this.$t("trials:trialCfg:formRule:modality"),
-            trigger: "blur",
+            message: this.$t('trials:trialCfg:formRule:modality'),
+            trigger: 'blur',
           },
         ],
         // ClinicalDataSetNamesStr: [
@@ -861,14 +861,14 @@ export default {
       btnLoading: false,
       confirmData: [],
       loading: false,
-      signText: "",
-      signCode: "",
-      currentUser: zzSessionStorage.getItem("userName"),
+      signText: '',
+      signCode: '',
+      currentUser: zzSessionStorage.getItem('userName'),
       initialForm: {},
       isEdit: false,
       clinicalDataList: [],
       clinicalDataVisible: false,
-      addOrEditCD: { visible: false, title: "" },
+      addOrEditCD: { visible: false, title: '' },
       currentRow: {},
       selectClinicalDataArr: [],
       selectedCD: [],
@@ -880,8 +880,8 @@ export default {
       trialBodyPartList: [],
       addBodyPart_model: {
         visible: false,
-        title: this.$t("trials:setting:button:add"),
-        width: "500px",
+        title: this.$t('trials:setting:button:add'),
+        width: '500px',
         appendToBody: true,
       },
       addBodyPartForm: {
@@ -892,24 +892,24 @@ export default {
         bodyPartStr: [
           {
             required: true,
-            message: this.$t("trials:setting:format:notBodyPart"),
-            trigger: ["blur", "change"],
+            message: this.$t('trials:setting:format:notBodyPart'),
+            trigger: ['blur', 'change'],
           },
           {
             validator: (rule, value, callback) => {
               let flag = this.trialBodyPartList.some(
                 (item) => item.Name === value
-              );
+              )
               if (flag) {
                 callback(
-                  new Error(this.$t("trials:setting:format:hasBodyPart"))
-                );
+                  new Error(this.$t('trials:setting:format:hasBodyPart'))
+                )
               } else {
-                callback();
+                callback()
               }
             },
-            message: this.$t("trials:setting:format:hasBodyPart"),
-            trigger: ["blur", "change"],
+            message: this.$t('trials:setting:format:hasBodyPart'),
+            trigger: ['blur', 'change'],
           },
         ],
       },
@@ -918,12 +918,12 @@ export default {
       renderFunc(h, option) {
         return (
           <span title={`${option.label} - ${option.raw.Description}`}>
-            {option.label} <span style="color:#ddd">-</span>{" "}
+            {option.label} <span style="color:#ddd">-</span>{' '}
             <span style="color:#999">{option.raw.Description}</span>
           </span>
-        );
+        )
       },
-    };
+    }
   },
   // created() {
   //   this.getTrialBodyPartList();
@@ -931,325 +931,323 @@ export default {
   methods: {
     // 取消配置更新
     confirmCancel() {
-      this.isEdit = false;
-      this.form = { ...this.initialForm };
+      this.isEdit = false
+      this.form = { ...this.initialForm }
     },
     handleConfirmModality() {
       this.form.ModalityList = Object.assign(
         [],
         this.selectedList.map((v) => v)
-      );
+      )
       let Modalitys = this.form.ModalityList.map((item) => {
-        return this.$fd("Modality", item.trim());
-      });
-      this.form.ModalityListStr = Modalitys.toString().replaceAll(",", " | ");
-      this.modalityListVisible = false;
+        return this.$fd('Modality', item.trim())
+      })
+      this.form.ModalityListStr = Modalitys.toString().replaceAll(',', ' | ')
+      this.modalityListVisible = false
     },
     handleSelectionChange(val) {
-      this.selectedList = val;
+      this.selectedList = val
     },
     toggleSelection(rows) {
       if (rows) {
         rows.forEach((row) => {
-          this.$refs.multipleTable.toggleRowSelection(row);
-        });
+          this.$refs.multipleTable.toggleRowSelection(row)
+        })
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     filterMethod(query, item) {
-      return item.value.toLowerCase().indexOf(query.toLowerCase()) > -1;
+      return item.value.toLowerCase().indexOf(query.toLowerCase()) > -1
     },
     handleSetModality() {
-      this.modalityListVisible = true;
+      this.modalityListVisible = true
       var a = this.$d.Modality.filter((v) => {
         return !!this.form.ModalityList.find((v1) => {
-          return v1 === v.value;
-        });
-      });
-      this.selectedList = a.map((item) => item.value);
+          return v1 === v.value
+        })
+      })
+      this.selectedList = a.map((item) => item.value)
     },
     handleBodyPartSelectionChange(val) {
-      this.selectedBodyParts = val;
+      this.selectedBodyParts = val
     },
     // 获取检查部位
     async getTrialBodyPartList(data) {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getTrialBodyPartList(params);
+        }
+        let res = await getTrialBodyPartList(params)
         if (res.IsSuccess) {
-          this.trialBodyPartList = res.Result;
+          this.trialBodyPartList = res.Result
           if (data) {
             if (this.$refs.bodyPartTable) {
               this.$nextTick(() => {
                 let obj = this.trialBodyPartList.filter(
                   (item) => item.Code === data.Code
-                );
-                if(obj[0]){
-                  this.$refs.bodyPartTable.toggleRowSelection(obj[0]);
+                )
+                if (obj[0]) {
+                  this.$refs.bodyPartTable.toggleRowSelection(obj[0])
                 }
-              });
+              })
               var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
-                return this.changeBodyPart(i.trim());
-              });
+                return this.changeBodyPart(i.trim())
+              })
               this.form.BodyPartTypes = bodyPartTypes
                 .toString()
-                .replaceAll(",", " | ");
+                .replaceAll(',', ' | ')
             }
           }
-          return true;
+          return true
         }
-        return false;
+        return false
       } catch (err) {
-        console.log(err);
-        return false;
+        console.log(err)
+        return false
       }
     },
     // 添加检查部位
     async addOrUpdateTrialBodyPart() {
       try {
-        this.errMessage = null;
-        let validate = await this.$refs.addBodyPartForm.validate();
-        if (!validate) return;
-        let str = this.addBodyPartForm.bodyPartStr;
+        this.errMessage = null
+        let validate = await this.$refs.addBodyPartForm.validate()
+        if (!validate) return
+        let str = this.addBodyPartForm.bodyPartStr
         let data = {
           Code: str,
           Name: str,
           NameCN: str,
           TrialId: this.$route.query.trialId,
-        };
-        if (this.addBodyPartForm.Id) {
-          data.Id = this.addBodyPartForm.Id;
-          data.Code = this.addBodyPartForm.Code;
         }
-        let res = await addOrUpdateTrialBodyPart(data);
+        if (this.addBodyPartForm.Id) {
+          data.Id = this.addBodyPartForm.Id
+          data.Code = this.addBodyPartForm.Code
+        }
+        let res = await addOrUpdateTrialBodyPart(data)
         if (res.IsSuccess) {
-          this.getTrialBodyPartList(data);
+          this.getTrialBodyPartList(data)
           this.$message.success(
-            this.$t("trials:seeting:message:addBodyPartSuccess")
-          );
-          this.addBodyPart_model.visible = false;
-          this.addBodyPartForm.bodyPartStr = null;
-          this.addBodyPartForm.Id = null;
+            this.$t('trials:seeting:message:addBodyPartSuccess')
+          )
+          this.addBodyPart_model.visible = false
+          this.addBodyPartForm.bodyPartStr = null
+          this.addBodyPartForm.Id = null
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
         if (err.Code === 5) {
-          this.getTrialBodyPartList();
-          this.errMessage = err.ErrorMessage;
+          this.getTrialBodyPartList()
+          this.errMessage = err.ErrorMessage
         }
       }
     },
     // 编辑检查部位
     handleEditBodyPart(item) {
-      this.addBodyPartForm.bodyPartStr = item.Name;
-      this.addBodyPartForm.Code = item.Code;
-      this.addBodyPartForm.Id = item.Id;
-      this.addBodyPart_model.title = this.$t("trials:setting:button:edit");
-      this.addBodyPart_model.visible = true;
+      this.addBodyPartForm.bodyPartStr = item.Name
+      this.addBodyPartForm.Code = item.Code
+      this.addBodyPartForm.Id = item.Id
+      this.addBodyPart_model.title = this.$t('trials:setting:button:edit')
+      this.addBodyPart_model.visible = true
     },
     handleSetBodyPart() {
-      this.bodyPartListVisible = true;
+      this.bodyPartListVisible = true
       this.$nextTick(() => {
         var a = this.trialBodyPartList.filter((v) => {
           return !!this.form.BodyPartTypeList.find((v1) => {
-            return v1 === v.Code;
-          });
-        });
-        this.toggleBodyPartSelection(a);
-      });
+            return v1 === v.Code
+          })
+        })
+        this.toggleBodyPartSelection(a)
+      })
     },
     toggleBodyPartSelection(rows) {
       if (rows) {
         rows.forEach((row) => {
-          this.$refs.bodyPartTable.toggleRowSelection(row);
-        });
+          this.$refs.bodyPartTable.toggleRowSelection(row)
+        })
       } else {
-        this.$refs.bodyPartTable.clearSelection();
+        this.$refs.bodyPartTable.clearSelection()
       }
     },
     handleConfirmBodyParts() {
       this.form.BodyPartTypeList = Object.assign(
         [],
         this.selectedBodyParts.map((v) => v.Code)
-      );
+      )
       var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
-        return this.changeBodyPart(i.trim());
-      });
-      this.form.BodyPartTypes = bodyPartTypes.join(" | ");
-      this.bodyPartListVisible = false;
+        return this.changeBodyPart(i.trim())
+      })
+      this.form.BodyPartTypes = bodyPartTypes.join(' | ')
+      this.bodyPartListVisible = false
     },
     // 配置信息保存
     handleSave() {
-      this.$refs["logicalConfigForm"].validate((valid) => {
-        if (!valid) return;
-        this.loading = true;
+      this.$refs['logicalConfigForm'].validate((valid) => {
+        if (!valid) return
+        this.loading = true
         // 保存配置信息
-        var params = Object.assign({}, this.form);
+        var params = Object.assign({}, this.form)
         params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(
-          ",",
-          "|"
-        );
+          ',',
+          '|'
+        )
 
         configTrialBasicInfo(params)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.initialForm = { ...this.form };
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.initialForm = { ...this.form }
             }
           })
           .catch((_) => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
 
     // 打开配置信息确认框
     handleConfirm() {
-      this.$refs["logicalConfigForm"].validate((valid) => {
-        if (!valid) return;
-        this.getConfigArr();
-        this.confirmVisible = true;
-      });
+      this.$refs['logicalConfigForm'].validate((valid) => {
+        if (!valid) return
+        this.getConfigArr()
+        this.confirmVisible = true
+      })
     },
 
     // 打开配置信息更新框
     handleUpdate() {
-      this.$refs["logicalConfigForm"].validate((valid) => {
-        if (!valid) return;
-        this.getConfigArr();
-        this.updateVisible = true;
-      });
+      this.$refs['logicalConfigForm'].validate((valid) => {
+        if (!valid) return
+        this.getConfigArr()
+        this.updateVisible = true
+      })
     },
     // 配置确认签名
     handleConfirmConfigData() {
-      const { LogicalConfigConfirmation } = const_.processSignature;
-      this.signCode = LogicalConfigConfirmation;
+      const { LogicalConfigConfirmation } = const_.processSignature
+      this.signCode = LogicalConfigConfirmation
       // this.confirmConfigData()
-      this.initialForm = { ...this.form };
-      this.signVisible = true;
+      this.initialForm = { ...this.form }
+      this.signVisible = true
     },
     // 配置更新签名
     handleUpdateConfigData() {
-      const { LogicalConfigUpdates } = const_.processSignature;
-      this.signCode = LogicalConfigUpdates;
-      this.initialForm = { ...this.form };
-      this.signVisible = true;
+      const { LogicalConfigUpdates } = const_.processSignature
+      this.signCode = LogicalConfigUpdates
+      this.initialForm = { ...this.form }
+      this.signVisible = true
     },
 
     // 配置确认（废除）
     confirmConfigData() {
-      this.$refs["logicalConfigForm"].validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
+      this.$refs['logicalConfigForm'].validate((valid) => {
+        if (!valid) return
+        this.btnLoading = true
         // 保存配置信息
-        var params = Object.assign({}, this.form);
+        var params = Object.assign({}, this.form)
         params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(
-          ",",
-          " | "
-        );
+          ',',
+          ' | '
+        )
         configTrialBasicInfo(params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.initialForm = { ...this.form };
-              this.signVisible = true;
+              this.initialForm = { ...this.form }
+              this.signVisible = true
             }
           })
           .catch((_) => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
 
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.signConfirm(signInfo);
+        this.signConfirm(signInfo)
       } else {
-        this.signVisible = false;
+        this.signVisible = false
       }
     },
     // 签名并确认
     signConfirm(signInfo) {
-      this.loading = true;
-      var obj = Object.assign({}, this.form);
+      this.loading = true
+      var obj = Object.assign({}, this.form)
       obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(
-        ",",
-        "|"
-      );
+        ',',
+        '|'
+      )
       const params = {
         data: obj,
         signInfo: signInfo,
-      };
+      }
       // 保存并签名确认
       ConfigTrialBasicInfoConfirm(params)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.$message.success(this.$t("common:message:savedSuccessfully"));
-            this.form.IsTrialBasicLogicConfirmed = true;
-            this.isEdit = false;
-            this.$refs["signForm"].btnLoading = false;
-            this.signVisible = false;
-            this.updateVisible = false;
-            this.confirmVisible = false;
-            this.$emit("refresh");
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.form.IsTrialBasicLogicConfirmed = true
+            this.isEdit = false
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            this.updateVisible = false
+            this.confirmVisible = false
+            this.$emit('refresh')
           }
         })
         .catch((_) => {
-          this.loading = false;
-          this.$refs["signForm"].btnLoading = false;
-        });
+          this.loading = false
+          this.$refs['signForm'].btnLoading = false
+        })
     },
     // 配置信息数组结构
     getConfigArr() {
       this.confirmData = [
         {
-          Name: this.$t("trials:logincCfg:form:subjectNumberRule"),
-          NewVal: this.$fd("YesOrNo", this.form.IsNoticeSubjectCodeRule),
-          OldVal: this.$fd("YesOrNo", this.initialForm.IsNoticeSubjectCodeRule),
+          Name: this.$t('trials:logincCfg:form:subjectNumberRule'),
+          NewVal: this.$fd('YesOrNo', this.form.IsNoticeSubjectCodeRule),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsNoticeSubjectCodeRule),
         },
         {
-          Name: this.$t("trials:logincCfg:form:subjectNumFormat"),
+          Name: this.$t('trials:logincCfg:form:subjectNumFormat'),
           NewVal: this.form.SubjectCodeRule,
           OldVal: this.initialForm.SubjectCodeRule,
         },
         {
-          Name: this.$t("trials:logincCfg:form:subjectNum2"),
-          NewVal: this.$fd("YesOrNo", this.initialForm.IsSubjectSecondCodeView),
-          OldVal: this.$fd("YesOrNo", this.initialForm.IsSubjectSecondCodeView),
+          Name: this.$t('trials:logincCfg:form:subjectNum2'),
+          NewVal: this.$fd('YesOrNo', this.initialForm.IsSubjectSecondCodeView),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsSubjectSecondCodeView),
         },
         {
-          Name: this.$t("trials:logincCfg:form:scanDateVerify"),
-          NewVal: this.$fd("YesOrNo", this.form.IsVerifyVisitImageDate),
-          OldVal: this.$fd("YesOrNo", this.initialForm.IsVerifyVisitImageDate),
+          Name: this.$t('trials:logincCfg:form:scanDateVerify'),
+          NewVal: this.$fd('YesOrNo', this.form.IsVerifyVisitImageDate),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsVerifyVisitImageDate),
         },
         {
-          Name: this.$t("trials:logincCfg:form:visitBaseDate"),
-          NewVal: this.$fd("YesOrNo", this.form.IsHaveFirstGiveMedicineDate),
+          Name: this.$t('trials:logincCfg:form:visitBaseDate'),
+          NewVal: this.$fd('YesOrNo', this.form.IsHaveFirstGiveMedicineDate),
           OldVal: this.$fd(
-            "YesOrNo",
+            'YesOrNo',
             this.initialForm.IsHaveFirstGiveMedicineDate
           ),
         },
         {
-          Name: this.$t("trials:logincCfg:form:subjectAge"),
-          NewVal: this.$fd("YesOrNo", this.form.IsHaveSubjectAge),
-          OldVal: this.$fd("YesOrNo", this.initialForm.IsHaveSubjectAge),
+          Name: this.$t('trials:logincCfg:form:subjectAge'),
+          NewVal: this.$fd('YesOrNo', this.form.IsHaveSubjectAge),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsHaveSubjectAge),
         },
         {
-          Name: this.$t("trials:logincCfg:form:subjectGender"),
-          NewVal: this.$fd("YesOrNo", this.form.IsSubjectSexView),
-          OldVal: this.$fd("YesOrNo", this.initialForm.IsSubjectSexView),
+          Name: this.$t('trials:logincCfg:form:subjectGender'),
+          NewVal: this.$fd('YesOrNo', this.form.IsSubjectSexView),
+          OldVal: this.$fd('YesOrNo', this.initialForm.IsSubjectSexView),
         },
         {
-          Name: this.$t("trials:logincCfg:form:lastVisitName"),
+          Name: this.$t('trials:logincCfg:form:lastVisitName'),
           NewVal: this.form.OutEnrollmentVisitName,
           OldVal: this.initialForm.OutEnrollmentVisitName,
         },
@@ -1259,25 +1257,25 @@ export default {
         //   OldVal: this.$fd('ClinicalInformationTransmissionEnum', this.initialForm.ClinicalInformationTransmissionEnum)
         // },
         {
-          Name: this.$t("trials:logincCfg:form:imageCopy"),
-          NewVal: this.$fd("YesOrNo", this.form.IsImageReplicationAcrossTrial),
+          Name: this.$t('trials:logincCfg:form:imageCopy'),
+          NewVal: this.$fd('YesOrNo', this.form.IsImageReplicationAcrossTrial),
           OldVal: this.$fd(
-            "YesOrNo",
+            'YesOrNo',
             this.initialForm.IsImageReplicationAcrossTrial
           ),
         },
         {
-          Name: this.$t("trials:logincCfg:form:bodypart"),
+          Name: this.$t('trials:logincCfg:form:bodypart'),
           NewVal: this.form.BodyPartTypes,
           OldVal: this.initialForm.BodyPartTypes,
         },
         {
-          Name: this.$t("trials:logincCfg:form:modality"),
+          Name: this.$t('trials:logincCfg:form:modality'),
           NewVal: this.form.ModalityListStr,
           OldVal: this.initialForm.ModalityListStr,
         },
         {
-          Name: this.$t("trials:logincCfg:form:exceededDays"),
+          Name: this.$t('trials:logincCfg:form:exceededDays'),
           NewVal: this.form.ChangeDefalutDays,
           OldVal: this.initialForm.ChangeDefalutDays,
         },
@@ -1286,64 +1284,64 @@ export default {
         //   NewVal: this.form.ClinicalDataSetNames.join(', '),
         //   OldVal: this.initialForm.ClinicalDataSetNames.join(', ')
         // }
-      ];
+      ]
     },
     // 筛选号规则提醒
     subjectCodeRuleChange(val) {
       if (!val) {
-        this.form.SubjectCodeRule = "";
+        this.form.SubjectCodeRule = ''
       }
     },
     // 初始化表单
     async initForm(res) {
-      this.form.TrialId = res.TrialId;
-      this.loading = true;
+      this.form.TrialId = res.TrialId
+      this.loading = true
       for (const k in this.form) {
         if (res.hasOwnProperty(k)) {
-          this.form[k] = res[k];
+          this.form[k] = res[k]
         }
       }
       let Modalitys = this.form.ModalityList.map((item) => {
-        return this.$fd("Modality", item.trim());
-      });
-      this.form.ModalityListStr = Modalitys.toString().replaceAll(",", " | ");
+        return this.$fd('Modality', item.trim())
+      })
+      this.form.ModalityListStr = Modalitys.toString().replaceAll(',', ' | ')
       // this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(
       //   ",",
       //   " | "
       // );
-      let BodyPartTypes = res.BodyPartTypes;
-      this.form.BodyPartTypes = "";
-      this.form.BodyPartTypeList = BodyPartTypes.split("|");
-      let r = await this.getTrialBodyPartList();
+      let BodyPartTypes = res.BodyPartTypes
+      this.form.BodyPartTypes = ''
+      this.form.BodyPartTypeList = BodyPartTypes.split('|')
+      let r = await this.getTrialBodyPartList()
       if (r) {
         var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
-          return this.changeBodyPart(i.trim());
-        });
+          return this.changeBodyPart(i.trim())
+        })
         this.form.BodyPartTypes = bodyPartTypes
           .toString()
-          .replaceAll(",", " | ");
+          .replaceAll(',', ' | ')
         // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
-        this.initialForm = { ...this.form };
-        this.loading = false;
+        this.initialForm = { ...this.form }
+        this.loading = false
       }
     },
     // bodyPart中英文转换
     changeBodyPart(code) {
-      let arr = this.trialBodyPartList.filter((item) => item.Code === code);
+      let arr = this.trialBodyPartList.filter((item) => item.Code === code)
       if (arr[0]) {
-        return arr[0].Name;
+        return arr[0].Name
       } else {
-        return null;
+        return null
       }
     },
     // 获取临床数据模板信息
     getClinicalDataList(isSelect = false) {
       return new Promise((resolve, reject) => {
-        this.listLoading = true;
+        this.listLoading = true
         getTrialClinicalDataTrialSetList({ trialId: this.form.TrialId })
           .then((res) => {
-            this.clinicalDataList = res.Result;
-            this.listLoading = false;
+            this.clinicalDataList = res.Result
+            this.listLoading = false
             if (isSelect) {
               this.$nextTick(() => {
                 for (
@@ -1353,127 +1351,125 @@ export default {
                 ) {
                   var index = this.clinicalDataList.findIndex(
                     (item) => item.Id === this.form.ClinicalDataTrialSetIds[i]
-                  );
+                  )
                   if (index > -1) {
-                    this.$refs["clinicalData"].toggleRowSelection(
+                    this.$refs['clinicalData'].toggleRowSelection(
                       this.clinicalDataList[index],
                       true
-                    );
+                    )
                   }
                 }
-              });
+              })
             }
-            resolve();
+            resolve()
           })
           .catch(() => {
-            this.listLoading = false;
-            reject();
-          });
-      });
+            this.listLoading = false
+            reject()
+          })
+      })
     },
     // 获取勾选行数据
     handleSelectChange(val) {
-      const arr = [];
-      this.selectedCD = [];
+      const arr = []
+      this.selectedCD = []
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index].Id);
-        this.selectedCD.push(val[index].ClinicalDataSetName);
+        arr.push(val[index].Id)
+        this.selectedCD.push(val[index].ClinicalDataSetName)
       }
-      this.selectClinicalDataArr = arr;
+      this.selectClinicalDataArr = arr
     },
     handleConfirmClinicalData() {
-      this.form.ClinicalDataSetNames = this.selectedCD;
-      this.form.ClinicalDataTrialSetIds = this.selectClinicalDataArr;
+      this.form.ClinicalDataSetNames = this.selectedCD
+      this.form.ClinicalDataTrialSetIds = this.selectClinicalDataArr
       this.form.ClinicalDataSetNamesStr =
-        this.form.ClinicalDataSetNames.join(", ");
-      this.clinicalDataVisible = false;
+        this.form.ClinicalDataSetNames.join(', ')
+      this.clinicalDataVisible = false
     },
     handleSetCD() {
-      this.clinicalDataVisible = true;
+      this.clinicalDataVisible = true
       this.$nextTick(() => {
         for (let i = 0; i < this.form.ClinicalDataTrialSetIds.length; i++) {
           var index = this.clinicalDataList.findIndex(
             (item) => item.Id === this.form.ClinicalDataTrialSetIds[i]
-          );
+          )
           if (index > -1) {
-            this.$refs["clinicalData"].toggleRowSelection(
+            this.$refs['clinicalData'].toggleRowSelection(
               this.clinicalDataList[index],
               true
-            );
+            )
           }
         }
-      });
+      })
     },
     handleAddClinicalData() {
-      this.currentRow = {};
-      this.addOrEditCD.title = "新增";
-      this.addOrEditCD.visible = true;
+      this.currentRow = {}
+      this.addOrEditCD.title = '新增'
+      this.addOrEditCD.visible = true
     },
     handleEditClinicalData(row) {
-      this.currentRow = { ...row };
-      this.addOrEditCD.title = "编辑";
-      this.addOrEditCD.visible = true;
+      this.currentRow = { ...row }
+      this.addOrEditCD.title = '编辑'
+      this.addOrEditCD.visible = true
     },
     handleDeleteClinicalData(row) {
-      this.$confirm(this.$t("trials:staffResearch:message:confirmDel"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deleteClinicalTrialSetData(row.Id)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              var cdNameIndex = this.selectedCD.indexOf(
-                row.ClinicalDataSetName
-              );
+              var cdNameIndex = this.selectedCD.indexOf(row.ClinicalDataSetName)
               if (cdNameIndex > -1) {
-                this.selectedCD.splice(cdNameIndex, 1);
+                this.selectedCD.splice(cdNameIndex, 1)
               }
-              var cdIdIndex = this.selectClinicalDataArr.indexOf(row.Id);
+              var cdIdIndex = this.selectClinicalDataArr.indexOf(row.Id)
               if (cdIdIndex > -1) {
-                this.selectClinicalDataArr.splice(cdIdIndex, 1);
+                this.selectClinicalDataArr.splice(cdIdIndex, 1)
               }
-              var index = this.form.ClinicalDataTrialSetIds.indexOf(row.Id);
+              var index = this.form.ClinicalDataTrialSetIds.indexOf(row.Id)
               if (index > -1) {
-                this.form.ClinicalDataTrialSetIds.splice(index, 1);
+                this.form.ClinicalDataTrialSetIds.splice(index, 1)
               }
               var i = this.form.ClinicalDataSetNames.indexOf(
                 row.ClinicalDataSetName
-              );
+              )
               if (i > -1) {
-                this.form.ClinicalDataSetNames.splice(i, 1);
+                this.form.ClinicalDataSetNames.splice(i, 1)
                 this.form.ClinicalDataSetNamesStr =
-                  this.form.ClinicalDataSetNames.join(", ");
+                  this.form.ClinicalDataSetNames.join(', ')
               }
-              this.getClinicalDataList(true);
-              this.$message.success("删除成功!");
+              this.getClinicalDataList(true)
+              this.$message.success('删除成功!')
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     handleDownloadTpl(row) {
-      this.listLoading = true;
+      this.listLoading = true
       DownloadTrialClinicalFile(row.Id)
         .then((data) => {
-          this.listLoading = false;
+          this.listLoading = false
         })
         .catch(() => {
-          this.listLoading = false;
-        });
+          this.listLoading = false
+        })
     },
     handleSelectable(row) {
       if (!row.IsUsed) {
-        return true;
+        return true
       } else {
-        return false;
+        return false
       }
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .bodyPartName {
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index eef426fa..007e6450 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -6,7 +6,7 @@
       v-loading="loading"
       :model="form"
       label-width="300px"
-      style="width:800px;"
+      style="width: 800px"
       :rules="rules"
       size="small"
     >
@@ -35,12 +35,12 @@
         <el-input
           v-model="form.TrialCriterionNamesStr"
           type="textarea"
-          :autosize="{ minRows: 1, maxRows: 3}"
-          style="width:80%;"
+          :autosize="{ minRows: 1, maxRows: 3 }"
+          style="width: 80%"
           disabled
         />
         <el-button
-          v-if="TrialStatusStr ==='Initializing'"
+          v-if="TrialStatusStr === 'Initializing'"
           :disabled="!isEdit"
           icon="el-icon-plus"
           circle
@@ -74,8 +74,8 @@
         <el-input
           v-model="form.ClinicalDataSetNamesStr"
           type="textarea"
-          :autosize="{ minRows: 1, maxRows: 3}"
-          style="width:80%;"
+          :autosize="{ minRows: 1, maxRows: 3 }"
+          style="width: 80%"
           disabled
         />
         <el-button
@@ -252,7 +252,10 @@
       <el-form-item>
         <!-- 保存 -->
         <el-button
-          v-if="form.IsTrialProcessConfirmed === false && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
+          v-if="
+            form.IsTrialProcessConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
           type="primary"
           @click="handleSave"
         >
@@ -260,7 +263,10 @@
         </el-button>
         <!-- 配置确认 -->
         <el-button
-          v-if="form.IsTrialProcessConfirmed === false && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
+          v-if="
+            form.IsTrialProcessConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
           type="primary"
           @click="handleConfirm"
         >
@@ -268,7 +274,12 @@
         </el-button>
         <!-- 配置更新 -->
         <el-button
-          v-if="form.IsTrialProcessConfirmed === true && !isEdit && (TrialStatusStr ==='Initializing') && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
+          v-if="
+            form.IsTrialProcessConfirmed === true &&
+            !isEdit &&
+            TrialStatusStr === 'Initializing' &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
           type="primary"
           @click="isEdit = true"
         >
@@ -276,7 +287,11 @@
         </el-button>
         <!-- 配置更新确认 -->
         <el-button
-          v-if="form.IsTrialProcessConfirmed === true && isEdit && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
+          v-if="
+            form.IsTrialProcessConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
           type="primary"
           @click="handleUpdate"
         >
@@ -284,7 +299,11 @@
         </el-button>
         <!-- 取消 -->
         <el-button
-          v-if="form.IsTrialProcessConfirmed === true && isEdit && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
+          v-if="
+            form.IsTrialProcessConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
           type="primary"
           @click="isEdit = false"
         >
@@ -303,12 +322,7 @@
       custom-class="base-dialog-wrapper"
     >
       <div class="base-dialog-body">
-        <el-table
-          :data="confirmData"
-          border
-          style="width: 100%"
-          size="small"
-        >
+        <el-table :data="confirmData" border style="width: 100%" size="small">
           <!-- 配置项 -->
           <el-table-column
             prop="Name"
@@ -323,9 +337,17 @@
           />
         </el-table>
       </div>
-      <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
         <!-- 确认 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleConfirmConfigData">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleConfirmConfigData"
+        >
           {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
@@ -341,12 +363,7 @@
       custom-class="base-dialog-wrapper"
     >
       <div class="base-dialog-body">
-        <el-table
-          :data="confirmData"
-          border
-          style="width: 100%"
-          size="small"
-        >
+        <el-table :data="confirmData" border style="width: 100%" size="small">
           <!-- 配置项 -->
           <el-table-column
             prop="Name"
@@ -356,24 +373,39 @@
           <!-- 配置值（更改前） -->
           <el-table-column
             prop="OldVal"
-            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t('trials:trialCfg:table:beforeChange')}）`"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:beforeChange'
+            )}）`"
             show-overflow-tooltip
           />
           <!-- 配置值（更改后） -->
           <el-table-column
             prop="NewVal"
-            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t('trials:trialCfg:table:updated')}）`"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:updated'
+            )}）`"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span :class="{fontColor:scope.row.NewVal!==scope.row.OldVal}">{{ scope.row.NewVal }}</span>
+              <span
+                :class="{ fontColor: scope.row.NewVal !== scope.row.OldVal }"
+                >{{ scope.row.NewVal }}</span
+              >
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
         <!-- 确认 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleUpdateConfigData">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleUpdateConfigData"
+        >
           {{ $t('trials:trialCfg:button:confirmCfg') }}
         </el-button>
       </div>
@@ -388,10 +420,16 @@
       custom-class="base-dialog-wrapper"
     >
       <div slot="title">
-        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
+        <span style="font-size: 12px; margin-left: 5px">{{
+          `(${$t('common:label:sign')}${currentUser})`
+        }}</span>
       </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        @closeDialog="closeSignDialog"
+      />
     </el-dialog>
 
     <!-- 配置阅片标准模板选项 -->
@@ -401,25 +439,29 @@
       :close-on-click-modal="false"
       :title="$t('trials:processCfg:title:criterion')"
       custom-class="base-dialog-wrapper"
-
       width="1000px"
     >
       <div v-loading="listLoading" class="base-dialog-body">
-        <div class="search-form" style="display:flex;justify-content: space-between;">
+        <div
+          class="search-form"
+          style="display: flex; justify-content: space-between"
+        >
           <el-form :inline="true" size="mini" class="base-search-form">
             <!-- 阅片标准 -->
             <el-form-item :label="$t('trials:processCfg:title:criterion')">
-              <el-input v-model="criterionSearchForm.CriterionName" clearable style="width:120px;" />
+              <el-input
+                v-model="criterionSearchForm.CriterionName"
+                clearable
+                style="width: 120px"
+              />
             </el-form-item>
             <el-form-item>
-
               <el-button type="primary" @click="handleSearchCriterion">
                 {{ $t('common:button:search') }}
               </el-button>
               <el-button type="primary" @click="handleResetCriterion">
                 {{ $t('common:button:reset') }}
               </el-button>
-
             </el-form-item>
           </el-form>
           <div>
@@ -453,6 +495,14 @@
             prop="CriterionName"
             :label="$t('trials:processCfg:title:criterion')"
           />
+          <el-table-column
+            prop="CriterionType"
+            :label="$t('trials:processCfg:title:criterionType')"
+          >
+            <template slot-scope="scope">
+              <span>{{ $fd('CriterionType', scope.row.CriterionType) }}</span>
+            </template>
+          </el-table-column>
           <!-- <el-table-column
             prop="IsCompleteConfig"
             label="是否配置完成"
@@ -495,7 +545,7 @@
           </el-table-column>
         </el-table>
         <pagination
-          style="text-align: right;margin-top: 10px;"
+          style="text-align: right; margin-top: 10px"
           class="page"
           :total="criterionListTotal"
           :page.sync="criterionSearchForm.PageIndex"
@@ -503,7 +553,10 @@
           @pagination="getCriterionList"
         />
       </div>
-      <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
         <el-button
           size="small"
           type="primary"
@@ -533,25 +586,43 @@
       width="500px"
     >
       <div class="base-dialog-body">
-        <el-form ref="criterionForm" onsubmit="return false;" :model="criterionForm" label-width="210px">
+        <el-form
+          ref="criterionForm"
+          onsubmit="return false;"
+          :model="criterionForm"
+          label-width="210px"
+        >
           <!-- 阅片标准名称 -->
           <el-form-item
             :label="this.$t('trials:processCfg:title:criterionName')"
             prop="CriterionName"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:specify')},
-              { max: 50, message: `${$t('common:ruleMessage:maxLength')} 50` }
+              { required: true, message: $t('common:ruleMessage:specify') },
+              { max: 50, message: `${$t('common:ruleMessage:maxLength')} 50` },
             ]"
           >
             <el-input v-model="criterionForm.CriterionName" />
           </el-form-item>
         </el-form>
       </div>
-      <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-        <el-button size="small" type="primary" :disabled="listLoading" @click="handleCancelSave">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="handleCancelSave"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :disabled="listLoading" @click="handleSaveCriterion">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="handleSaveCriterion"
+        >
           {{ $t('common:button:confirm') }}
         </el-button>
       </div>
@@ -567,7 +638,10 @@
       width="1300px"
     >
       <div class="base-dialog-body">
-        <CriterionConfig :data="currentCriterionRow" @getList="getCriterionList" />
+        <CriterionConfig
+          :data="currentCriterionRow"
+          @getList="getCriterionList"
+        />
       </div>
     </el-dialog>
     <!-- 配置临床信息模板选项 -->
@@ -580,7 +654,7 @@
       custom-class="base-dialog-wrapper"
     >
       <div v-loading="listLoading" class="base-dialog-body">
-        <div style="text-align:right">
+        <div style="text-align: right">
           <el-button
             v-if="isEdit"
             size="mini"
@@ -602,7 +676,6 @@
         >
           <!-- :selectable="handleSelectable" -->
           <el-table-column
-
             type="selection"
             align="left"
             width="45"
@@ -618,7 +691,11 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $i18n.locale === 'zh' ? scope.row.ClinicalDataSetName : scope.row.ClinicalDataSetEnName }}
+              {{
+                $i18n.locale === 'zh'
+                  ? scope.row.ClinicalDataSetName
+                  : scope.row.ClinicalDataSetEnName
+              }}
             </template>
           </el-table-column>
           <!-- 上传人 -->
@@ -629,7 +706,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd('ClinicalDataUploadRole',scope.row.UploadRole) }}
+              {{ $fd('ClinicalDataUploadRole', scope.row.UploadRole) }}
             </template>
           </el-table-column>
           <!-- 数据级别 -->
@@ -640,7 +717,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd('ClinicalLevel',scope.row.ClinicalDataLevel) }}
+              {{ $fd('ClinicalLevel', scope.row.ClinicalDataLevel) }}
             </template>
           </el-table-column>
           <!-- 传输方式 -->
@@ -651,7 +728,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd('ClinicalUploadType',scope.row.ClinicalUploadType) }}
+              {{ $fd('ClinicalUploadType', scope.row.ClinicalUploadType) }}
             </template>
           </el-table-column>
           <!-- 阅片标准 -->
@@ -665,7 +742,12 @@
             </template>
           </el-table-column>
           <!-- 模板名称 -->
-          <el-table-column :label="$t('common:action:action')" width="220" fixed="right" style="text-align: right">
+          <el-table-column
+            :label="$t('common:action:action')"
+            width="220"
+            fixed="right"
+            style="text-align: right"
+          >
             <template slot-scope="scope">
               <!-- 下载 -->
               <el-button
@@ -682,10 +764,12 @@
                 @click="handlePreviewTpl(scope.row)"
               >
               </el-button>
-              <el-button  v-if="scope.row.ClinicalUploadType === 2"
-                          circle
-                          icon="el-icon-view"
-                          @click="handlePreview(scope.row)">
+              <el-button
+                v-if="scope.row.ClinicalUploadType === 2"
+                circle
+                icon="el-icon-view"
+                @click="handlePreview(scope.row)"
+              >
               </el-button>
               <el-button
                 circle
@@ -702,7 +786,10 @@
                 v-if="isEdit"
                 :title="$t('common:button:edit')"
                 icon="el-icon-edit"
-                :disabled="TrialStatusStr !=='Initializing' || !!scope.row.SystemClinicalDataSetId"
+                :disabled="
+                  TrialStatusStr !== 'Initializing' ||
+                  !!scope.row.SystemClinicalDataSetId
+                "
                 @click="handleEditClinicalData(scope.row)"
               >
               </el-button>
@@ -712,7 +799,13 @@
                 v-if="isEdit"
                 :title="$t('common:button:delete')"
                 icon="el-icon-delete"
-                :disabled="TrialStatusStr !=='Initializing' || form.ClinicalDataSetNames.indexOf(scope.row.ClinicalDataSetName)> -1 || !!scope.row.SystemClinicalDataSetId"
+                :disabled="
+                  TrialStatusStr !== 'Initializing' ||
+                  form.ClinicalDataSetNames.indexOf(
+                    scope.row.ClinicalDataSetName
+                  ) > -1 ||
+                  !!scope.row.SystemClinicalDataSetId
+                "
                 @click="handleDeleteClinicalData(scope.row)"
               >
               </el-button>
@@ -720,11 +813,25 @@
           </el-table-column>
         </el-table>
       </div>
-      <div v-if="isEdit" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-        <el-button size="small" type="primary" :disabled="listLoading" @click="clinicalDataVisible = false">
+      <div
+        v-if="isEdit"
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="clinicalDataVisible = false"
+        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :disabled="listLoading" @click="handleConfirmClinicalData">
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="listLoading"
+          @click="handleConfirmClinicalData"
+        >
           {{ $t('common:button:confirm') }}
         </el-button>
       </div>
@@ -759,14 +866,8 @@
       <div style="margin: 0 20px">
         <!-- 既往放疗史 -->
         <h4>{{ $t('trials:uploadClinicalData:title:pastTreatment') }}</h4>
-        <el-table
-          :data="[]"
-          style="width: 100%"
-        >
-          <el-table-column
-            type="index"
-            width="50"
-          />
+        <el-table :data="[]" style="width: 100%">
+          <el-table-column type="index" width="50" />
           <!-- 放疗部位 -->
           <el-table-column
             prop="Position"
@@ -778,7 +879,11 @@
             :label="$t('trials:uploadClinicalData:table:beginDate')"
           >
             <template slot-scope="scope">
-              {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+              {{
+                scope.row.StartTime
+                  ? moment(scope.row.StartTime).format('YYYY-MM-DD')
+                  : ''
+              }}
             </template>
           </el-table-column>
           <!-- 结束日期 -->
@@ -787,7 +892,11 @@
             :label="$t('trials:uploadClinicalData:table:endDate')"
           >
             <template slot-scope="scope">
-              {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+              {{
+                scope.row.EndTime
+                  ? moment(scope.row.EndTime).format('YYYY-MM-DD')
+                  : ''
+              }}
             </template>
           </el-table-column>
           <!-- 病灶是否PD -->
@@ -800,23 +909,29 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+            v-if="
+              hasPermi(['trials:trials-panel:visit:crc-upload:upload']) &&
+              allowAddOrEdit
+            "
             :label="$t('common:action:action')"
             min-width="120"
           >
             <template slot-scope="scope">
               <!-- 编辑 -->
               <el-button
-                v-if="( allowAddOrEdit)"
+                v-if="allowAddOrEdit"
                 icon="el-icon-edit-outline"
                 circle
                 :title="$t('common:button:edit')"
                 size="small"
-                @click.native.prevent="editRow(scope.row,1)"
+                @click.native.prevent="editRow(scope.row, 1)"
               />
               <!-- 移除 -->
               <el-button
-                v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+                v-if="
+                  data.SubmitState * 1 < 2 ||
+                  (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                "
                 v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                 icon="el-icon-delete"
                 circle
@@ -829,14 +944,8 @@
         </el-table>
         <!-- 既往手术史 -->
         <h4>{{ $t('trials:uploadClinicalData:title:pastSurgery') }}</h4>
-        <el-table
-          :data="[]"
-          style="width: 100%"
-        >
-          <el-table-column
-            type="index"
-            width="50"
-          />
+        <el-table :data="[]" style="width: 100%">
+          <el-table-column type="index" width="50" />
           <!-- 手术名称 -->
           <el-table-column
             prop="OperationName"
@@ -848,19 +957,26 @@
             :label="$t('trials:uploadClinicalData:table:surgeryDate')"
           >
             <template slot-scope="scope">
-              {{ scope.row.OperationTime?moment(scope.row.OperationTime).format('YYYY-MM-DD'):'' }}
+              {{
+                scope.row.OperationTime
+                  ? moment(scope.row.OperationTime).format('YYYY-MM-DD')
+                  : ''
+              }}
             </template>
           </el-table-column>
 
           <el-table-column
-            v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+            v-if="
+              hasPermi(['trials:trials-panel:visit:crc-upload:upload']) &&
+              allowAddOrEdit
+            "
             :label="$t('common:action:action')"
             min-width="200"
           >
             <template slot-scope="scope">
               <!-- 编辑 -->
               <el-button
-                v-if="(allowAddOrEdit)"
+                v-if="allowAddOrEdit"
                 icon="el-icon-edit-outline"
                 circle
                 :title="$t('common:button:edit')"
@@ -869,7 +985,10 @@
               />
               <!-- 移除 -->
               <el-button
-                v-if="data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)"
+                v-if="
+                  data.SubmitState * 1 < 2 ||
+                  (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                "
                 v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                 icon="el-icon-delete"
                 circle
@@ -882,14 +1001,8 @@
         </el-table>
         <!-- 既往其他治疗史 -->
         <h4>{{ $t('trials:uploadClinicalData:title:others') }}</h4>
-        <el-table
-          :data="[]"
-          style="width: 100%"
-        >
-          <el-table-column
-            type="index"
-            width="50"
-          />
+        <el-table :data="[]" style="width: 100%">
+          <el-table-column type="index" width="50" />
           <!-- 治疗类型 -->
           <el-table-column
             prop="TreatmentType"
@@ -901,7 +1014,11 @@
             :label="$t('trials:uploadClinicalData:table:treatmentbeginDate')"
           >
             <template slot-scope="scope">
-              {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+              {{
+                scope.row.StartTime
+                  ? moment(scope.row.StartTime).format('YYYY-MM-DD')
+                  : ''
+              }}
             </template>
           </el-table-column>
           <!-- 结束日期 -->
@@ -910,19 +1027,26 @@
             :label="$t('trials:uploadClinicalData:table:treatmentendDate')"
           >
             <template slot-scope="scope">
-              {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+              {{
+                scope.row.EndTime
+                  ? moment(scope.row.EndTime).format('YYYY-MM-DD')
+                  : ''
+              }}
             </template>
           </el-table-column>
 
           <el-table-column
-            v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+            v-if="
+              hasPermi(['trials:trials-panel:visit:crc-upload:upload']) &&
+              allowAddOrEdit
+            "
             :label="$t('common:action:action')"
             min-width="200"
           >
             <template slot-scope="scope">
               <!-- 编辑 -->
               <el-button
-                v-if="(allowAddOrEdit)"
+                v-if="allowAddOrEdit"
                 icon="el-icon-edit-outline"
                 circle
                 :title="$t('common:button:edit')"
@@ -931,7 +1055,10 @@
               />
               <!-- 移除 -->
               <el-button
-                v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+                v-if="
+                  data.SubmitState * 1 < 2 ||
+                  (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                "
                 icon="el-icon-delete"
                 circle
                 :title="$t('common:button:delete')"
@@ -952,7 +1079,16 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <ClinicalQuestionConfig ref="QuestionConfigVisible" @handlePreview="handlePreview" :data="currentRow" @close="QuestionConfigVisible.visible = false;getClinicalDataList()" @getList="getClinicalDataList" />
+      <ClinicalQuestionConfig
+        ref="QuestionConfigVisible"
+        @handlePreview="handlePreview"
+        :data="currentRow"
+        @close="
+          QuestionConfigVisible.visible = false
+          getClinicalDataList()
+        "
+        @getList="getClinicalDataList"
+      />
     </el-dialog>
     <el-dialog
       v-if="preview.visible"
@@ -966,7 +1102,18 @@
   </div>
 </template>
 <script>
-import { getTrialCriterionSelectList, configTrialProcessInfo, getTrialClinicalDataTrialSetList, deleteClinicalTrialSetData, DownloadTrialClinicalFile, getReadingQuestionCriterionTrialList, addOrUpdateReadingQuestionCriterionTrial, deleteReadingQuestionCriterionTrial, setTrialReadingQuestionCriterionIsIsCompleteConfig,configTrialProcessInfoVerification } from '@/api/trials'
+import {
+  getTrialCriterionSelectList,
+  configTrialProcessInfo,
+  getTrialClinicalDataTrialSetList,
+  deleteClinicalTrialSetData,
+  DownloadTrialClinicalFile,
+  getReadingQuestionCriterionTrialList,
+  addOrUpdateReadingQuestionCriterionTrial,
+  deleteReadingQuestionCriterionTrial,
+  setTrialReadingQuestionCriterionIsIsCompleteConfig,
+  configTrialProcessInfoVerification,
+} from '@/api/trials'
 import { ConfigTrialProcessInfoConfirm } from '@/api/trials/setting'
 import SignForm from '@/views/trials/components/newSignForm'
 import Pagination from '@/components/Pagination'
@@ -980,12 +1127,19 @@ const criterionSearchDataDefault = () => {
   return {
     PageIndex: 1,
     PageSize: 20,
-    CriterionName: ''
+    CriterionName: '',
   }
 }
 export default {
   name: 'ProcessConfig',
-  components: { SignForm, Pagination, CriterionConfig, ClinicalDataForm, ClinicalQuestionConfig, clinicalDataQuestions },
+  components: {
+    SignForm,
+    Pagination,
+    CriterionConfig,
+    ClinicalDataForm,
+    ClinicalQuestionConfig,
+    clinicalDataQuestions,
+  },
   data() {
     // var validator = (rule, value, callback) => {
     //   if (value.length === 0) {
@@ -1018,23 +1172,43 @@ export default {
         TrialCriterionNamesStr: '',
         TrialCriterionIds: [],
         TrialCriterionNames: [],
-        TrialCriterionIdEnums:[]
+        TrialCriterionIdEnums: [],
       },
       rules: {
         ClinicalDataSetNamesStr: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:specify'),
+            trigger: 'blur',
+          },
         ],
         ClinicalInformationTransmissionEnum: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: 'blur',
+          },
         ],
         QCProcessEnum: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
         ],
         IsImageConsistencyVerification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
         ],
         ReadingMode: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
         ],
         // ImagePlatform: [
         //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
@@ -1042,7 +1216,13 @@ export default {
         // CriterionIds: [
         //   { required: true, validator: validator, trigger: ['blur', 'change'] }
         // ],
-        TrialCriterionNamesStr: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }]
+        TrialCriterionNamesStr: [
+          {
+            required: true,
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
+          },
+        ],
         // DigitPlaces: [
         //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }
         // ],
@@ -1099,17 +1279,18 @@ export default {
       preview: { visible: false, title: this.$t('common:button:preview') },
     }
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     handlePreview(row) {
-      this.rowData = {...row}
+      this.rowData = { ...row }
       this.preview.visible = true
     },
     handleConfigQuestion(row) {
       this.currentRow = { ...row }
       this.QuestionConfigVisible.visible = true
-      this.QuestionConfigVisible.title = this.$t('trials:readingUnit:qsList:title:qsConfig')
+      this.QuestionConfigVisible.title = this.$t(
+        'trials:readingUnit:qsList:title:qsConfig'
+      )
     },
     handlePreviewTpl() {
       this.previewTpl.visible = true
@@ -1117,23 +1298,27 @@ export default {
     },
     // 配置信息保存
     handleSave() {
-      this.$refs['processConfigForm'].validate(async(valid) => {
+      this.$refs['processConfigForm'].validate(async (valid) => {
         if (!valid) return
         this.loading = true
         // 保存配置信息
-        configTrialProcessInfo(this.form).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.initialForm = { ...this.form }
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }
-        }).catch(_ => { this.loading = false })
+        configTrialProcessInfo(this.form)
+          .then((res) => {
+            this.loading = false
+            if (res.IsSuccess) {
+              this.initialForm = { ...this.form }
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+          })
+          .catch((_) => {
+            this.loading = false
+          })
       })
     },
 
     // 打开配置信息确认框
     handleConfirm() {
-      this.$refs['processConfigForm'].validate(async(valid) => {
+      this.$refs['processConfigForm'].validate(async (valid) => {
         if (!valid) return
         this.getConfigArr()
         this.confirmVisible = true
@@ -1167,13 +1352,17 @@ export default {
     confirmConfigData() {
       this.btnLoading = true
       // 保存配置信息
-      configTrialProcessInfo(this.form).then(res => {
-        this.btnLoading = false
-        if (res.IsSuccess) {
-          this.initialForm = { ...this.form }
-          this.signVisible = true
-        }
-      }).catch(_ => { this.btnLoading = false })
+      configTrialProcessInfo(this.form)
+        .then((res) => {
+          this.btnLoading = false
+          if (res.IsSuccess) {
+            this.initialForm = { ...this.form }
+            this.signVisible = true
+          }
+        })
+        .catch((_) => {
+          this.btnLoading = false
+        })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -1188,25 +1377,27 @@ export default {
       this.loading = true
       var params = {
         data: this.form,
-        signInfo: signInfo
+        signInfo: signInfo,
       }
       // 保存并签名确认
-      ConfigTrialProcessInfoConfirm(params).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.form.IsTrialProcessConfirmed = true
-          this.isEdit = false
+      ConfigTrialProcessInfoConfirm(params)
+        .then((res) => {
+          this.loading = false
+          if (res.IsSuccess) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.form.IsTrialProcessConfirmed = true
+            this.isEdit = false
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            this.confirmVisible = false
+            this.updateVisible = false
+            this.$emit('refresh')
+          }
+        })
+        .catch((_) => {
+          this.loading = false
           this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          this.confirmVisible = false
-          this.updateVisible = false
-          this.$emit('refresh')
-        }
-      }).catch(_ => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
+        })
     },
 
     // 配置信息数组结构
@@ -1223,7 +1414,7 @@ export default {
         {
           Name: this.$t('trials:processCfg:form:readingMode'), // 阅片方式
           NewVal: this.$fd('ReadingMode', this.form.ReadingMode),
-          OldVal: this.$fd('ReadingMode', this.initialForm.ReadingMode)
+          OldVal: this.$fd('ReadingMode', this.initialForm.ReadingMode),
         },
         // {
         //   Name: this.$t('trials:processCfg:form:imagePlatform'), // 阅片平台
@@ -1233,28 +1424,37 @@ export default {
         {
           Name: this.$t('trials:processCfg:form:criterion'), // 阅片标准
           NewVal: this.form.TrialCriterionNames.join(', '),
-          OldVal: this.initialForm.TrialCriterionNames.join(', ')
+          OldVal: this.initialForm.TrialCriterionNames.join(', '),
         },
         {
           Name: this.$t('trials:logincCfg:form:clinicalInforTransfer'),
-          NewVal: this.$fd('ClinicalInformationTransmissionEnum', this.form.ClinicalInformationTransmissionEnum),
-          OldVal: this.$fd('ClinicalInformationTransmissionEnum', this.initialForm.ClinicalInformationTransmissionEnum)
+          NewVal: this.$fd(
+            'ClinicalInformationTransmissionEnum',
+            this.form.ClinicalInformationTransmissionEnum
+          ),
+          OldVal: this.$fd(
+            'ClinicalInformationTransmissionEnum',
+            this.initialForm.ClinicalInformationTransmissionEnum
+          ),
         },
         {
           Name: this.$t('trials:logincCfg:form:clinicalConfig'),
           NewVal: this.form.ClinicalDataSetNames.join(', '),
-          OldVal: this.initialForm.ClinicalDataSetNames.join(', ')
+          OldVal: this.initialForm.ClinicalDataSetNames.join(', '),
         },
         {
           Name: this.$t('trials:processCfg:form:qcProcess'), // 影像质控流程
           NewVal: this.$fd('QCProcessEnum', this.form.QCProcessEnum),
-          OldVal: this.$fd('QCProcessEnum', this.initialForm.QCProcessEnum)
+          OldVal: this.$fd('QCProcessEnum', this.initialForm.QCProcessEnum),
         },
         {
           Name: this.$t('trials:processCfg:form:conProcess'), // 一致性核查流程
           NewVal: this.$fd('YesOrNo', this.form.IsImageConsistencyVerification),
-          OldVal: this.$fd('YesOrNo', this.initialForm.IsImageConsistencyVerification)
-        }
+          OldVal: this.$fd(
+            'YesOrNo',
+            this.initialForm.IsImageConsistencyVerification
+          ),
+        },
         // {
         //   Name: this.$t('trials:processCfg:form:criterion'), // 阅片标准
         //   NewVal: criterions.length > 0 ? criterions.join(', ') : '',
@@ -1321,8 +1521,10 @@ export default {
           this.form[k] = res[k]
         }
       }
-      this.form.TrialCriterionNamesStr = this.form.TrialCriterionNames.join(', ')
-      this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
+      this.form.TrialCriterionNamesStr =
+        this.form.TrialCriterionNames.join(', ')
+      this.form.ClinicalDataSetNamesStr =
+        this.form.ClinicalDataSetNames.join(', ')
       this.initialForm = { ...this.form }
       this.TrialStatusStr = res.TrialStatusStr
       this.getCriterionList()
@@ -1336,25 +1538,39 @@ export default {
     getClinicalDataList(isSelect = false) {
       return new Promise((resolve, reject) => {
         this.listLoading = true
-        getTrialClinicalDataTrialSetList({ trialId: this.form.TrialId, criterionIds: this.form.TrialCriterionIds }).then(res => {
-          this.clinicalDataList = res.Result
-          this.listLoading = false
-          if (isSelect) {
-            this.$nextTick(() => {
-              for (let i = 0; i < this.form.ClinicalDataTrialSetIds.length; i++) {
-                var index = this.clinicalDataList.findIndex(item => item.Id === this.form.ClinicalDataTrialSetIds[i])
-
-                if (index > -1) {
-                  this.$refs['clinicalData'].toggleRowSelection(this.clinicalDataList[index], true)
-                }
-              }
-            })
-          }
-          resolve()
-        }).catch(() => {
-          this.listLoading = false
-          reject()
+        getTrialClinicalDataTrialSetList({
+          trialId: this.form.TrialId,
+          criterionIds: this.form.TrialCriterionIds,
         })
+          .then((res) => {
+            this.clinicalDataList = res.Result
+            this.listLoading = false
+            if (isSelect) {
+              this.$nextTick(() => {
+                for (
+                  let i = 0;
+                  i < this.form.ClinicalDataTrialSetIds.length;
+                  i++
+                ) {
+                  var index = this.clinicalDataList.findIndex(
+                    (item) => item.Id === this.form.ClinicalDataTrialSetIds[i]
+                  )
+
+                  if (index > -1) {
+                    this.$refs['clinicalData'].toggleRowSelection(
+                      this.clinicalDataList[index],
+                      true
+                    )
+                  }
+                }
+              })
+            }
+            resolve()
+          })
+          .catch(() => {
+            this.listLoading = false
+            reject()
+          })
       })
     },
     // 获取勾选行数据
@@ -1363,7 +1579,11 @@ export default {
       this.selectedCD = []
       for (let index = 0; index < val.length; index++) {
         arr.push(val[index].Id)
-        this.selectedCD.push(this.$i18n.locale === 'zh' ? val[index].ClinicalDataSetName : val[index].ClinicalDataSetEnName)
+        this.selectedCD.push(
+          this.$i18n.locale === 'zh'
+            ? val[index].ClinicalDataSetName
+            : val[index].ClinicalDataSetEnName
+        )
       }
       this.selectClinicalDataArr = arr
     },
@@ -1373,13 +1593,14 @@ export default {
         let params = {
           trialId: this.form.TrialId,
           trialCriterionIds: this.form.TrialCriterionIds,
-          clinicalDataTrialSetIds: this.selectClinicalDataArr
+          clinicalDataTrialSetIds: this.selectClinicalDataArr,
         }
         await configTrialProcessInfoVerification(params)
 
         this.form.ClinicalDataSetNames = this.selectedCD
         this.form.ClinicalDataTrialSetIds = this.selectClinicalDataArr
-        this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
+        this.form.ClinicalDataSetNamesStr =
+          this.form.ClinicalDataSetNames.join(', ')
         this.clinicalDataVisible = false
       } catch (e) {
         console.log(e)
@@ -1391,57 +1612,69 @@ export default {
 
       this.$nextTick(() => {
         for (let i = 0; i < this.form.ClinicalDataTrialSetIds.length; i++) {
-          var index = this.clinicalDataList.findIndex(item => item.Id === this.form.ClinicalDataTrialSetIds[i])
+          var index = this.clinicalDataList.findIndex(
+            (item) => item.Id === this.form.ClinicalDataTrialSetIds[i]
+          )
           if (index > -1) {
-            this.$refs['clinicalData'].toggleRowSelection(this.clinicalDataList[index], true)
+            this.$refs['clinicalData'].toggleRowSelection(
+              this.clinicalDataList[index],
+              true
+            )
           }
         }
       })
     },
     handleAddClinicalData() {
       this.currentRow = {}
-      this.addOrEditCD.title = this.$t('common:button:new')// 新增
+      this.addOrEditCD.title = this.$t('common:button:new') // 新增
       this.addOrEditCD.visible = true
     },
     handleEditClinicalData(row) {
       this.currentRow = { ...row }
-      this.addOrEditCD.title = this.$t('common:button:edit')// '编辑'
+      this.addOrEditCD.title = this.$t('common:button:edit') // '编辑'
       this.addOrEditCD.visible = true
     },
     handleDeleteClinicalData(row) {
       this.$confirm(this.$t('trials:staffResearch:message:confirmDel'), {
         type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deleteClinicalTrialSetData(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                var cdNameIndex = this.selectedCD.indexOf(row.ClinicalDataSetName)
-                if (cdNameIndex > -1) {
-                  this.selectedCD.splice(cdNameIndex, 1)
-                }
-                var cdIdIndex = this.selectClinicalDataArr.indexOf(row.Id)
-                if (cdIdIndex > -1) {
-                  this.selectClinicalDataArr.splice(cdIdIndex, 1)
-                }
-                var index = this.form.ClinicalDataTrialSetIds.indexOf(row.Id)
-                if (index > -1) {
-                  this.form.ClinicalDataTrialSetIds.splice(index, 1)
-                }
-                var i = this.form.ClinicalDataSetNames.indexOf(row.ClinicalDataSetName)
-                if (i > -1) {
-                  this.form.ClinicalDataSetNames.splice(i, 1)
-                  this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
-                }
-                this.getClinicalDataList(true)
-                // '删除成功!'
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true
+        deleteClinicalTrialSetData(row.Id)
+          .then((res) => {
+            this.loading = false
+            if (res.IsSuccess) {
+              var cdNameIndex = this.selectedCD.indexOf(row.ClinicalDataSetName)
+              if (cdNameIndex > -1) {
+                this.selectedCD.splice(cdNameIndex, 1)
               }
-            }).catch(() => { this.loading = false })
-        })
+              var cdIdIndex = this.selectClinicalDataArr.indexOf(row.Id)
+              if (cdIdIndex > -1) {
+                this.selectClinicalDataArr.splice(cdIdIndex, 1)
+              }
+              var index = this.form.ClinicalDataTrialSetIds.indexOf(row.Id)
+              if (index > -1) {
+                this.form.ClinicalDataTrialSetIds.splice(index, 1)
+              }
+              var i = this.form.ClinicalDataSetNames.indexOf(
+                row.ClinicalDataSetName
+              )
+              if (i > -1) {
+                this.form.ClinicalDataSetNames.splice(i, 1)
+                this.form.ClinicalDataSetNamesStr =
+                  this.form.ClinicalDataSetNames.join(', ')
+              }
+              this.getClinicalDataList(true)
+              // '删除成功!'
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
+            }
+          })
+          .catch(() => {
+            this.loading = false
+          })
+      })
     },
     handleDownloadTpl(row) {
       window.open(this.OSSclientConfig.basePath + row.Path)
@@ -1463,21 +1696,30 @@ export default {
     getCriterionList(isSelect = false) {
       this.listLoading = true
       this.criterionSearchForm.TrialId = this.form.TrialId
-      getReadingQuestionCriterionTrialList(this.criterionSearchForm).then(res => {
-        this.criterionList = res.Result.CurrentPageData
-        this.criterionListTotal = res.Result.TotalCount
-        this.listLoading = false
-        if (isSelect) {
-          this.$nextTick(() => {
-            for (let i = 0; i < this.form.TrialCriterionIds.length; i++) {
-              var index = this.criterionList.findIndex(item => item.Id === this.form.TrialCriterionIds[i])
-              if (index > -1) {
-                this.$refs['criterionList'].toggleRowSelection(this.criterionList[index], true)
+      getReadingQuestionCriterionTrialList(this.criterionSearchForm)
+        .then((res) => {
+          this.criterionList = res.Result.CurrentPageData
+          this.criterionListTotal = res.Result.TotalCount
+          this.listLoading = false
+          if (isSelect) {
+            this.$nextTick(() => {
+              for (let i = 0; i < this.form.TrialCriterionIds.length; i++) {
+                var index = this.criterionList.findIndex(
+                  (item) => item.Id === this.form.TrialCriterionIds[i]
+                )
+                if (index > -1) {
+                  this.$refs['criterionList'].toggleRowSelection(
+                    this.criterionList[index],
+                    true
+                  )
+                }
               }
-            }
-          })
-        }
-      }).catch(() => { this.listLoading = false })
+            })
+          }
+        })
+        .catch(() => {
+          this.listLoading = false
+        })
     },
     handleResetCriterion() {
       this.criterionSearchForm = criterionSearchDataDefault()
@@ -1492,10 +1734,17 @@ export default {
       this.selectCriterionIds = []
       this.$nextTick(() => {
         for (let i = 0; i < this.form.TrialCriterionIds.length; i++) {
-          var index = this.criterionList.findIndex(item => item.Id === this.form.TrialCriterionIds[i])
+          var index = this.criterionList.findIndex(
+            (item) => item.Id === this.form.TrialCriterionIds[i]
+          )
           if (index > -1) {
-            this.$refs['criterionList'].toggleRowSelection(this.criterionList[index], true)
-            this.selectedCriterions.push(this.criterionList[index].CriterionName)
+            this.$refs['criterionList'].toggleRowSelection(
+              this.criterionList[index],
+              true
+            )
+            this.selectedCriterions.push(
+              this.criterionList[index].CriterionName
+            )
             this.selectCriterionIds.push(this.criterionList[index].Id)
           }
         }
@@ -1506,11 +1755,14 @@ export default {
       // this.selectCriterionIds = selection.length > 0 ? [row.Id] : []
       // this.selectedCriterions = selection.length > 0 ? [row.CriterionName] : []
       console.log(selection)
-      var a = Object.assign([], selection.sort((a, b) => {
-        return a.ShowOrder - b.ShowOrder
-      }))
-      this.selectedCriterions = a.map(v => v.CriterionName)
-      this.selectCriterionIds = a.map(v => v.Id)
+      var a = Object.assign(
+        [],
+        selection.sort((a, b) => {
+          return a.ShowOrder - b.ShowOrder
+        })
+      )
+      this.selectedCriterions = a.map((v) => v.CriterionName)
+      this.selectCriterionIds = a.map((v) => v.Id)
       // 清除 所有勾选项
       // this.$refs.criterionList.clearSelection()
       // 当表格数据都没有被勾选的时候 就返回
@@ -1522,7 +1774,7 @@ export default {
     handleAddCriterion() {
       this.criterionForm.Id = ''
       this.criterionForm.CriterionName = ''
-      this.criterionFormDg.title = this.$t('common:button:new')// 新增
+      this.criterionFormDg.title = this.$t('common:button:new') // 新增
       this.criterionFormDg.visible = true
     },
     handleEditCriterion(row) {
@@ -1531,7 +1783,7 @@ export default {
           this.criterionForm[k] = row[k]
         }
       }
-      this.criterionFormDg.title = this.$t('common:button:edit')// '编辑'
+      this.criterionFormDg.title = this.$t('common:button:edit') // '编辑'
       this.criterionFormDg.visible = true
     },
     handleConfigCriterion(row) {
@@ -1542,37 +1794,44 @@ export default {
       // '是否确认删除？'
       this.$confirm(this.$t('trials:processCfg:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.listLoading = true
-          deleteReadingQuestionCriterionTrial(row.Id)
-            .then(res => {
-              this.listLoading = false
-              if (res.IsSuccess) {
-                var cNameIndex = this.selectedCriterions.indexOf(row.CriterionName)
-                if (cNameIndex > -1) {
-                  this.selectedCriterions.splice(cNameIndex, 1)
-                }
-                var cIdIndex = this.selectCriterionIds.indexOf(row.Id)
-                if (cIdIndex > -1) {
-                  this.selectCriterionIds.splice(cIdIndex, 1)
-                }
-                var index = this.form.TrialCriterionIds.indexOf(row.Id)
-                if (index > -1) {
-                  this.form.TrialCriterionIds.splice(index, 1)
-                }
-                var i = this.form.TrialCriterionNames.indexOf(row.CriterionName)
-                if (i > -1) {
-                  this.form.TrialCriterionNames.splice(i, 1)
-                  this.form.TrialCriterionNamesStr = this.form.TrialCriterionNames.join(', ')
-                }
-                this.getCriterionList(true)
-                // '删除成功！'
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.listLoading = true
+        deleteReadingQuestionCriterionTrial(row.Id)
+          .then((res) => {
+            this.listLoading = false
+            if (res.IsSuccess) {
+              var cNameIndex = this.selectedCriterions.indexOf(
+                row.CriterionName
+              )
+              if (cNameIndex > -1) {
+                this.selectedCriterions.splice(cNameIndex, 1)
               }
-            }).catch(() => { this.listLoading = false })
-        })
+              var cIdIndex = this.selectCriterionIds.indexOf(row.Id)
+              if (cIdIndex > -1) {
+                this.selectCriterionIds.splice(cIdIndex, 1)
+              }
+              var index = this.form.TrialCriterionIds.indexOf(row.Id)
+              if (index > -1) {
+                this.form.TrialCriterionIds.splice(index, 1)
+              }
+              var i = this.form.TrialCriterionNames.indexOf(row.CriterionName)
+              if (i > -1) {
+                this.form.TrialCriterionNames.splice(i, 1)
+                this.form.TrialCriterionNamesStr =
+                  this.form.TrialCriterionNames.join(', ')
+              }
+              this.getCriterionList(true)
+              // '删除成功！'
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
+            }
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
+      })
     },
     handleCancelSave() {
       this.$refs['criterionForm'].resetFields()
@@ -1583,17 +1842,23 @@ export default {
         if (!valid) return
         this.listLoading = true
         this.criterionForm.TrialId = this.form.TrialId
-        addOrUpdateReadingQuestionCriterionTrial(this.criterionForm).then(res => {
-          this.listLoading = false
-          // 保存成功
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.criterionFormDg.visible = false
-          this.getCriterionList()
-        }).catch(() => { this.listLoading = false })
+        addOrUpdateReadingQuestionCriterionTrial(this.criterionForm)
+          .then((res) => {
+            this.listLoading = false
+            // 保存成功
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.criterionFormDg.visible = false
+            this.getCriterionList()
+          })
+          .catch(() => {
+            this.listLoading = false
+          })
       })
     },
     handleConfirmCriterion() {
-      if(this.selectedCriterions.join(', ') !== this.form.TrialCriterionNamesStr){
+      if (
+        this.selectedCriterions.join(', ') !== this.form.TrialCriterionNamesStr
+      ) {
         // 清空临床数据配置信息
         this.form.ClinicalDataSetNames = []
         this.form.ClinicalDataTrialSetIds = []
@@ -1601,36 +1866,45 @@ export default {
       }
       this.form.TrialCriterionNames = this.selectedCriterions
       this.form.TrialCriterionIds = this.selectCriterionIds
-      this.form.TrialCriterionNamesStr = this.form.TrialCriterionNames.join(', ')
+      this.form.TrialCriterionNamesStr =
+        this.form.TrialCriterionNames.join(', ')
       this.criterionListVisible = false
     },
 
     changeCriterionStatus(callback, row) {
       var message = ''
       if (callback) {
-        message = this.$t('trials:processCfg:message:update')// '是否确认更改？'
+        message = this.$t('trials:processCfg:message:update') // '是否确认更改？'
         row.IsCompleteConfig = false
       } else {
-        message = this.$t('trials:processCfg:message:update')// '是否确认更改？'
+        message = this.$t('trials:processCfg:message:update') // '是否确认更改？'
         row.IsCompleteConfig = true
       }
       this.$confirm(message, {
         distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        this.listLoading = true
-        var params = {
-          id: row.Id,
-          isCompleteConfig: !row.IsCompleteConfig
-        }
-        setTrialReadingQuestionCriterionIsIsCompleteConfig(params).then(res => {
-          this.listLoading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))// '保存成功！'
-            this.getCriterionList()
+        type: 'warning',
+      })
+        .then(() => {
+          this.listLoading = true
+          var params = {
+            id: row.Id,
+            isCompleteConfig: !row.IsCompleteConfig,
           }
-        }).catch(() => { this.listLoading = false })
-      }).catch(() => {})
+          setTrialReadingQuestionCriterionIsIsCompleteConfig(params)
+            .then((res) => {
+              this.listLoading = false
+              if (res.IsSuccess) {
+                this.$message.success(
+                  this.$t('common:message:savedSuccessfully')
+                ) // '保存成功！'
+                this.getCriterionList()
+              }
+            })
+            .catch(() => {
+              this.listLoading = false
+            })
+        })
+        .catch(() => {})
     },
     handleIsReadingTaskViewInOrderChange(val) {
       if (val === false) {
@@ -1638,23 +1912,23 @@ export default {
         this.form.IsGlobalReading = false
         this.form.IsClinicalReading = false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
 .process-config-form {
-  .fontColor{
+  .fontColor {
     color: red;
   }
-  .criterion-table{
+  .criterion-table {
     thead {
-       .el-table-column--selection {
-          .cell {
-            display: none;
-          }
+      .el-table-column--selection {
+        .cell {
+          display: none;
         }
       }
+    }
   }
 }
 </style>
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
index 8d920ac1..1947cd0e 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue
@@ -34,7 +34,7 @@
             type="text"
             @click="handleDownloadTpl"
           >
-            {{ $t("trials:readingPeriod:cd:title:downloadTpl") }}
+            {{ $t('trials:readingPeriod:cd:title:downloadTpl') }}
           </el-button>
         </el-col>
       </el-form-item>
@@ -53,7 +53,7 @@
               "
             >
               <el-button type="primary" style="width: 56px" size="small">
-                {{ $t("trials:uploadClinicalData:button:selectFile") }}
+                {{ $t('trials:uploadClinicalData:button:selectFile') }}
               </el-button>
               <input
                 type="file"
@@ -72,7 +72,7 @@
                 @change="beginScanFiles($event)"
               />
               <span style="margin-left: 10px">{{
-                $t("trials:attachment:message:pdf")
+                $t('trials:attachment:message:pdf')
               }}</span>
             </div>
           </div>
@@ -104,7 +104,7 @@
                   ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
                   : scope.row.Size && scope.row.Size > 0
                   ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
-                  : 0
+                  : ''
               }}</span>
             </template>
           </el-table-column>
@@ -139,7 +139,7 @@
           type="primary"
           @click="close"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
         <el-button
@@ -148,7 +148,7 @@
           :loading="btnLoading"
           @click="save"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
     </div>
@@ -159,23 +159,23 @@ import {
   getTrialClinicalDataSelect,
   addOrUpdateReadingClinicalData,
   addOrUpdateConsistencyAnalysisReadingClinicalData,
-} from "@/api/trials";
-import { fileDownload } from "@/utils/uploadZip.js";
+} from '@/api/trials'
+import { downLoadFile } from '@/utils/stream.js'
 export default {
-  name: "AddOrUpdateClinicalData",
+  name: 'AddOrUpdateClinicalData',
   props: {
     trialReadingCriterionId: {
       type: String,
-      default: "",
+      default: '',
     },
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     type: {
-      default: "readingPeriod",
+      default: 'readingPeriod',
     },
     option: {
       default: () => [],
@@ -185,13 +185,13 @@ export default {
   data() {
     return {
       fileList: [],
-      faccept: [".pdf"],
+      faccept: ['.pdf'],
       form: {
-        Id: "",
-        TrialId: "",
-        SubjectId: "",
-        ReadingId: "",
-        ClinicalDataTrialSetId: "",
+        Id: '',
+        TrialId: '',
+        SubjectId: '',
+        ReadingId: '',
+        ClinicalDataTrialSetId: '',
         IsVisist: true,
         AddFileList: [],
         DeleteFileIds: [],
@@ -201,8 +201,8 @@ export default {
         ClinicalDataTrialSetId: [
           {
             required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
+            message: this.$t('common:ruleMessage:select'),
+            trigger: ['blur', 'change'],
           },
         ],
       },
@@ -211,194 +211,190 @@ export default {
       clinicalDatas: [],
       pendingUploadList: [],
       pendingDeleteList: [],
-      currentTpl: { id: "", isExist: false },
-    };
+      currentTpl: { id: '', isExist: false },
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
     // 下载临床数据
     handleUploadFile(row) {
-      let href = this.OSSclientConfig.basePath + row.Path;
-      let name = row.FileName;
-      fileDownload(href, name);
+      let href = this.OSSclientConfig.basePath + row.Path
+      let name = row.FileName
+      downLoadFile(href, name)
     },
     async initForm() {
-      if (this.type === "readingPeriod") {
-        await this.getClinicalDatas();
+      if (this.type === 'readingPeriod') {
+        await this.getClinicalDatas()
       } else {
-        this.clinicalDatas = this.option;
+        this.clinicalDatas = this.option
       }
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k];
+            this.form[k] = this.data[k]
           }
         }
-        this.handleClinicalDataSetChange(this.form.ClinicalDataTrialSetId);
-        this.fileList = this.form.FileList.concat();
+        this.handleClinicalDataSetChange(this.form.ClinicalDataTrialSetId)
+        this.fileList = this.form.FileList.concat()
       }
     },
     save() {
       this.$refs.clinicalDataForm.validate((valid) => {
-        if (!valid) return;
+        if (!valid) return
         if (this.fileList.length === 0) {
           // 请上传文件！
-          this.$alert(this.$t("trials:readingPeriod:cd:message:uploadFile"));
-          return;
+          this.$alert(this.$t('trials:readingPeriod:cd:message:uploadFile'))
+          return
         }
-        this.pendingUploadList = [];
+        this.pendingUploadList = []
         for (let i = 0; i < this.fileList.length; ++i) {
           if (this.fileList[i].Status === 0) {
-            this.pendingUploadList.push(this.fileList[i].Files);
+            this.pendingUploadList.push(this.fileList[i].Files)
           }
         }
         if (this.pendingUploadList.length > 0) {
-          this.uploadFilesAndSave();
+          this.uploadFilesAndSave()
         } else {
-          this.saveClinicalData();
+          this.saveClinicalData()
         }
-      });
+      })
     },
     uploadFilesAndSave() {
       return new Promise(async (resolve, reject) => {
-        this.form.AddFileList = [];
+        this.form.AddFileList = []
         for (var i = 0; i < this.pendingUploadList.length; ++i) {
           // const file = await this.convertBase64ToBlob(this.pendingUploadList[i])
-          const file = await this.fileToBlob(this.pendingUploadList[i]);
+          const file = await this.fileToBlob(this.pendingUploadList[i])
           const res = await this.OSSclient.put(
             `/${this.data.TrialId}/ClinicalData/${this.pendingUploadList[i].name}`,
             file
-          );
+          )
           this.form.AddFileList.push({
             fileName: this.pendingUploadList[i].name,
             path: this.$getObjectName(res.url),
             size: this.pendingUploadList[i].size,
             type: this.pendingUploadList[i].type,
-          });
+          })
         }
-        this.saveClinicalData(this.form.AddFileList);
-        resolve();
-      });
+        this.saveClinicalData(this.form.AddFileList)
+        resolve()
+      })
     },
     saveClinicalData() {
       return new Promise((resolve, reject) => {
-        this.btnLoading = true;
-        this.form.DeleteFileIds = this.pendingDeleteList;
-        if (this.type === "consistencyAnalysis") {
+        this.btnLoading = true
+        this.form.DeleteFileIds = this.pendingDeleteList
+        if (this.type === 'consistencyAnalysis') {
           addOrUpdateConsistencyAnalysisReadingClinicalData(this.form)
             .then((response) => {
-              this.btnLoading = false;
-              this.$emit("getList");
-              this.$emit("close");
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              resolve();
+              this.btnLoading = false
+              this.$emit('getList')
+              this.$emit('close')
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              resolve()
             })
             .catch(() => {
-              this.btnLoading = false;
-              reject();
-            });
+              this.btnLoading = false
+              reject()
+            })
         } else {
           addOrUpdateReadingClinicalData(this.form)
             .then((response) => {
-              this.btnLoading = false;
-              this.$emit("getList");
-              this.$emit("close");
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              resolve();
+              this.btnLoading = false
+              this.$emit('getList')
+              this.$emit('close')
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              resolve()
             })
             .catch(() => {
-              this.btnLoading = false;
-              reject();
-            });
+              this.btnLoading = false
+              reject()
+            })
         }
-      });
+      })
     },
     getClinicalDatas() {
       return new Promise((resolve, reject) => {
-        this.loading = true;
+        this.loading = true
         var param = {
           trialId: this.data.TrialId,
           IsVisit: this.data.IsVisit,
           ReadingId: this.data.ReadingId,
           SubjectId: this.data.SubjectId,
-          ReadingClinicalDataId: this.data.Id ? this.data.Id : "",
+          ReadingClinicalDataId: this.data.Id ? this.data.Id : '',
           IsBaseLine: this.data.IsBaseLine,
           TrialReadingCriterionId: this.trialReadingCriterionId,
-        };
+        }
         getTrialClinicalDataSelect(param)
           .then((res) => {
-            this.clinicalDatas = res.Result;
-            this.loading = false;
-            resolve();
+            this.clinicalDatas = res.Result
+            this.loading = false
+            resolve()
           })
           .catch(() => {
-            this.loading = false;
-            reject();
-          });
-      });
+            this.loading = false
+            reject()
+          })
+      })
     },
     handleDeleteFile(index, row) {
-      this.$confirm(this.$t("trials:readingPeriod:cd:message:delete"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:readingPeriod:cd:message:delete'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
           if (row.Id) {
-            this.pendingDeleteList.push(row.Id);
+            this.pendingDeleteList.push(row.Id)
           }
-          this.fileList.splice(index, 1);
+          this.fileList.splice(index, 1)
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     beginScanFiles(e) {
-      var files = e.target.files;
+      var files = e.target.files
       for (var i = 0; i < files.length; ++i) {
-        const fileName = files[i].name;
+        const fileName = files[i].name
         var extendName = fileName
-          .substring(fileName.lastIndexOf("."))
-          .toLocaleLowerCase();
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
         if (this.faccept.indexOf(extendName) !== -1) {
           this.fileList.push({
             FileName: fileName,
-            Path: "",
+            Path: '',
             Status: 0,
             Files: files[i],
             size: files[i].size,
-            type: fileName.split(".")[1],
-          });
+            type: fileName.split('.')[1],
+          })
         }
       }
     },
     handleClinicalDataSetChange(v) {
-      var index = this.clinicalDatas.findIndex((item) => item.Id === v);
+      var index = this.clinicalDatas.findIndex((item) => item.Id === v)
       if (index > -1) {
-        this.currentTpl.id = this.clinicalDatas[index].Id;
-        this.currentTpl.path = this.clinicalDatas[index].Path;
-        this.currentTpl.isExist = !!this.clinicalDatas[index].FileName;
+        this.currentTpl.id = this.clinicalDatas[index].Id
+        this.currentTpl.path = this.clinicalDatas[index].Path
+        this.currentTpl.isExist = !!this.clinicalDatas[index].FileName
       }
     },
     handleDownloadTpl() {
-      this.loading = true;
+      this.loading = true
       window.open(
         this.OSSclientConfig.basePath + this.currentTpl.path,
-        "_blank"
-      );
-      this.loading = false;
+        '_blank'
+      )
+      this.loading = false
       // DownloadTrialClinicalFile(this.currentTpl.id).then(data => {
       //   this.loading = false
       // }).catch(() => { this.loading = false })
     },
     close() {
-      this.$emit("close");
+      this.$emit('close')
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 </style>
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index de50ee7c..930f385f 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -347,9 +347,9 @@
                   <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue"  style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="`${scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue}_modelCfg`" :images="imagesList">
                     <!-- 查看图片 -->
-                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue, 'modelCfg')">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
                        <template v-for="item of scope.row.oldValue">
                           <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                        </template>
@@ -378,9 +378,9 @@
                   <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="`${scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue}_modelcfg`" :images="imagesList">
                     <!-- 查看图片 -->
-                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue, 'modelcfg')">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
                      <template v-for="item of scope.row.newValue">
                         <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                      </template>
@@ -409,9 +409,9 @@
               :key="'tableList' + index"
             >
               <template v-if="!item.IsMerge" slot-scope="scope">
-                <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
+                <viewer v-if="item.IsPicture" :images="imagesList" :ref="`${scope.row[item.ColumnValue]}_modelcfg`">
                   <!-- 查看图片 -->
-                  <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                  <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue],'modelcfg')">{{$t('trials:auditRecord:title:viewImage')}}</span>
                   <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                 </viewer>
                 <span v-else>{{scope.row[item.ColumnValue]}}</span>
@@ -426,9 +426,9 @@
                   :key="'ChildrenList' + index"
                 >
                   <template slot-scope="scope">
-                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]">
+                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="`${scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}_modelcfg`">
                       <!-- 查看图片 -->
-                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue], 'modelcfg')">
                         {{$t('trials:auditRecord:title:viewImage')}}
                       </span>
                       <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
@@ -652,9 +652,9 @@
             />
             <!-- OptType === 'Add' ? '值' : OptType === 'Delete' ? '删除前' : '修改前' -->
             <el-table-column
-              v-if="OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'"
+              v-if="OptType2 !== 'Add' && OptType2 !== 'Upload' && OptType2 !== 'Init'"
               prop="oldValue"
-              :label="OptType === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
+              :label="OptType2 === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType2 === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
               show-overflow-tooltip
             >
               <!-- <template slot-scope="scope">
@@ -692,7 +692,7 @@
             <!-- OptType === 'Add' || OptType === 'Init' ? '值' : OptType === 'Delete' ? '删除后' : '修改后' -->
             <el-table-column
               prop="newValue"
-              :label="OptType === 'Add' || OptType === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
+              :label="OptType2 === 'Add' || OptType2 === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType2 === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
               show-overflow-tooltip
             >
               <!-- <template slot-scope="scope">
@@ -876,6 +876,7 @@ export default {
       siteOptions: [],
       visitPlanOptions: [],
       OptType: null,
+      OptType2: null,
       trialId: this.$route.query.trialId,
       configList2: [],
       otherData2: [],
@@ -896,19 +897,21 @@ export default {
     this.getList()
   },
   methods: {
-    openImage(url) {
+    openImage(url, type) {
       console.log(url)
       
       this.$nextTick(()=>{
         if (url instanceof Array) {
           this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
-          this.$refs[url[0]].$viewer.show()
+          let refName = type ? `${url[0]}_${type}` : url[0]
+          this.$refs[refName].$viewer.show()
         } else {
           this.imagesList = [this.OSSclientConfig.basePath + url]
-          if(this.$refs[url] instanceof Array){
-            this.$refs[url][0].$viewer.show()
+          let refName = type ? `${url}_${type}` : url
+          if(this.$refs[refName] instanceof Array){
+            this.$refs[refName][0].$viewer.show()
           }else{
-            this.$refs[url].$viewer.show()
+            this.$refs[refName].$viewer.show()
           }
         }
       })
@@ -978,6 +981,8 @@ export default {
       this.tableListData = []
       this[auditData] = []
       config.forEach(v => {
+        v.Code = this.$i18n.locale === 'zh' ? v.Code : v.CodeEn ? v.CodeEn : v.Code
+        
         var item
         if (!v.IsEnable) return
         if (v.IsShowByTrialConfig) {
@@ -989,22 +994,22 @@ export default {
               let uo = upObj[v.TableFiledName][i]
               if (row.OptType === 'Add' || row.OptType === 'Init') {
                 item = {
-                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
+                  newValue: o[v.Code] ? o[v.Code] : '--',
                   oldValue: ''
                 }
               } else if (row.OptType === 'Delete') {
                 item = {
-                  oldValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
+                  oldValue: o[v.Code] ? o[v.Code] : '--',
                   newValue: '--'
                 }
               } else {
                 item = {
-                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
-                  oldValue: uo ? uo[v.Code] : '--'
+                  newValue: o[v.Code] ? o[v.Code] : '--',
+                  oldValue: uo ? uo[v.Code] ? uo[v.Code] : '--' : '--'
                 }
               }
               item.key = o ? ((o[v.Code] && o[v.Code] !== null && o[v.Code] !== '' || o[v.Code] !== 0) ? o[v.Code] : '--') : '--'
-              item.Enum = v.ValueCN
+              item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
               item.DataType = v.DataType
               item.IsTableFiled = v.IsTableFiled
               this[auditData].push(item)
@@ -1019,21 +1024,21 @@ export default {
             if (row.OptType === 'Add' || row.OptType === 'Init') {
               item = {
                 key: v.Code,
-                Enum: v.ValueCN,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
                 newValue: obj[v.Code] ? obj[v.Code] : '--',
                 oldValue: ''
               }
             } else if (row.OptType === 'Delete') {
               item = {
                 key: v.Code,
-                Enum: v.ValueCN,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
                 oldValue: obj[v.Code] ? obj[v.Code] : '--',
                 newValue: '--'
               }
             } else {
               item = {
                 key: v.Code,
-                Enum: v.ValueCN,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
                 newValue: obj[v.Code] ? obj[v.Code] : '--',
                 oldValue: upObj[v.Code].length > 0 ? upObj[v.Code] : '--'
               }
@@ -1051,23 +1056,23 @@ export default {
               if (row.OptType === 'Add' || row.OptType === 'Init') {
                 item = {
                   key: o[v.ChildDataLabel],
-                  Enum: o[v.ChildDataLabel],
-                  newValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
+                  Enum: this.$i18n.locale === 'zh' ? o[v.ChildDataLabel] : o[v.ChildDataEnLabel] ? o[v.ChildDataEnLabel] : o[v.ChildDataLabel],
+                  newValue: o[v.ChildDataValue] ? o[v.ChildDataValue] : '--',
                   oldValue: ''
                 }
               } else if (row.OptType === 'Delete') {
                 item = {
                   key: o[v.ChildDataLabel],
-                  Enum: o[v.ChildDataLabel],
-                  oldValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
+                  Enum: this.$i18n.locale === 'zh' ? o[v.ChildDataLabel] : o[v.ChildDataEnLabel] ? o[v.ChildDataEnLabel] : o[v.ChildDataLabel],
+                  oldValue: o[v.ChildDataValue] ? o[v.ChildDataValue] : '--',
                   newValue: '--'
                 }
               } else {
                 item = {
                   key: o[v.ChildDataLabel],
-                  Enum: o[v.ChildDataLabel],
-                  newValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
-                  oldValue: uo ? uo[v.ChildDataValue] : '--'
+                  Enum: this.$i18n.locale === 'zh' ? o[v.ChildDataLabel] : o[v.ChildDataEnLabel] ? o[v.ChildDataEnLabel] : o[v.ChildDataLabel],
+                  newValue: o[v.ChildDataValue] ? o[v.ChildDataValue] : '--',
+                  oldValue: uo ? uo[v.ChildDataValue] ? uo[v.ChildDataValue] : '--' : '--'
                 }
               }
               this[auditData].push(item)
@@ -1084,7 +1089,7 @@ export default {
                   a = getToken()
                 }
                 return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath,
+              }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
             newValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
               v.UrlConfig.ParameterList.map((v) => {
                 let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
@@ -1092,13 +1097,13 @@ export default {
                   a = getToken()
                 }
                 return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath
+              }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath
           }
           console.log(item)
           item.IsTableFiled = v.IsTableFiled
           item.DataType = v.DataType
           item.key = v.Code
-          item.Enum = v.ValueCN
+          item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
           this[auditData].push(item)
           return
         }
@@ -1107,14 +1112,14 @@ export default {
           var body = []
           v.TableConfigList.forEach((j, i) => {
             if (j.IsFixedColumn) {
-                head.push({IsPicture: j.IsPicture, headName: j.FixedColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
+                head.push({IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.FixedColumnName : j.FixedColumnEnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
             } else {
               if (j.ListName) {
                 obj[v.Code][0][j.ListName].forEach((x, o) => {
-                  head.push({IsPicture: j.IsPicture, headName: x[j.ColumnName], IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
+                  head.push({IsPicture: j.IsPicture, headName: x[this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ? j.ColumnEnName : j.ColumnName], IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
                 })
               } else {
-                head.push({IsPicture: j.IsPicture, headName: j.ColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
+                head.push({IsPicture: j.IsPicture, headName: this.$i18n.locale === 'zh' ? j.ColumnName : j.ColumnEnName ?  j.ColumnEnName : j.ColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? this.$i18n.locale === 'zh' ? j.MergeColumnName : j.MergeColumnEnName : null, ChildrenList: []})
               }
             }
           })
@@ -1254,6 +1259,7 @@ export default {
       })
     },
     async lookDetails2(row) {
+      this.OptType2 = row.OptType
       var Json = await this.getJSON(row)
       var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null
       var ParentJson = Json[1] ? JSON.parse(Json[1]) : null
diff --git a/src/views/trials/trials-panel/trial-summary/download-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/download-monitor/index.vue
new file mode 100644
index 00000000..3511ce4e
--- /dev/null
+++ b/src/views/trials/trials-panel/trial-summary/download-monitor/index.vue
@@ -0,0 +1,357 @@
+/* eslint-disable */
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!-- 受试者编号 -->
+        <el-form-item :label="$t('trials:downloadMonitor:table:subjectId')">
+          <el-input
+            v-model="searchData.SubjectCode"
+            style="width: 120px"
+            clearable
+          />
+        </el-form-item>
+        <!-- IP -->
+        <el-form-item :label="$t('trials:downloadMonitor:table:IP')">
+          <el-input v-model="searchData.Ip" style="width: 120px" clearable />
+        </el-form-item>
+        <!-- 用户名称 -->
+        <el-form-item :label="$t('trials:downloadMonitor:table:userName')">
+          <el-input v-model="searchData.Name" style="width: 120px" clearable />
+        </el-form-item>
+        <!-- 用户类型 -->
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:downloadMonitor:table:userType')"
+        >
+          <el-select
+            v-model="searchData.UserType"
+            style="width: 140px"
+            clearable
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 影像类型 -->
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:downloadMonitor:table:imageType')"
+        >
+          <el-select
+            v-model="searchData.ImageType"
+            style="width: 140px"
+            clearable
+          >
+            <el-option
+              v-for="item of $d.downloadImageType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:downloadMonitor:table:downloadTime')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('trials:loginLog:table:beginTime')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
+        </el-form-item>
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <!-- 重置 -->
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
+          <!--导出-->
+          <!-- <el-button
+            type="primary"
+            icon="el-icon-download"
+            @click="handleExport"
+          >
+            {{ $t('common:button:export') }}
+          </el-button> -->
+        </el-form-item>
+      </el-form>
+    </template>
+    <template slot="main-container">
+      <el-table
+        v-adaptive="{ bottomOffset: 60 }"
+        v-loading="loading"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'DownloadStartTime', order: 'descending' }"
+      >
+        <el-table-column type="index" width="40" align="left" />
+        <!-- 受试者编号 -->
+        <el-table-column
+          prop="SubjectCode"
+          min-width="130"
+          :label="$t('trials:downloadMonitor:table:subjectId')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- IP -->
+        <el-table-column
+          prop="IP"
+          min-width="80"
+          :label="$t('trials:downloadMonitor:table:IP')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 访视名 -->
+        <el-table-column
+          prop="VisitName"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:visitName')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 用户名 -->
+        <el-table-column
+          prop="UserName"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:user')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 用户姓名 -->
+        <el-table-column
+          prop="UserFullName"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:userName')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 用户类型 -->
+        <el-table-column
+          prop="VisitName"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:userType')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span>
+              {{ $fd('UserType', scope.row.UserTypeEnum) }}
+            </span>
+          </template>
+        </el-table-column>
+        <!-- 检查数量 -->
+        <el-table-column
+          prop="VisitName"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:studyNum')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.DicomStudyCount + scope.row.NoneDicomStudyCount
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 影像类型 -->
+        <el-table-column
+          prop="ImageType"
+          min-width="150"
+          :label="$t('trials:downloadMonitor:table:imageType')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-tag>
+              {{ $fd('downloadImageType', scope.row.ImageType) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!-- 下载影像数量 -->
+        <el-table-column
+          prop="ImageCount"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:downloadImageNum')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 下载影像大小 -->
+        <el-table-column
+          prop="ImageSize"
+          min-width="130"
+          :label="$t('trials:downloadMonitor:table:downloadImageSize')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ fileSizeFormatter(scope.row.ImageSize) }}
+          </template>
+        </el-table-column>
+        <!-- 状态 -->
+        <el-table-column
+          prop="IsSuccess"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:status')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.IsSuccess ? 'success' : 'danger'">
+              {{ $fd('downloadIsSuccess', scope.row.IsSuccess) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!-- 下载开始时间 -->
+        <el-table-column
+          prop="DownloadStartTime"
+          min-width="130"
+          :label="$t('trials:downloadMonitor:table:downloadStartTime')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 下载结束时间 -->
+        <el-table-column
+          prop="DownloadEndTime"
+          min-width="130"
+          :label="$t('trials:downloadMonitor:table:downloadEndTime')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!-- 总共用时 -->
+        <el-table-column
+          prop="UploadIntervalStr"
+          min-width="100"
+          :label="$t('trials:downloadMonitor:table:totalTime')"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.UploadIntervalStr }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
+    </template>
+  </BaseContainer>
+</template>
+
+<script>
+import { getTrialDownloadList } from '@/api/load'
+import Pagination from '@/components/Pagination'
+import BaseContainer from '@/components/BaseContainer'
+const searchDataDefault = () => {
+  return {
+    SortField: 'DownloadStartTime',
+    Asc: false,
+    PageIndex: 1,
+    PageSize: 20,
+    TrialId: '',
+    IsSuccess: null,
+    StudyCode: null,
+    DownloadStartTime: null,
+    DownloadEndTime: null,
+    Ip: null,
+    ImageType: null,
+    UserType: null,
+    Name: null,
+  }
+}
+export default {
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      list: [],
+      total: 0,
+      loading: false,
+      searchData: searchDataDefault(),
+      datetimerange: [],
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
+      getTrialDownloadList(this.searchData)
+        .then((res) => {
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 获取site下拉框数据
+    getSite() {
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result
+      })
+    },
+    // 获取访视下拉框数据
+    getVisitPlanOptions() {
+      getTrialVisitStageSelect(this.trialId).then((res) => {
+        this.visitPlanOptions = res.Result
+      })
+    },
+    fileSizeFormatter(size) {
+      if (!size) return
+      return (size / Math.pow(1024, 2)).toFixed(3) + 'M'
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.datetimerange = []
+      this.getList()
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.getList()
+    },
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.DownloadStartTime = val[0]
+        this.searchData.DownloadEndTime = val[1]
+      } else {
+        this.searchData.DownloadStartTime = ''
+        this.searchData.DownloadEndTime = ''
+      }
+    },
+  },
+}
+</script>
diff --git a/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue b/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
index 34fa1cc1..ada6da04 100644
--- a/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
@@ -154,7 +154,6 @@
           prop="CalledAEList"
           min-width="90"
           show-overflow-tooltip
-          sortable="custom"
           ><template slot-scope="scope">
             {{ scope.row.CalledAEList.join(", ") }}
           </template>
@@ -165,7 +164,6 @@
           prop="CallingAEList"
           min-width="90"
           show-overflow-tooltip
-          sortable="custom"
         >
           <template slot-scope="scope">
             {{ scope.row.CallingAEList.join(", ") }}
diff --git a/src/views/trials/trials-panel/trial-summary/push-record/index.vue b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
index 9049ffa0..a1d69029 100644
--- a/src/views/trials/trials-panel/trial-summary/push-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
@@ -65,7 +65,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -73,7 +73,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -111,7 +111,6 @@
           prop="CallingAE"
           min-width="90"
           show-overflow-tooltip
-          sortable="custom"
         />
         <!--发送端IP-->
         <el-table-column
@@ -127,7 +126,6 @@
           prop="CalledAE"
           min-width="90"
           show-overflow-tooltip
-          sortable="custom"
         />
 
         <!--检查数-->
@@ -158,7 +156,7 @@
             <span>{{
               scope.row.FileSize && scope.row.FileSize > 0
                 ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
-                : 0
+                : ''
             }}</span>
           </template>
         </el-table-column>
@@ -178,6 +176,17 @@
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 总共用时 -->
+        <el-table-column
+          prop="UploadIntervalStr"
+          min-width="100"
+          :label="$t('trials:pushRecord:table:totalTime')"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.UploadIntervalStr }}
+          </template>
+        </el-table-column>
       </el-table>
       <!-- 分页组件 -->
       <pagination
@@ -195,10 +204,10 @@ import {
   getSCPImageUploadList,
   getDicomCalledAEList,
   getDicomCallingAEList,
-} from "@/api/trials";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import moment from "moment";
+} from '@/api/trials'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import moment from 'moment'
 const searchDataDefault = () => {
   return {
     CallingAE: null,
@@ -209,9 +218,9 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: "StartTime",
-  };
-};
+    SortField: 'StartTime',
+  }
+}
 export default {
   components: { BaseContainer, Pagination },
   data() {
@@ -224,14 +233,14 @@ export default {
       datetimerange: [],
       calledAEList: [],
       callingAEList: [],
-    };
+    }
   },
   created() {
-    this.getCalledAEList();
-    this.getCallingAEList();
+    this.getCalledAEList()
+    this.getCallingAEList()
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   methods: {
     // 获取接收端AE列表
@@ -239,13 +248,13 @@ export default {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCalledAEList(params);
+        }
+        let res = await getDicomCalledAEList(params)
         if (res.IsSuccess) {
-          this.calledAEList = res.Result;
+          this.calledAEList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     // 获取发送端端AE列表
@@ -253,60 +262,60 @@ export default {
       try {
         let params = {
           TrialId: this.$route.query.trialId,
-        };
-        let res = await getDicomCallingAEList(params);
+        }
+        let res = await getDicomCallingAEList(params)
         if (res.IsSuccess) {
-          this.callingAEList = res.Result;
+          this.callingAEList = res.Result
         }
       } catch (err) {
-        console.log(err);
+        console.log(err)
       }
     },
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.$route.query.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
       getSCPImageUploadList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.StartTime = val[0];
-        this.searchData.EndTime = val[1];
+        this.searchData.StartTime = val[0]
+        this.searchData.EndTime = val[1]
       } else {
-        this.searchData.StartTime = "";
-        this.searchData.EndTime = "";
+        this.searchData.StartTime = ''
+        this.searchData.EndTime = ''
       }
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 重置列表查询
     handleReset() {
-      this.datetimerange = null;
-      this.handleDatetimeChange();
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.datetimerange = null
+      this.handleDatetimeChange()
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
   },
-};
+}
 </script>
     
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
index cce02600..f2e1a335 100644
--- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
@@ -19,11 +19,11 @@
           size="small"
           style="margin-left: 10px"
         >
-          ( {{ $fd("TrialStatusEnum", trialInfo.TrialStatusStr) }} )
+          ( {{ $fd('TrialStatusEnum', trialInfo.TrialStatusStr) }} )
         </el-tag>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:trialType')">
-        {{ $fd("TrialType", trialInfo.TrialType) }}
+        {{ $fd('TrialType', trialInfo.TrialType) }}
       </el-descriptions-item>
 
       <el-descriptions-item
@@ -70,8 +70,8 @@
       >
         <span v-if="trialInfo.DeclarationTypeEnumList">{{
           trialInfo.DeclarationTypeEnumList.map((v) =>
-            $fd("DeclarationType", v)
-          ).join(", ")
+            $fd('DeclarationType', v)
+          ).join(', ')
         }}</span>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:phase')">
@@ -81,10 +81,10 @@
       <el-descriptions-item
         :label="$t('trials:trials-list:form:indicationType')"
       >
-        {{ $fd("IndicationType", trialInfo.IndicationTypeId, "id") }}
+        {{ $fd('IndicationType', trialInfo.IndicationTypeId, 'id') }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:indication')">
-        {{ $fd("Indication", trialInfo.IndicationEnum)
+        {{ $fd('Indication', trialInfo.IndicationEnum)
         }}{{ trialInfo.Indication }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:modality')">
@@ -125,7 +125,7 @@
       <!--      </el-descriptions-item>-->
 
       <el-descriptions-item :label="$t('trials:trials-list:form:expedited')">
-        {{ $fd("YesOrNoForInt", trialInfo.Expedited) }}
+        {{ $fd('YesOrNoForInt', trialInfo.Expedited) }}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:projectCycle')">
         {{ trialInfo.ProjectCycle }}
@@ -141,8 +141,8 @@
       >
         <span v-if="trialInfo.AttendedReviewerTypeEnumList">{{
           trialInfo.AttendedReviewerTypeEnumList.map((v) =>
-            $fd("AttendedReviewerType", v)
-          ).join(", ")
+            $fd('AttendedReviewerType', v)
+          ).join(', ')
         }}</span>
       </el-descriptions-item>
     </el-descriptions>
@@ -151,53 +151,53 @@
       :value="trialInfo.UserFeedBackUnDealedCount || 0"
       :max="99"
       class="inBox"
-      v-hasPermi="['role:pm']"
+      v-hasPermi="['role:pm', 'role:admin', 'role:apm']"
     >
       <i class="el-icon-message" @click.stop="openFeedBack"></i>
     </el-badge>
   </div>
 </template>
 <script>
-import { getTrialInfo } from "@/api/trials";
+import { getTrialInfo } from '@/api/trials'
 export default {
   data() {
     return {
       trialInfo: {},
-      trialId: "",
-      trialStatus: "",
+      trialId: '',
+      trialStatus: '',
       formLoading: false,
-    };
+    }
   },
   mounted() {
-    this.trialId = this.$route.query.trialId;
-    this.initForm();
+    this.trialId = this.$route.query.trialId
+    this.initForm()
   },
   methods: {
     initForm() {
-      this.formLoading = true;
+      this.formLoading = true
       getTrialInfo(this.trialId)
         .then((res) => {
-          this.formLoading = false;
-          this.trialInfo = res.Result;
+          this.formLoading = false
+          this.trialInfo = res.Result
           this.trialInfo.ReviewTypeList =
             this.trialInfo.ReviewTypeList.length > 0
-              ? this.trialInfo.ReviewTypeList.join(", ")
-              : "";
-          var modalityArr = [];
+              ? this.trialInfo.ReviewTypeList.join(', ')
+              : ''
+          var modalityArr = []
           res.Result.ModalityIds.map((i) => {
-            modalityArr.push(this.$fd("Modality", i, "id"));
-          });
-          this.trialInfo.ModalityList = modalityArr.join(", ");
+            modalityArr.push(this.$fd('Modality', i, 'id'))
+          })
+          this.trialInfo.ModalityList = modalityArr.join(', ')
           this.trialInfo.Criterion =
             res.Result.CriterionList && res.Result.CriterionList.length > 0
-              ? res.Result.CriterionList.join(", ")
-              : "";
+              ? res.Result.CriterionList.join(', ')
+              : ''
           // this.trialInfo.Expedited = this.$fd('Trial_BasicInfo', res.Result.Expedited)
           // this.trialInfo.AttendedReviewerType = this.$fd('Trial_BasicInfo', res.Result.AttendedReviewerType)
         })
         .catch(() => {
-          this.formLoading = false;
-        });
+          this.formLoading = false
+        })
     },
     // 打开反馈意见列表
     openFeedBack() {
@@ -208,12 +208,12 @@ export default {
           trialId: this.trialId,
         },
         callBack: () => {
-          this.initForm();
+          this.initForm()
         },
-      });
+      })
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .trial-information {
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 41242f73..d9c338e7 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -5,9 +5,14 @@
       <el-form :inline="true">
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:uploadMonitor:table:siteId')">
-          <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.TrialSiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
-              v-for="(item,index) of siteOptions"
+              v-for="(item, index) of siteOptions"
               :key="index"
               :label="item.TrialSiteCode"
               :value="item.SiteId"
@@ -18,15 +23,18 @@
         <el-form-item :label="$t('trials:uploadMonitor:table:subjectId')">
           <el-input
             v-model="searchData.SubjectInfo"
-            style="width:120px;"
+            style="width: 120px"
             clearable
           />
         </el-form-item>
         <!-- 访视名称 -->
-        <el-form-item class="my_multiple" :label="$t('trials:uploadMonitor:table:visitName')">
+        <el-form-item
+          class="my_multiple"
+          :label="$t('trials:uploadMonitor:table:visitName')"
+        >
           <el-select
             v-model="searchData.VisitPlanArray"
-            style="width:140px"
+            style="width: 140px"
             clearable
             multiple
           >
@@ -38,11 +46,7 @@
             >
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
-            <el-option
-              key="Other"
-              label="Out of Plan"
-              value="1.11"
-            />
+            <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
         <!-- 检查编号 -->
@@ -50,33 +54,70 @@
           <el-input v-model="searchData.StudyCode" />
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:imageType')">
-          <el-select v-model="searchData.IsDicom" style="width:120px"  clearable>
-            <el-option v-for="item of $d.IsDicom" :label="item.label" :value="item.value" :key="`RoleName${item.value}`"/>
+          <el-select
+            v-model="searchData.IsDicom"
+            style="width: 120px"
+            clearable
+          >
+            <el-option
+              v-for="item of $d.IsDicom"
+              :label="item.label"
+              :value="item.value"
+              :key="`RoleName${item.value}`"
+            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:uploader')">
           <el-input
             v-model="searchData.Uploader"
-            style="width:120px;"
+            style="width: 120px"
             clearable
           />
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:uploadStatus')">
-          <el-select v-model="searchData.IsSuccess" style="width:120px"  clearable>
-            <el-option v-for="item of $d.YesOrNo" :label="item.label" :value="item.value" :key="`RoleName${item.value}`"/>
+          <el-select
+            v-model="searchData.IsSuccess"
+            style="width: 120px"
+            clearable
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :label="item.label"
+              :value="item.value"
+              :key="`RoleName${item.value}`"
+            />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:uploadMonitor:table:uploadTime')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('trials:loginLog:table:beginTime')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
             {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
-          <el-button type="primary" icon="el-icon-download" @click="handleExport">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            @click="handleExport"
+          >
             {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
@@ -84,13 +125,13 @@
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         v-loading="loading"
         :data="list"
         stripe
         height="100"
         @sort-change="handleSortByColumn"
-        :default-sort ="{prop: 'ArchiveFinishedTime', order: 'descending'}"
+        :default-sort="{ prop: 'ArchiveFinishedTime', order: 'descending' }"
       >
         <el-table-column type="index" width="40" align="left" />
         <!-- 中心编号 -->
@@ -133,9 +174,9 @@
           show-overflow-tooltip
           sortable="custom"
         >
-        <template slot-scope="scope">
-          {{$fd('IsDicom', scope.row.IsDicom)}}
-        </template>
+          <template slot-scope="scope">
+            {{ $fd('IsDicom', scope.row.IsDicom) }}
+          </template>
         </el-table-column>
         <!-- 上传人 -->
         <el-table-column
@@ -153,63 +194,6 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <!-- 开始时间 -->
-        <el-table-column
-          prop="UploadStartTime"
-          min-width="140"
-          :label="$t('trials:uploadMonitor:table:beginTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{scope.row.UploadStartTimeStr}}
-          </template>
-        </el-table-column>
-        <!-- 结束时间 -->
-        <el-table-column
-          prop="ArchiveFinishedTime"
-          min-width="140"
-          :label="$t('trials:uploadMonitor:table:endTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
-        <template slot-scope="scope">
-            {{scope.row.ArchiveFinishedTime}}
-          </template>
-        </el-table-column>
-        <!-- 上传用时 -->
-        <el-table-column
-          prop="UploadIntervalStr"
-          min-width="120"
-          :label="$t('trials:uploadMonitor:table:uploadInterval')"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{scope.row.UploadIntervalStr}}
-          </template>
-        </el-table-column>
-        <!-- 归档用时 -->
-        <el-table-column
-          prop="ArchiveIntervalStr"
-          min-width="120"
-          :label="$t('trials:uploadMonitor:table:archiveInterval')"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{scope.row.ArchiveIntervalStr}}
-          </template>
-        </el-table-column>
-        <!-- 总共用时 -->
-        <el-table-column
-          prop="TotalMillisecondsInterval"
-          min-width="100"
-           :label="$t('trials:uploadMonitor:table:totalTime')"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{scope.row.TimeInterval}}
-          </template>
-        </el-table-column>
         <!-- 文件数 -->
         <el-table-column
           prop="FileCount"
@@ -222,12 +206,12 @@
         <el-table-column
           prop="FileSize"
           min-width="130"
-         :label="$t('trials:uploadMonitor:table:fileSize')"
+          :label="$t('trials:uploadMonitor:table:fileSize')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{fileSizeFormatter(scope.row.FileSize)}}
+            {{ fileSizeFormatter(scope.row.FileSize) }}
           </template>
         </el-table-column>
         <!-- 是否有重复文件 -->
@@ -238,9 +222,9 @@
           show-overflow-tooltip
           sortable="custom"
         >
-        <template slot-scope="scope">
-          {{ $fd('YesOrNo', scope.row.IsDicomReUpload) }}
-        </template>
+          <template slot-scope="scope">
+            {{ $fd('YesOrNo', scope.row.IsDicomReUpload) }}
+          </template>
         </el-table-column>
         <!-- 是否上传成功 -->
         <el-table-column
@@ -251,16 +235,49 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsSuccess" type="primary"> {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag>
-            <el-tag v-else type="danger"> {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag>
+            <el-tag v-if="scope.row.IsSuccess" type="primary">
+              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag
+            >
+            <el-tag v-else type="danger">
+              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag
+            >
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          prop="Note"
-          min-width="110"
-          :label="$t('trials:uploadMonitor:table:remark')"
+        <!-- 开始时间 -->
+        <el-table-column
+          prop="UploadStartTime"
+          min-width="140"
+          :label="$t('trials:uploadMonitor:table:beginTime')"
           show-overflow-tooltip
-        /> -->
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.UploadStartTimeStr }}
+          </template>
+        </el-table-column>
+        <!-- 结束时间 -->
+        <el-table-column
+          prop="ArchiveFinishedTime"
+          min-width="140"
+          :label="$t('trials:uploadMonitor:table:endTime')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.ArchiveFinishedTime }}
+          </template>
+        </el-table-column>
+        <!-- 总共用时 -->
+        <el-table-column
+          prop="TotalMillisecondsInterval"
+          min-width="100"
+          :label="$t('trials:uploadMonitor:table:totalTime')"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.TimeInterval }}
+          </template>
+        </el-table-column>
         <el-table-column
           :label="$t('common:action:action')"
           width="80"
@@ -279,7 +296,13 @@
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
     <el-dialog
       v-if="lookVisible"
@@ -290,28 +313,49 @@
       :close-on-click-modal="false"
       custom-class="base-dialog-wrapper"
     >
-      <div style="max-height: 500px;overflow-y: auto;padding: 0 20px">
-        <div style="display: flex;justify-content: space-around;margin-bottom: 20px">
-          <span>{{$t('trials:uploadDicomList:table:FailedNumber')}}: {{lookText.Failed.length}}</span>
-          <span>{{$t('trials:uploadDicomList:table:ExistedNumber')}}: {{lookText.Existed.length}}</span>
-          <span>{{$t('trials:uploadDicomList:table:UploadedNumber')}}: {{lookText.Uploaded.length}}</span>
+      <div style="max-height: 500px; overflow-y: auto; padding: 0 20px">
+        <div
+          style="
+            display: flex;
+            justify-content: space-around;
+            margin-bottom: 20px;
+          "
+        >
+          <span
+            >{{ $t('trials:uploadDicomList:table:FailedNumber') }}:
+            {{ lookText.Failed.length }}</span
+          >
+          <span
+            >{{ $t('trials:uploadDicomList:table:ExistedNumber') }}:
+            {{ lookText.Existed.length }}</span
+          >
+          <span
+            >{{ $t('trials:uploadDicomList:table:UploadedNumber') }}:
+            {{ lookText.Uploaded.length }}</span
+          >
         </div>
-        <div style="margin-bottom: 10px;font-size:12px">
-          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Failed')}}：</div>
+        <div style="margin-bottom: 10px; font-size: 12px">
+          <div style="font-size: 14px; margin-bottom: 5px">
+            {{ $t('trials:uploadDicomList:table:Failed') }}：
+          </div>
           <div v-if="lookText.Failed.length">
-            <div v-for="item of lookText.Failed" :key="item">{{item}}</div>
+            <div v-for="item of lookText.Failed" :key="item">{{ item }}</div>
           </div>
         </div>
-        <div style="margin-bottom: 10px;font-size:12px">
-          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Existed')}}：</div>
+        <div style="margin-bottom: 10px; font-size: 12px">
+          <div style="font-size: 14px; margin-bottom: 5px">
+            {{ $t('trials:uploadDicomList:table:Existed') }}：
+          </div>
           <div v-if="lookText.Existed.length">
-            <div v-for="item of lookText.Existed" :key="item">{{item}}</div>
+            <div v-for="item of lookText.Existed" :key="item">{{ item }}</div>
           </div>
         </div>
-        <div style="margin-bottom: 10px;font-size:12px">
-          <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Uploaded')}}：</div>
+        <div style="margin-bottom: 10px; font-size: 12px">
+          <div style="font-size: 14px; margin-bottom: 5px">
+            {{ $t('trials:uploadDicomList:table:Uploaded') }}：
+          </div>
           <div v-if="lookText.Uploaded.length">
-            <div v-for="item of lookText.Uploaded" :key="item">{{item}}</div>
+            <div v-for="item of lookText.Uploaded" :key="item">{{ item }}</div>
           </div>
         </div>
       </div>
@@ -326,28 +370,34 @@
 </template>
 
 <script>
-import {getDicomAndNoneDicomStudyMonitorList,getTrialSiteSelect,getTrialVisitStageSelect} from '@/api/trials'
+import {
+  getDicomAndNoneDicomStudyMonitorList,
+  getTrialSiteSelect,
+  getTrialVisitStageSelect,
+} from '@/api/trials'
 import { getStudyUploadMonitor_Export } from '@/api/export'
 import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
-import axios from "axios";
+import axios from 'axios'
 const searchDataDefault = () => {
   return {
     SortField: 'ArchiveFinishedTime',
     Asc: false,
     PageIndex: 1,
     PageSize: 20,
-    TrialId:'',
-    SiteId:'',
-    SubjectId:'',
-    SubjectVisitId:'',
-    SubjectInfo:'',
+    TrialId: '',
+    TrialSiteId: '',
+    SubjectId: '',
+    SubjectVisitId: '',
+    SubjectInfo: '',
     VisitPlanArray: [],
     IsDicom: null,
     Uploader: null,
     IsSuccess: null,
-    StudyCode: null
+    StudyCode: null,
+    UploadFinishedTime: null,
+    UploadStartTime: null,
   }
 }
 export default {
@@ -359,10 +409,11 @@ export default {
       loading: false,
       searchData: searchDataDefault(),
       trialId: this.$route.query.trialId,
-      siteOptions:[],
-      visitPlanOptions:[],
+      siteOptions: [],
+      visitPlanOptions: [],
       lookVisible: false,
-      lookText: null
+      lookText: null,
+      datetimerange: [],
     }
   },
   mounted() {
@@ -384,33 +435,35 @@ export default {
     getList() {
       this.loading = true
       this.searchData.TrialId = this.trialId
-      getDicomAndNoneDicomStudyMonitorList(this.searchData).then((res) => {
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+      getDicomAndNoneDicomStudyMonitorList(this.searchData)
+        .then((res) => {
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
+      getTrialSiteSelect(this.trialId).then((res) => {
         this.siteOptions = res.Result
       })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId)
-        .then((res) => {
-          this.visitPlanOptions = res.Result
-        })
+      getTrialVisitStageSelect(this.trialId).then((res) => {
+        this.visitPlanOptions = res.Result
+      })
     },
-    fileSizeFormatter(size){
-      if(!size) return
-      return (size / Math.pow(1024, 2)).toFixed(3) + "M"
+    fileSizeFormatter(size) {
+      if (!size) return
+      return (size / Math.pow(1024, 2)).toFixed(3) + 'M'
     },
     handleReset() {
       this.searchData = searchDataDefault()
+      this.datetimerange = []
       this.getList()
     },
     handleSearch() {
@@ -428,9 +481,19 @@ export default {
       this.getList()
     },
     handleExport() {
-      getStudyUploadMonitor_Export(this.searchData).then(res => {
-      }).catch(() => {})
+      getStudyUploadMonitor_Export(this.searchData)
+        .then((res) => {})
+        .catch(() => {})
     },
-  }
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.UploadStartTime = val[0]
+        this.searchData.UploadFinishedTime = val[1]
+      } else {
+        this.searchData.UploadStartTime = ''
+        this.searchData.UploadFinishedTime = ''
+      }
+    },
+  },
 }
 </script>
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
index 7cb3363c..ca2ad298 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue
@@ -9,7 +9,7 @@
         <el-upload
           class="upload-demo"
           action
-          accept=".xlsx,.xls,.csv"
+          accept=".xlsx,.xls"
           :before-upload="beforeUpload"
           :http-request="handleUploadFile"
           :on-preview="handlePreview"
@@ -72,7 +72,7 @@ export default {
       this.$message.warning(this.$t('trials:consistencyCheck:message:onlyOneFile'))
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['xls', 'xlsx', 'csv']
+      var typeArr = ['xls', 'xlsx']
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true
diff --git a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
index 1fa4fd8b..e3282b3f 100644
--- a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
@@ -13,7 +13,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
         </div>
 
@@ -23,7 +23,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
           <!-- <img :src="record.headUrl"> -->
           <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
@@ -231,6 +231,9 @@ export default {
     this.getMessageList()
   },
   methods: {
+    formattedText(text) {
+      return text.replace(/\n/g, '<br>')
+    },
     // 初始化聊天信息
     getMessageList() {
       var recordContent = []
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index 009a901c..092f9e11 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -252,7 +252,7 @@
         </div>
         <!-- PDF录入 -->
         <div v-if="cd.ClinicalUploadType === 1">
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <div v-if="allowAddOrEdit" style="display:flex;align-items:center;justify-content: flex-end;">
             <!-- 下载模板 -->
             <el-button
               v-if="cd.Path"
@@ -271,6 +271,7 @@
                 position: relative;
                 overflow: hidden;
                 display: inline-block;
+                margin-left:10px
               "
             >
               <!-- 新增 -->
@@ -323,7 +324,7 @@
               <span>{{
                 scope.row.Size && scope.row.Size > 0
                   ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
-                  : 0
+                  : ''
               }}</span>
             </template>
             </el-table-column>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index ab7beb7c..828f9efc 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="upload-dicom-files-wrapper">
     <!-- 已上传的dicom影像记录 -->
-    <el-divider content-position="left">{{
-      $t("trials:uploadedDicoms:title:dicomUploaded")
-    }}</el-divider>
+    <!-- <el-divider content-position="left">{{
+      $t('trials:uploadedDicoms:title:dicomUploaded')
+    }}</el-divider> -->
+    <div style="margin: 10px 0">
+      {{ $t('trials:uploadedDicoms:title:dicomUploaded') }}
+    </div>
     <div class="functions" style="text-align: right">
       <!-- //批量删除已上传的影像 -->
       <el-button
@@ -13,7 +16,7 @@
         icon="el-icon-delete"
         @click="handleBatchDelete"
       >
-        {{ $t("trials:uploadedDicoms:action:delete") }}
+        {{ $t('trials:uploadedDicoms:action:delete') }}
       </el-button>
       <!-- 预览 -->
       <el-button
@@ -23,7 +26,7 @@
         :disabled="studyList.length === 0"
         @click="handlePreviewAllFiles"
       >
-        {{ $t("trials:uploadedDicoms:action:preview") }}
+        {{ $t('trials:uploadedDicoms:action:preview') }}
       </el-button>
     </div>
     <el-table
@@ -47,7 +50,7 @@
             placement="top"
             v-if="
               (() => {
-                var r = false;
+                var r = false
                 if (scope.row.IsHaveUploadFailed) {
                   uploadQueues.forEach((v) => {
                     if (
@@ -55,16 +58,16 @@
                       v.uploadState.record &&
                       v.uploadState.record.Failed.length
                     ) {
-                      r = true;
+                      r = true
                     }
-                  });
+                  })
                 }
-                return r;
+                return r
               })()
             "
           >
             <div slot="content">
-              {{ $t("trials:uploadDicomList:table:status4") }}
+              {{ $t('trials:uploadDicomList:table:status4') }}
             </div>
             <span
               class="el-icon-warning"
@@ -74,7 +77,7 @@
           </el-tooltip>
           <el-tooltip placement="top" v-if="!scope.row.IsCompleteClinicalData">
             <div slot="content">
-              {{ $t("trials:crc-upload:confirm:message") }}
+              {{ $t('trials:crc-upload:confirm:message') }}
             </div>
             <span
               class="el-icon-warning"
@@ -129,8 +132,8 @@
         <template slot-scope="scope">
           {{
             scope.row.StudyTime
-              ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
-              : ""
+              ? moment(scope.row.StudyTime).format('YYYY-MM-DD')
+              : ''
           }}
         </template>
       </el-table-column>
@@ -193,9 +196,12 @@
       </el-table-column>
     </el-table>
     <!-- 多文件上传 -->
-    <el-divider content-position="left">{{
-      $t("trials:uploadedDicoms:title:dicomFilesOnly")
-    }}</el-divider>
+    <!-- <el-divider content-position="left">{{
+      $t('trials:uploadedDicoms:title:dicomFilesOnly')
+    }}</el-divider> -->
+    <div style="margin: 30px 0 10px 0">
+      {{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}
+    </div>
     <el-tabs v-model="uploadActiveName">
       <!-- 本地上传 -->
       <el-tab-pane
@@ -211,7 +217,7 @@
                 :loading="btnLoading"
                 size="small"
                 >{{
-                  $t("trials:uploadedDicomsicom:button:selectFolder")
+                  $t('trials:uploadedDicomsicom:button:selectFolder')
                 }}</el-button
               >
               <input
@@ -246,11 +252,11 @@
             <template slot="header">
               <el-tooltip placement="top">
                 <div slot="content">
-                  {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
-                  {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
-                  {{ $t("trials:uploadedDicoms:table:studyDate") }}
+                  {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br />
+                  {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br />
+                  {{ $t('trials:uploadedDicoms:table:studyDate') }}
                 </div>
-                <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
+                <span>{{ $t('trials:uploadDicomList:table:studyInfo') }}</span>
               </el-tooltip>
             </template>
             <template slot-scope="scope">
@@ -265,7 +271,7 @@
                   </div>
                   <div style="display: inline-block; margin-right: 2px">
                     <span v-if="scope.row.dicomInfo.modality.length > 0">
-                      {{ scope.row.dicomInfo.modality.join("、") }},</span
+                      {{ scope.row.dicomInfo.modality.join('、') }},</span
                     >
                     <span v-else style="color: #f44336">N/A,</span>
                   </div>
@@ -307,12 +313,12 @@
             <template slot="header">
               <el-tooltip placement="top">
                 <div slot="content">
-                  {{ $t("trials:uploadDicomList:table:pId") }}<br />
-                  {{ $t("trials:uploadDicomList:table:patientName") }}<br />
-                  {{ $t("trials:uploadDicomList:table:pInfo") }}
+                  {{ $t('trials:uploadDicomList:table:pId') }}<br />
+                  {{ $t('trials:uploadDicomList:table:patientName') }}<br />
+                  {{ $t('trials:uploadDicomList:table:pInfo') }}
                 </div>
                 <span>{{
-                  $t("trials:uploadDicomList:table:patientInfo")
+                  $t('trials:uploadDicomList:table:patientInfo')
                 }}</span>
               </el-tooltip>
             </template>
@@ -334,7 +340,7 @@
                     {{
                       scope.row.dicomInfo.patientName
                         ? scope.row.dicomInfo.patientName
-                        : "N/A"
+                        : 'N/A'
                     }}
                   </span>
                 </div>
@@ -347,7 +353,7 @@
                     {{
                       scope.row.dicomInfo.patientSex
                         ? scope.row.dicomInfo.patientSex
-                        : "N/A"
+                        : 'N/A'
                     }},
                   </span>
 
@@ -359,7 +365,7 @@
                     {{
                       scope.row.dicomInfo.patientAge
                         ? scope.row.dicomInfo.patientAge
-                        : "N/A"
+                        : 'N/A'
                     }},
                   </span>
 
@@ -371,7 +377,7 @@
                     {{
                       scope.row.dicomInfo.patientBirthDate
                         ? scope.row.dicomInfo.patientBirthDate
-                        : "N/A"
+                        : 'N/A'
                     }}
                   </span>
                 </div>
@@ -380,22 +386,35 @@
           </el-table-column>
           <el-table-column
             :label="$t('trials:uploadDicomList:table:failedFileCount')"
-            min-width="120"
+            min-width="150"
             show-overflow-tooltip
           >
+            <!--:percentage="
+                  (scope.row.dicomInfo.failedFileCount * 100) /
+                  scope.row.dicomInfo.fileCount
+                "
+                :show-text="false"--->
             <template slot-scope="scope">
               <el-progress
                 color="#409eff"
                 :percentage="
-                  (scope.row.dicomInfo.failedFileCount * 100) /
-                  scope.row.dicomInfo.fileCount
+                  (
+                    (scope.row.dicomInfo.uploadFileSize * 100) /
+                    scope.row.dicomInfo.fileSize
+                  ).toFixed(2) * 1
                 "
-                :show-text="false"
               />
-              <span
-                >{{ scope.row.dicomInfo.failedFileCount }} /
-                {{ scope.row.dicomInfo.fileCount }}</span
-              >
+              <span>
+                {{ $t('trials:uploadDicomList:table:uploadNow')
+                }}{{ scope.row.dicomInfo.failedFileCount }}/{{
+                  scope.row.dicomInfo.fileCount
+                }}
+                ({{
+                  (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(2)
+                }}MB/{{
+                  (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(2)
+                }}MB)
+              </span>
             </template>
           </el-table-column>
 
@@ -411,7 +430,7 @@
                   !scope.row.dicomInfo.isInit
                 "
               >
-                {{ $t("trials:uploadDicomList:table:status1") }}</span
+                {{ $t('trials:uploadDicomList:table:status1') }}</span
               >
               <span
                 style="color: #409eff"
@@ -420,7 +439,7 @@
                   scope.row.dicomInfo.isInit &&
                   btnLoading
                 "
-                >{{ $t("trials:uploadDicomList:table:status2") }}</span
+                >{{ $t('trials:uploadDicomList:table:status2') }}</span
               >
               <span
                 style="color: #409eff"
@@ -429,7 +448,7 @@
                     scope.row.dicomInfo.fileCount &&
                   !scope.row.uploadState.record
                 "
-                >{{ $t("trials:uploadDicomList:table:status2") }}</span
+                >{{ $t('trials:uploadDicomList:table:status2') }}</span
               >
               <span
                 style="color: #2cc368"
@@ -437,7 +456,7 @@
                   scope.row.dicomInfo.failedFileCount ===
                   scope.row.dicomInfo.fileCount
                 "
-                >{{ $t("trials:uploadDicomList:table:status3") }}</span
+                >{{ $t('trials:uploadDicomList:table:status3') }}</span
               >
               <span
                 style="color: #f66"
@@ -445,10 +464,10 @@
                   scope.row.uploadState.record &&
                   scope.row.uploadState.record.fileCount === 0
                 "
-                >{{ $t("trials:uploadDicomList:table:status5") }}</span
+                >{{ $t('trials:uploadDicomList:table:status5') }}</span
               >
               <span style="color: #f66" v-else>{{
-                $t("trials:uploadDicomList:table:Failed")
+                $t('trials:uploadDicomList:table:Failed')
               }}</span>
             </template>
           </el-table-column>
@@ -461,7 +480,7 @@
               <el-tooltip placement="top" v-if="scope.row.uploadState.record">
                 <div slot="content">
                   <div style="max-height: 500px; overflow-y: auto">
-                    {{ $t("trials:uploadDicomList:table:Existed") }}:
+                    {{ $t('trials:uploadDicomList:table:Existed') }}:
                     <div v-if="scope.row.uploadState.record.Existed.length">
                       <div
                         v-for="item of scope.row.uploadState.record.Existed"
@@ -472,7 +491,7 @@
                       </div>
                     </div>
                     <div v-else>&nbsp;</div>
-                    {{ $t("trials:uploadDicomList:table:Uploaded") }}:
+                    {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                     <div v-if="scope.row.uploadState.record.Uploaded.length">
                       <div
                         v-for="item of scope.row.uploadState.record.Uploaded"
@@ -484,7 +503,7 @@
                     </div>
                     <div v-else>&nbsp;</div>
                     <br />
-                    {{ $t("trials:uploadDicomList:table:Failed") }}:
+                    {{ $t('trials:uploadDicomList:table:Failed') }}:
                     <div v-if="scope.row.uploadState.record.Failed.length">
                       <div
                         v-for="item of scope.row.uploadState.record.Failed"
@@ -525,10 +544,11 @@
                 icon="el-icon-view"
                 circle
                 :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
+                  (scope.row.uploadState.stateCode !== '' &&
+                    scope.row.dicomInfo.failedFileCount <
+                      scope.row.dicomInfo.fileCount &&
+                    !scope.row.uploadState.record) ||
+                  btnLoading
                 "
                 :title="$t('trials:uploadedDicoms:action:preview')"
                 size="small"
@@ -541,10 +561,11 @@
                 :title="$t('trials:uploadedDicoms:action:delete')"
                 size="small"
                 :disabled="
-                  scope.row.uploadState.stateCode !== '' &&
-                  scope.row.dicomInfo.failedFileCount <
-                    scope.row.dicomInfo.fileCount &&
-                  !scope.row.uploadState.record
+                  (scope.row.uploadState.stateCode !== '' &&
+                    scope.row.dicomInfo.failedFileCount <
+                      scope.row.dicomInfo.fileCount &&
+                    !scope.row.uploadState.record) ||
+                  btnLoading
                 "
                 @click="handleDelete(scope.$index, scope.row)"
               />
@@ -556,6 +577,9 @@
           <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
         {{ $t('trials:uploadDicomList:button:close') }}
       </el-button> -->
+          <span style="margin-right: 10px">{{
+            $store.state.trials.uploadTip
+          }}</span>
           <!-- 上传 -->
           <el-button
             size="small"
@@ -564,7 +588,7 @@
             :loading="btnLoading"
             @click="beginUploadQueues"
           >
-            {{ $t("trials:uploadDicomList:button:upload") }}
+            {{ $t('trials:uploadDicomList:button:upload') }}
           </el-button>
         </div>
       </el-tab-pane>
@@ -624,7 +648,7 @@
       <div style="border: 1px solid #e0e0e0; padding: 10px">
         <!-- Information from DICOM headers not consistent with that of this subject -->
         <div style="color: red; font-size: 14px; margin-bottom: 10px">
-          {{ $t("trials:uploadDicomList:message:informationConsistent") }}:
+          {{ $t('trials:uploadDicomList:message:informationConsistent') }}:
         </div>
         <div v-for="(item, i) in warningArr" :key="item.index">
           <div>{{ `(${i + 1}). ACC: ${item.accNumber}` }}</div>
@@ -641,10 +665,10 @@
       </div>
       <div slot="footer" class="base-modal-footer">
         <el-button size="small" type="primary" @click="handleCancelWarnVisible">
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button size="small" type="primary" @click="handleContinueUpload">
-          {{ $t("trials:uploadDicomList:button:upload") }}
+          {{ $t('trials:uploadDicomList:button:upload') }}
         </el-button>
       </div>
     </el-dialog>
@@ -718,7 +742,7 @@
                 :key="bodyPart"
                 :label="bodyPart"
                 >{{
-                  $fd("Bodypart", bodyPart, "Code", BodyPart, "Name")
+                  $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                 }}</el-checkbox
               >
             </el-checkbox-group>
@@ -754,7 +778,7 @@
           type="primary"
           @click="editStudyInfoVisible = false"
         >
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <el-button
           :loading="btnLoading"
@@ -762,7 +786,7 @@
           type="primary"
           @click="handleUpdateStudyInfo"
         >
-          {{ $t("common:button:save") }}
+          {{ $t('common:button:save') }}
         </el-button>
       </div>
     </el-dialog>
@@ -777,11 +801,10 @@ import {
   updateModality,
   preArchiveDicomStudy,
   addOrUpdateArchiveStudy,
-  getCRCClinicalData,
-} from "@/api/trials";
-import * as dicomParser from "dicom-parser";
-import * as cornerstone from "cornerstone-core";
-import * as cornerstoneWADOImageLoader from "cornerstone-wado-image-loader";
+} from '@/api/trials'
+import * as dicomParser from 'dicom-parser'
+import * as cornerstone from 'cornerstone-core'
+import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,
@@ -790,27 +813,27 @@ var config = {
       initializeCodecsOnStartup: false,
     },
   },
-};
-cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
-import DicomPreview from "@/views/dicom-show/dicom-preview";
-import uploadPetClinicalData from "./uploadPetClinicalData.vue";
-import dicomStore from "@/utils/dicom-store";
-import { getToken } from "@/utils/auth";
-import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
-import { convertBytes } from "@/utils/dicom-character-set";
-import moment from "moment";
-import store from "@/store";
-import uploadDicomPacs from "./uploadDiocmPacs.vue";
+}
+cornerstoneWADOImageLoader.webWorkerManager.initialize(config)
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone
+import DicomPreview from '@/views/dicom-show/dicom-preview'
+import uploadPetClinicalData from './uploadPetClinicalData.vue'
+import dicomStore from '@/utils/dicom-store'
+import { getToken } from '@/utils/auth'
+import { dcmUpload } from '@/utils/dcmUpload/dcmUpload'
+import { convertBytes } from '@/utils/dicom-character-set'
+import moment from 'moment'
+import store from '@/store'
+import uploadDicomPacs from './uploadDiocmPacs.vue'
 export default {
-  name: "UploadDicomFiles",
+  name: 'UploadDicomFiles',
   components: { DicomPreview, uploadPetClinicalData, uploadDicomPacs },
   props: {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     subjectVisitId: {
@@ -828,24 +851,24 @@ export default {
   },
   data() {
     return {
-      uploadActiveName: "file",
+      uploadActiveName: 'file',
       editStudyInfoVisible: false,
       studyForm: {
-        StudyCode: "",
+        StudyCode: '',
         IsDicomData: true,
-        Modalities: "",
+        Modalities: '',
         BodyPartForEdit: [],
         SeriesCount: null,
-        StudyTime: "",
+        StudyTime: '',
       },
       uploadQueues: dicomStore.studyList, // 上传队列
       selectArr: [], // 已勾选待上传文件
-      scanState: "", // 当前上传队列上传状态
+      scanState: '', // 当前上传队列上传状态
       form: {
-        SiteName: "",
-        SubjectName: "",
-        VisitName: "",
-        SubjectId: "",
+        SiteName: '',
+        SubjectName: '',
+        VisitName: '',
+        SubjectId: '',
         VisitNum: null,
       },
       btnLoading: false,
@@ -856,7 +879,7 @@ export default {
       studyLoading: false,
       studyList: [],
       deleteArr: [],
-      trialId: "",
+      trialId: '',
       moment,
       uploadCount: 0,
       uploadedCount: 0,
@@ -872,58 +895,63 @@ export default {
       petVisible: false,
       studyData: [],
       BodyPart: {},
-    };
+
+      isClose: false,
+    }
   },
   watch: {
     btnLoading() {
-      store.dispatch("trials/setUnLock", this.btnLoading);
+      store.dispatch('trials/setUnLock', this.btnLoading)
     },
   },
   async mounted() {
-    this.trialId = this.$route.query.trialId;
-    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
+    this.trialId = this.$route.query.trialId
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     if (Object.keys(this.data).length) {
-      this.form = { ...this.data };
+      this.form = { ...this.data }
     }
-    this.getStudyInfo();
-    this.uploadQueues = [];
+    this.getStudyInfo()
+    this.uploadQueues = []
+    this.OSSclient.close()
   },
   beforeDestroy() {
     this.myInterval.forEach((v) => {
-      clearInterval(v);
-    });
-    this.myInterval = [];
-    store.dispatch("trials/setUnLock", false);
+      clearInterval(v)
+    })
+    this.myInterval = []
+    store.dispatch('trials/setUnLock', false)
+    this.isClose = true
+    this.OSSclient.close()
   },
   methods: {
     getParentList() {
-      this.getStudyInfo();
-      this.$emit("getList");
+      this.getStudyInfo()
+      this.$emit('getList')
     },
     handleHistorical(row) {
       this.$router.push(
         `/trials/trials-panel/trial-summary/upload-monitor?trialId=${this.trialId}&trialCode=${this.$route.query.trialCode}&${this.$route.query.researchProgramNo}&studyCode=${row.StudyCode}`
-      );
+      )
     },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true;
-      this.studyForm = { ...row };
-      var bodyPart = [];
-      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split("|");
-      } else if (this.studyForm.BodyPartForEdit !== "") {
-        bodyPart.push(this.studyForm.BodyPartForEdit);
+      this.editStudyInfoVisible = true
+      this.studyForm = { ...row }
+      var bodyPart = []
+      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split('|')
+      } else if (this.studyForm.BodyPartForEdit !== '') {
+        bodyPart.push(this.studyForm.BodyPartForEdit)
       }
-      this.$set(this.studyForm, "Modality", row.ModalityForEdit);
-      this.studyForm.BodyPartForEdit = bodyPart;
+      this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
+      this.studyForm.BodyPartForEdit = bodyPart
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs["studyForm"].validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
+      this.$refs['studyForm'].validate((valid) => {
+        if (!valid) return
+        this.btnLoading = true
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
         // this.studyForm.Modality = this.studyForm.Modalities
         var params = {
           id: this.studyForm.StudyId,
@@ -931,212 +959,217 @@ export default {
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
-        };
+        }
         updateModality(this.trialId, params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getStudyInfo();
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.editStudyInfoVisible = false;
+              this.getStudyInfo()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.editStudyInfoVisible = false
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     format(v) {
-      return v;
+      return v
     },
     // 获取已上传的dicom影像
     getStudyInfo() {
-      this.studyLoading = true;
+      this.studyLoading = true
       getSubjectVisitUploadedStudyList(this.subjectVisitId)
         .then((res) => {
           // this.studyList = res.Result
-          this.relationInfo = res.OtherInfo;
+          this.relationInfo = res.OtherInfo
           this.trialBodyPartTypes = this.relationInfo.BodyPartTypes
-            ? this.relationInfo.BodyPartTypes.split("|")
-            : [];
+            ? this.relationInfo.BodyPartTypes.split('|')
+            : []
           this.trialModalitys = this.relationInfo.Modalitys
-            ? this.relationInfo.Modalitys.split("|")
-            : [];
-          this.studyLoading = false;
-          this.studyList = res.Result;
+            ? this.relationInfo.Modalitys.split('|')
+            : []
+          this.studyLoading = false
+          this.studyList = res.Result
         })
         .catch(() => {
-          this.studyLoading = false;
-        });
+          this.studyLoading = false
+        })
     },
     // 弹框提示pet-ct临床数据未上传
     petDataTip(isPacs = false) {
       if (this.confirmFlag || isPacs) {
-        this.confirmFlag = false;
+        this.confirmFlag = false
         this.$confirm(
-          this.$t("trials:crc-upload:confirm:message"),
-          this.$t("trials:uploadDicomList:label:prompt"),
+          this.$t('trials:crc-upload:confirm:message'),
+          this.$t('trials:uploadDicomList:label:prompt'),
           {
-            confirmButtonText: this.$t("trials:reviewTrack:impactList:save"),
+            confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
             // cancelButtonText: this.$t("common:button:cancel"),
-            type: "warning",
+            type: 'warning',
             showCancelButton: false,
           }
         )
           .then(() => {
-            this.confirmFlag = false;
+            this.confirmFlag = false
           })
           .catch(() => {
-            this.confirmFlag = false;
-          });
+            this.confirmFlag = false
+          })
       }
     },
     // 预览单个检查影像
     handleViewStudy(row) {
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
-      });
-      window.open(routeData.href, "_blank");
+      })
+      window.open(routeData.href, '_blank')
     },
     // 打开上传pet临床数据弹框
     handleUploadPetData(row) {
-      this.studyData = row;
-      this.studyData.SubjectId = this.subjectId;
-      this.petVisible = true;
+      this.studyData = row
+      this.studyData.SubjectId = this.subjectId
+      this.petVisible = true
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var token = getToken();
-      if (this.$route.path === "/trials/trials-panel/visit/crc-question") {
+      var token = getToken()
+      if (this.$route.path === '/trials/trials-panel/visit/crc-question') {
         var routeData = this.$router.resolve({
           path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.SubjectVisitId}&isFromCRCUpload=1&TokenKey=${token}`,
-        });
+        })
       } else {
         var routeData = this.$router.resolve({
           path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isFromCRCUpload=1&TokenKey=${token}`,
-        });
+        })
       }
-      window.open(routeData.href, "_blank");
+      window.open(routeData.href, '_blank')
     },
     // 扫描待上传文件
     beginScanFiles(e) {
-      var files = e.target.files;
+      var files = e.target.files
       if (files.length > 0) {
-        var checkFiles = [...files];
-        var scope = this;
-        scope.scanState = "";
-        scope.isScan = false;
+        var checkFiles = [...files]
+        let max = checkFiles.some((item) => item.size > 20 * 1024 * 1024 * 1024)
+        if (max)
+          return this.$message.warning(
+            this.$t('trials:uploadDicomList:message:maxFileSize')
+          )
+        var scope = this
+        scope.scanState = ''
+        scope.isScan = false
         var p = new Promise(function (resolve) {
-          resolve();
-        });
-        var validFilesCount = 0;
+          resolve()
+        })
+        var validFilesCount = 0
         for (var i = 0; i < files.length; ++i) {
-          (function (index) {
+          ;(function (index) {
             p = p.then(function () {
-              if (files[index].name.toUpperCase().indexOf("DICOMDIR") === -1) {
-                validFilesCount = validFilesCount + 1;
-                return scope.parseDicomFile(files[index]);
+              if (files[index].name.toUpperCase().indexOf('DICOMDIR') === -1) {
+                validFilesCount = validFilesCount + 1
+                return scope.parseDicomFile(files[index])
               }
-            });
-          })(i);
+            })
+          })(i)
         }
         p.then(function (result) {
           scope.uploadQueues.forEach((v, i) => {
-            scope.$refs.dicomFilesTable.toggleRowSelection(v, true);
-          });
-          scope.scanState = "finished";
-          scope.isScan = true;
-        });
+            scope.$refs.dicomFilesTable.toggleRowSelection(v, true)
+          })
+          scope.scanState = 'finished'
+          scope.isScan = true
+        })
       }
     },
     // 按序列UUID本地归档
     parseDicomFile(file) {
-      var scope = this;
+      var scope = this
       return new Promise(function (resolve, reject) {
-        if (scope.scanState === "cancelling") {
-          resolve();
-          return;
+        if (scope.scanState === 'cancelling') {
+          resolve()
+          return
         }
-        var reader = new FileReader();
+        var reader = new FileReader()
         reader.onload = function (e) {
           try {
-            var data = dicomParser.parseDicom(new Uint8Array(e.target.result));
-            var instanceUid = data.string("x00080018");
-            if (!instanceUid) return resolve();
-            var modality = data.string("x00080060") || "";
-            var studyUid = data.string("x0020000d");
-            var pixelDataElement = data.elements.x7fe00010;
-            var studyIndex = 0;
+            var data = dicomParser.parseDicom(new Uint8Array(e.target.result))
+            var instanceUid = data.string('x00080018')
+            if (!instanceUid) return resolve()
+            var modality = data.string('x00080060') || ''
+            var studyUid = data.string('x0020000d')
+            if (!studyUid) return resolve()
+            var pixelDataElement = data.elements.x7fe00010
+            var studyIndex = 0
             while (
               studyIndex < scope.uploadQueues.length &&
               scope.uploadQueues[studyIndex].dicomInfo.studyUid !== studyUid &&
-              (pixelDataElement || modality === "SR") &&
-              modality != ""
+              (pixelDataElement || modality === 'SR') &&
+              modality != ''
             ) {
-              ++studyIndex;
+              ++studyIndex
             }
             if (studyIndex >= scope.uploadQueues.length) {
-              var date = data.string("x00080020");
-              var time = data.string("x00080030");
-              var studyTime = "";
+              var date = data.string('x00080020')
+              var time = data.string('x00080030')
+              var studyTime = ''
               if (date) {
                 date = `${date.substring(0, 4)}-${date.substring(
                   4,
                   6
-                )}-${date.substring(6, 8)}`;
+                )}-${date.substring(6, 8)}`
               }
               if (time) {
                 time = `${time.substring(0, 2)}:${time.substring(
                   2,
                   4
-                )}:${time.substring(4, 6)}`;
+                )}:${time.substring(4, 6)}`
               }
               if (date) {
-                studyTime = time ? `${date} ${time}` : `${date} 00:00:00`;
+                studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
-              const patientNameElement = data.elements.x00100010;
+              const patientNameElement = data.elements.x00100010
               const patientNameBytes = new Uint8Array(
                 data.byteArray.buffer,
                 patientNameElement ? patientNameElement.dataOffset : 0,
                 patientNameElement ? patientNameElement.length : 0
-              );
+              )
               const patientNameStr = convertBytes(
-                data.string("x00080005"),
+                data.string('x00080005'),
                 patientNameBytes
-              );
+              )
               scope.uploadQueues.push({
                 studyIndex: studyIndex,
                 seriesList: [],
                 fileList: [],
                 dicomInfo: {
-                  studyId: data.string("x00200010"),
+                  studyId: data.string('x00200010'),
                   studyUid: studyUid,
-                  patientId: data.string("x00100020"),
+                  patientId: data.string('x00100020'),
                   patientName: patientNameStr,
-                  patientAge: data.string("x00101010")
-                    ? data.string("x00101010")
-                    : "",
-                  patientSex: data.string("x00100040")
-                    ? data.string("x00100040")
-                    : "",
-                  patientBirthDate: data.string("x00100030"),
-                  hospitalName: data.string("x00080080"),
-                  accNumber: data.string("x00080050"),
-                  bodyPart: data.string("x00180015") || "",
+                  patientAge: data.string('x00101010')
+                    ? data.string('x00101010')
+                    : '',
+                  patientSex: data.string('x00100040')
+                    ? data.string('x00100040')
+                    : '',
+                  patientBirthDate: data.string('x00100030'),
+                  hospitalName: data.string('x00080080'),
+                  accNumber: data.string('x00080050'),
+                  bodyPart: data.string('x00180015') || '',
                   modality: [],
-                  institutionName: data.string("x00080080"),
-                  description: data.string("x00081030"),
+                  institutionName: data.string('x00080080'),
+                  description: data.string('x00081030'),
                   //0008,0032
-                  acquisitionTime: data.string("x00080032"),
-                  acquisitionNumber: data.string("x00200012"),
-                  triggerTime: data.string("x00181060"),
+                  acquisitionTime: data.string('x00080032'),
+                  acquisitionNumber: data.string('x00200012'),
+                  triggerTime: data.string('x00181060'),
                   studyTime: studyTime,
                   VisitInfo: {},
                   SubjectInfo: {},
                   failedFileCount: 0,
+                  uploadFileSize: 0,
                   fileSize: 0,
                   fileCount: 0,
                   isInit: false,
@@ -1144,170 +1177,170 @@ export default {
 
                 uploadState: {
                   selected: false,
-                  stateCode: "",
+                  stateCode: '',
                   beginUploadTime: {},
                   progressValue: 0,
                 },
-              });
+              })
             }
-            var modality = scope.uploadQueues[studyIndex].dicomInfo.modality;
-            var currentModality = data.string("x00080060");
+            var modality = scope.uploadQueues[studyIndex].dicomInfo.modality
+            var currentModality = data.string('x00080060')
             if (!(modality.indexOf(currentModality) > -1)) {
-              modality.push(currentModality);
+              modality.push(currentModality)
             }
-            var fileList = scope.uploadQueues[studyIndex].fileList;
-            var instanceUid = data.string("x00080018");
-            var instanceIndex = 0;
+            var fileList = scope.uploadQueues[studyIndex].fileList
+            var instanceUid = data.string('x00080018')
+            var instanceIndex = 0
             while (
               instanceIndex < fileList.length &&
               fileList[instanceIndex].instanceUid !== instanceUid &&
-              (pixelDataElement || modality === "SR")
+              (pixelDataElement || modality === 'SR')
             ) {
-              ++instanceIndex;
+              ++instanceIndex
             }
             if (instanceIndex >= fileList.length) {
               fileList.push({
                 instanceUid: instanceUid,
                 file: file,
-              });
+              })
             }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount =
-              fileList.length;
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
             scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
               (prev, next) => {
-                return prev + next.file.size;
+                return prev + next.file.size
               },
               0
-            );
+            )
 
-            var seriesUid = data.string("x0020000e");
-            var seriesList = scope.uploadQueues[studyIndex].seriesList;
+            var seriesUid = data.string('x0020000e')
+            var seriesList = scope.uploadQueues[studyIndex].seriesList
             var seriesItem = seriesList.find(function (item) {
-              return item.seriesUid === seriesUid;
-            });
-            if (!seriesItem && (pixelDataElement || modality === "SR")) {
-              var date = data.string("x00080021");
-              var time = data.string("x00080031");
-              var seriesTime = "";
+              return item.seriesUid === seriesUid
+            })
+            if (!seriesItem && (pixelDataElement || modality === 'SR')) {
+              var date = data.string('x00080021')
+              var time = data.string('x00080031')
+              var seriesTime = ''
               if (date) {
                 date = `${date.substring(0, 4)}-${date.substring(
                   4,
                   6
-                )}-${date.substring(6, 8)}`;
+                )}-${date.substring(6, 8)}`
               }
               if (time) {
                 time = `${time.substring(0, 2)}:${time.substring(
                   2,
                   4
-                )}:${time.substring(4, 6)}`;
+                )}:${time.substring(4, 6)}`
               }
               if (date) {
-                seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`;
+                seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
-              const seriesDescriptionElement = data.elements.x0008103e;
+              const seriesDescriptionElement = data.elements.x0008103e
               const seriesDescriptionBytes = new Uint8Array(
                 data.byteArray.buffer,
                 seriesDescriptionElement
                   ? seriesDescriptionElement.dataOffset
                   : 0,
                 seriesDescriptionElement ? seriesDescriptionElement.length : 0
-              );
+              )
               const seriesDescriptionStr = convertBytes(
-                data.string("x00080005"),
+                data.string('x00080005'),
                 seriesDescriptionBytes
-              );
+              )
               seriesItem = {
                 seriesUid: seriesUid,
-                seriesNumber: data.intString("x00200011") || 1,
-                modality: data.string("x00080060") || "",
+                seriesNumber: data.intString('x00200011') || 1,
+                modality: data.string('x00080060') || '',
                 description: seriesDescriptionStr,
                 seriesTime: seriesTime,
-                sliceThickness: data.string("x00180050") || "",
-                imagePositionPatient: data.string("x00200032") || "",
-                imageOrientationPatient: data.string("x00200037") || "",
-                sequenceName: data.string("x00180024") || "",
-                protocolName: data.string("x00181030") || "",
-                imagerPixelSpacing: data.string("x00181164") || "",
+                sliceThickness: data.string('x00180050') || '',
+                imagePositionPatient: data.string('x00200032') || '',
+                imageOrientationPatient: data.string('x00200037') || '',
+                sequenceName: data.string('x00180024') || '',
+                protocolName: data.string('x00181030') || '',
+                imagerPixelSpacing: data.string('x00181164') || '',
                 instanceList: [],
-              };
-              seriesList.push(seriesItem);
+              }
+              seriesList.push(seriesItem)
             }
-            var instanceList = seriesItem.instanceList;
+            var instanceList = seriesItem.instanceList
             var instanceItem = instanceList.find(function (item) {
-              return item.instanceUid === instanceUid;
-            });
+              return item.instanceUid === instanceUid
+            })
             if (!instanceItem) {
-              var date = data.string("x00080023");
-              var time = data.string("x00080033");
-              var instanceTime = "";
+              var date = data.string('x00080023')
+              var time = data.string('x00080033')
+              var instanceTime = ''
               if (date) {
                 date = `${date.substring(0, 4)}-${date.substring(
                   4,
                   6
-                )}-${date.substring(6, 8)}`;
+                )}-${date.substring(6, 8)}`
               }
               if (time) {
                 time = `${time.substring(0, 2)}:${time.substring(
                   2,
                   4
-                )}:${time.substring(4, 6)}`;
+                )}:${time.substring(4, 6)}`
               }
               if (date) {
-                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`;
+                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               instanceItem = {
                 instanceUid: instanceUid,
-                instanceNumber: data.intString("x00200013") || 1,
-                frameCount: data.intString("x00280008") || 1,
+                instanceNumber: data.intString('x00200013') || 1,
+                frameCount: data.intString('x00280008') || 1,
                 instanceTime: instanceTime,
-                imageRows: data.uint16("x00280010") || 0,
-                imageColumns: data.uint16("x00280011") || 0,
-                sliceLocation: data.intString("x00201041") || 0,
-                sliceThickness: data.string("x00180050") || "",
-                numberOfFrames: data.intString("x00280008") || 0,
-                pixelSpacing: data.string("x00280030") || "",
-                imagerPixelSpacing: data.string("x00181164") || "",
-                frameOfReferenceUID: data.string("x00200052") || "",
-                windowCenter: data.string("x00281050") || "",
-                windowWidth: data.string("x00281051") || "",
-                modality: data.string("x00080060") || "",
+                imageRows: data.uint16('x00280010') || 0,
+                imageColumns: data.uint16('x00280011') || 0,
+                sliceLocation: data.intString('x00201041') || 0,
+                sliceThickness: data.string('x00180050') || '',
+                numberOfFrames: data.intString('x00280008') || 0,
+                pixelSpacing: data.string('x00280030') || '',
+                imagerPixelSpacing: data.string('x00181164') || '',
+                frameOfReferenceUID: data.string('x00200052') || '',
+                windowCenter: data.string('x00281050') || '',
+                windowWidth: data.string('x00281051') || '',
+                modality: data.string('x00080060') || '',
                 file: file,
-              };
-              instanceList.push(instanceItem);
+                FileSize: file.size,
+              }
+              instanceList.push(instanceItem)
             }
-            resolve();
+            resolve()
           } catch (error) {
-            console.log(error);
-            resolve();
+            console.log(error)
+            resolve()
           }
-        };
+        }
         reader.onerror = function (e) {
-          resolve();
-        };
-        reader.readAsArrayBuffer(file);
-      });
+          resolve()
+        }
+        reader.readAsArrayBuffer(file)
+      })
     },
     // 上传之前校验基本信息及检查是否已上传
     beginUploadQueues() {
-      this.scanState = "uploading";
-      this.studyErrorList = [];
+      this.scanState = 'uploading'
+      this.studyErrorList = []
       // console.log(this.uploadQueues, this.selectArr)
-      this.warningArr = [];
+      this.warningArr = []
       for (let i = 0; i < this.selectArr.length; ++i) {
-        const index = this.selectArr[i].studyIndex;
-        this.uploadQueues[index].uploadState.stateCode = "uploading";
-        this.verifyBasicInfos(index);
+        const index = this.selectArr[i].studyIndex
+        this.uploadQueues[index].uploadState.stateCode = 'uploading'
+        this.verifyBasicInfos(index)
       }
       if (this.warningArr.length) {
-        this.warning_cfg.visible = true;
-        this.btnLoading = false;
+        this.warning_cfg.visible = true
+        this.btnLoading = false
       } else {
-        this.verifyStudy();
+        this.verifyStudy()
       }
     },
     // 校验影像中检查时间、性别是否与受试者匹配
     verifyBasicInfos(index) {
-      var warnings = [];
+      var warnings = []
       if (
         this.uploadQueues[index].dicomInfo.patientSex &&
         this.form.SubjectSex
@@ -1317,8 +1350,8 @@ export default {
           this.form.SubjectSex.substr(0, 1)
         ) {
           warnings.push(
-            this.$t("trials:uploadDicomList:message:genderConsistent")
-          );
+            this.$t('trials:uploadDicomList:message:genderConsistent')
+          )
         }
       }
       if (warnings.length > 0) {
@@ -1326,46 +1359,47 @@ export default {
           index: this.uploadQueues[index].studyIndex + 1,
           accNumber: this.uploadQueues[index].dicomInfo.accNumber,
           warnings: warnings,
-        });
+        })
       }
     },
     // 校验该检查是否上传过
     verifyStudy() {
-      this.btnLoading = true;
-      var studyList = [];
+      this.btnLoading = true
+      var studyList = []
       this.selectArr.forEach((item) => {
+        item.dicomInfo.uploadFileSize = 0
         if (!item.uploadState.selected) {
           studyList.push({
             studyInstanceUid: item.dicomInfo.studyUid,
             studyDate: item.dicomInfo.studyTime,
-          });
+          })
         }
-      });
+      })
       var param = {
         trialId: this.trialId,
         subjectId: this.subjectId,
         subjectVisitId: this.subjectVisitId,
         visitNum: this.form.VisitNum,
         studyInstanceUidList: studyList,
-      };
+      }
       batchVerifyStudyAllowUpload(param)
         .then(async (res) => {
-          var messageArr = [];
+          var messageArr = []
           res.Result.forEach((item) => {
             const i = this.uploadQueues.findIndex(
               (value) => value.dicomInfo.studyUid === item.StudyInstanceUid
-            );
-            let instanceUidList = [];
+            )
+            let instanceUidList = []
             item.UploadedSeriesList.forEach((v) => {
               v.SOPInstanceUIDList.forEach((v1) => {
-                instanceUidList.push(v1);
-              });
-            });
+                instanceUidList.push(v1)
+              })
+            })
             // isReUploadinstanceUidList1.includes(instanceUidList2)
             try {
               this.uploadQueues[i].seriesList.forEach((v) => {
                 let o = item.UploadedSeriesList.find((v1) => {
-                  return v.seriesUid === v1.SeriesId;
+                  return v.seriesUid === v1.SeriesId
                   // v.instanceList.forEach(v2 => {
                   //   let o2 = v1.SOPInstanceUIDList.find(v3 => {
                   //     return v3 === v2.instanceUid
@@ -1374,171 +1408,171 @@ export default {
                   //     v2.isReUpload = true
                   //   }
                   // })
-                });
+                })
                 if (!!o) {
-                  v.isReUpload = true;
+                  v.isReUpload = true
                 }
-              });
+              })
               this.uploadQueues[i].seriesList.forEach((v) => {
                 v.instanceList.forEach((v2) => {
                   let o2 = instanceUidList.find((v3) => {
-                    return v3 === v2.instanceUid;
-                  });
+                    return v3 === v2.instanceUid
+                  })
                   if (!!o2) {
-                    v2.isReUpload = true;
+                    v2.isReUpload = true
                   }
-                });
-              });
+                })
+              })
             } catch (e) {
-              console.log(e);
+              console.log(e)
             }
             // 不能上传或不能重传时，收集校验结果提示,并取消勾选,设置上传状态
             if (item.ErrorMesseage) {
               this.uploadQueues[i].uploadState.AllowReUpload =
-                item.AllowReUpload;
+                item.AllowReUpload
               this.$refs.dicomFilesTable.toggleRowSelection(
                 this.uploadQueues[i]
-              );
-              this.uploadQueues[i].uploadState.selected = true;
-              const msg = `${item.ErrorMesseage}`;
-              messageArr.push(msg);
+              )
+              this.uploadQueues[i].uploadState.selected = true
+              const msg = `${item.ErrorMesseage}`
+              messageArr.push(msg)
             }
 
             // 可以重传时，记录需要被覆盖的检查ID
             if (item.AllowReUpload) {
               this.uploadQueues[i].AbandonStudyId = item.StudyInfo
                 ? item.StudyInfo.Id
-                : "";
+                : ''
             }
-            this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload;
-          });
+            this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
+          })
 
           if (messageArr.length > 0) {
             var li = messageArr.map((msg) => {
-              return `<li>${msg}</li>`;
-            });
+              return `<li>${msg}</li>`
+            })
             const content = `
                         <div>
                         <ol>
-                        ${li.join("")}
+                        ${li.join('')}
                         </ol>
-                        </div>`;
+                        </div>`
             this.$alert(
               content,
-              this.$t("trials:uploadDicomList:label:prompt"),
+              this.$t('trials:uploadDicomList:label:prompt'),
               {
                 confirmButtonText: this.$t(
-                  "trials:uploadDicomList:label:confirm"
+                  'trials:uploadDicomList:label:confirm'
                 ),
                 dangerouslyUseHTMLString: true,
                 callback: (action) => {},
               }
-            );
-            this.btnLoading = false;
+            )
+            this.btnLoading = false
           }
-          var results = [];
-          this.uploadCount = this.selectArr.length;
-          this.uploadedCount = 0;
+          var results = []
+          this.uploadCount = this.selectArr.length
+          this.uploadedCount = 0
           for (let i = 0; i < this.selectArr.length; i++) {
-            const index = this.selectArr[i].studyIndex;
+            const index = this.selectArr[i].studyIndex
             if (!this.uploadQueues[index].uploadState.selected) {
-              await this.archiveStudy(index, res.OtherInfo);
+              await this.archiveStudy(index, res.OtherInfo)
             }
           }
-          this.$set(this, "uploadQueues", [
+          this.$set(this, 'uploadQueues', [
             ...this.uploadQueues.filter((v) => {
               return (
                 !v.uploadState.record ||
                 (v.uploadState.record && !!v.uploadState.record.Failed.length)
-              );
+              )
             }),
-          ]);
+          ])
           this.$nextTick(() => {
-            this.selectArr = [];
+            this.selectArr = []
             this.uploadQueues.forEach((v, i) => {
               if (v.uploadState.record) {
-                v.uploadState.selected = false;
-                this.$refs.dicomFilesTable.toggleRowSelection(v, true);
+                v.uploadState.selected = false
+                this.$refs.dicomFilesTable.toggleRowSelection(v, true)
               }
-              v.studyIndex = i;
-            });
-            this.$refs.pathClear.value = "";
-            this.btnLoading = false;
+              v.studyIndex = i
+            })
+            this.$refs.pathClear.value = ''
+            this.btnLoading = false
             // console.log(11111);
             if (this.studyErrorList.length > 0) {
               let msg = this.$t(
-                "trials:uploadDicomFiles2:message:studyErrorList"
-              );
-              msg = msg.replaceAll("xxx", this.studyErrorList.join("、"));
-              this.$confirm(msg, this.$t("trials:hotkeys:message:tip"), {
+                'trials:uploadDicomFiles2:message:studyErrorList'
+              )
+              msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
+              this.$confirm(msg, this.$t('trials:hotkeys:message:tip'), {
                 confirmButtonText: this.$t(
-                  "trials:uploadDicomFiles2:button:reupload"
+                  'trials:uploadDicomFiles2:button:reupload'
                 ),
               }).then(() => {
-                this.beginUploadQueues();
-              });
+                this.beginUploadQueues()
+              })
             }
             if (this.confirmFlag) {
-              this.petDataTip();
+              this.petDataTip()
             }
-          });
+          })
         })
         .catch((_) => {
-          this.btnLoading = false;
-        });
+          this.btnLoading = false
+        })
     },
     objectToQuery() {
-      let obj = arguments[0];
-      let prefix = arguments[1];
-      if (typeof obj !== "object") return "";
-      const attrs = Object.keys(obj);
+      let obj = arguments[0]
+      let prefix = arguments[1]
+      if (typeof obj !== 'object') return ''
+      const attrs = Object.keys(obj)
       return attrs.reduce((query, attr, index) => {
         // 判断是否是第一层第一个循环
-        if (index === 0 && !prefix) query += "?";
-        if (typeof obj[attr] === "object") {
-          const subPrefix = prefix ? `${prefix}[${attr}]` : attr;
-          query += this.objectToQuery(obj[attr], subPrefix);
+        if (index === 0 && !prefix) query += '?'
+        if (typeof obj[attr] === 'object') {
+          const subPrefix = prefix ? `${prefix}[${attr}]` : attr
+          query += this.objectToQuery(obj[attr], subPrefix)
         } else {
           if (prefix) {
-            query += `${prefix}[${attr}]=${obj[attr]}`;
+            query += `${prefix}[${attr}]=${obj[attr]}`
           } else {
-            query += `${attr}=${obj[attr]}`;
+            query += `${attr}=${obj[attr]}`
           }
         }
         // 判断是否是第一层最后一个循环
-        if (index !== attrs.length - 1) query += "&";
-        return query;
-      }, "");
+        if (index !== attrs.length - 1) query += '&'
+        return query
+      }, '')
     },
     canvasToBlob(canvas) {
       return new Promise((resolve) => {
         canvas.toBlob((blob) => {
-          resolve(blob);
-        });
-      });
+          resolve(blob)
+        })
+      })
     },
     dicomToPng(imageId, width, height) {
       return new Promise((resolve) => {
         cornerstone.loadImage(imageId).then(async (image) => {
-          let canvas = document.createElement("canvas");
-          canvas.width = width;
-          canvas.height = height;
+          let canvas = document.createElement('canvas')
+          canvas.width = width
+          canvas.height = height
           if (image) {
-            cornerstone.renderToCanvas(canvas, image);
+            cornerstone.renderToCanvas(canvas, image)
             // 将 Canvas 图像对象转换为 PNG 格式
-            let blob = await this.canvasToBlob(canvas);
-            resolve(blob);
+            let blob = await this.canvasToBlob(canvas)
+            resolve(blob)
           } else {
-            resolve();
+            resolve()
           }
-        });
+        })
       }).catch((reason) => {
-        reason();
-      });
+        reason()
+      })
     },
     // 上传影像并归档
     archiveStudy(index, config) {
-      var scope = this;
+      var scope = this
       return new Promise(function (resolve, reject) {
         try {
           preArchiveDicomStudy({
@@ -1553,31 +1587,31 @@ export default {
               scope.uploadQueues[index].uploadState.AllowReUpload,
           })
             .then(async (res) => {
-              scope.uploadQueues[index].dicomInfo.failedFileCount = 0;
-              scope.$set(scope.uploadQueues[index].dicomInfo, "isInit", true);
-              let dicomInfo = scope.uploadQueues[index].dicomInfo;
-              let seriesNum = scope.uploadQueues[index].seriesList.length;
-              let fileNum = scope.uploadQueues[index].fileList.length;
-              let seriesList = scope.uploadQueues[index].seriesList;
-              let fileList = scope.uploadQueues[index].fileList;
-              dicomInfo.seriesNum = seriesNum;
-              dicomInfo.fileNum = fileNum;
-              dicomInfo.trialSiteId = scope.data.TrialSiteId;
-              dicomInfo.subjectId = scope.data.SubjectId;
-              dicomInfo.subjectVisitId = scope.subjectVisitId;
+              scope.uploadQueues[index].dicomInfo.failedFileCount = 0
+              scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
+              let dicomInfo = scope.uploadQueues[index].dicomInfo
+              let seriesNum = scope.uploadQueues[index].seriesList.length
+              let fileNum = scope.uploadQueues[index].fileList.length
+              let seriesList = scope.uploadQueues[index].seriesList
+              let fileList = scope.uploadQueues[index].fileList
+              dicomInfo.seriesNum = seriesNum
+              dicomInfo.fileNum = fileNum
+              dicomInfo.trialSiteId = scope.data.TrialSiteId
+              dicomInfo.subjectId = scope.data.SubjectId
+              dicomInfo.subjectVisitId = scope.subjectVisitId
               let t = setInterval(() => {
                 dicomUploadInProgress({
                   trialId: scope.trialId,
                   studyInstanceUid: dicomInfo.studyUid,
-                }).then((res) => {});
-              }, 5000);
-              scope.myInterval.push(t);
+                }).then((res) => {})
+              }, 5000)
+              scope.myInterval.push(t)
               let Record = {
                 Failed: [],
                 Existed: [],
                 Uploaded: [],
                 FileCount: 0,
-              };
+              }
               let params = {
                 trialId: scope.trialId,
                 trialSiteId: scope.data.TrialSiteId,
@@ -1595,34 +1629,35 @@ export default {
                   instanceCount: dicomInfo.fileNum,
                   institutionName: dicomInfo.institutionName,
                   patientId: config.DicomStoreInfo.SubjectCode,
-                  patientName: "",
-                  patientAge: "",
+                  patientName: '',
+                  patientAge: '',
                   patientSex: config.DicomStoreInfo.SubjectSex,
                   accessionNumber: dicomInfo.accNumber,
-                  patientBirthDate: "",
+                  patientBirthDate: '',
                   acquisitionTime: dicomInfo.acquisitionTime,
                   acquisitionNumber: dicomInfo.acquisitionNumber,
                   triggerTime: dicomInfo.triggerTime,
-                  bodyPartExamined: "",
+                  bodyPartExamined: '',
                   seriesList: [],
                 },
-              };
-              let arr = [];
+              }
+              let arr = []
               for (let i = 0; i < seriesList.length; i++) {
-                let v = seriesList[i];
-                let instanceList = [];
-                let ImageResizePath;
+                let v = seriesList[i]
+                let instanceList = []
+                let ImageResizePath
                 for (let ii = 0; ii < v.instanceList.length; ii++) {
                   arr.push(
                     (function () {
                       return new Promise(async (resolve1) => {
                         try {
-                          let o = v.instanceList[ii];
-                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`;
+                          let o = v.instanceList[ii]
+                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
                           if (o.isReUpload) {
-                            dicomInfo.failedFileCount++;
-                            Record.Existed.push(name);
-                            Record.FileCount++;
+                            dicomInfo.failedFileCount++
+                            dicomInfo.uploadFileSize += o.file.size
+                            Record.Existed.push(name)
+                            Record.FileCount++
                           } else if (o.myPath) {
                             instanceList.push({
                               studyInstanceUid: dicomInfo.studyUid,
@@ -1641,49 +1676,67 @@ export default {
                               windowCenter: o.windowCenter,
                               windowWidth: o.windowWidth,
                               path: o.myPath,
-                            });
-                            Record.Uploaded.push(name);
-                            dicomInfo.failedFileCount++;
-                            Record.FileCount++;
+                              FileSize: o.FileSize,
+                            })
+                            Record.Uploaded.push(name)
+                            dicomInfo.failedFileCount++
+                            Record.FileCount++
                           } else {
                             let path = `/${params.trialId}/Image/${
-                              params.trialSiteId
-                            }/${params.subjectId}/${params.subjectVisitId}/${
+                              params.subjectId
+                            }/${params.subjectVisitId}/${
                               dicomInfo.studyUid
                             }/${scope.getGuid(
                               dicomInfo.studyUid +
                                 v.seriesUid +
                                 o.instanceUid +
                                 params.trialId
-                            )}`;
-                            let res = await dcmUpload(path, o.file, config);
+                            )}`
+                            if (scope.isClose) return
+                            let res = await dcmUpload(
+                              {
+                                path: path,
+                                file: o.file,
+                                speed: true,
+                              },
+                              config,
+                              (percentage, checkpoint, lastPer) => {
+                                dicomInfo.uploadFileSize +=
+                                  checkpoint.size * (percentage - lastPer)
+                                if (
+                                  dicomInfo.uploadFileSize > dicomInfo.fileSize
+                                ) {
+                                  dicomInfo.uploadFileSize = dicomInfo.fileSize
+                                }
+                              }
+                            )
                             if (!res || !res.url) {
-                              params.failedFileCount++;
+                              params.failedFileCount++
                             } else {
-                              if (ii === 0 && o.modality !== "SR") {
+                              if (ii === 0 && o.modality !== 'SR') {
                                 try {
                                   let fileId =
                                     cornerstoneWADOImageLoader.wadouri.fileManager.add(
                                       o.file
-                                    );
+                                    )
                                   let blob = await scope.dicomToPng(
                                     fileId,
                                     o.imageColumns,
                                     o.imageRows
-                                  );
-                                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
-                                  let OSSclient = scope.OSSclient;
+                                  )
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                                  let OSSclient = scope.OSSclient
                                   let seriesRes = await OSSclient.put(
                                     thumbnailPath,
                                     blob
-                                  );
+                                  )
                                   if (seriesRes && seriesRes.url) {
                                     ImageResizePath = scope.$getObjectName(
                                       seriesRes.url
-                                    );
+                                    )
                                   }
                                 } catch (e) {
-                                  console.log(e);
+                                  console.log(e)
                                 }
                               }
                             }
@@ -1705,27 +1758,31 @@ export default {
                                 windowCenter: o.windowCenter,
                                 windowWidth: o.windowWidth,
                                 path: scope.$getObjectName(res.url),
-                              });
-                              o.myPath = scope.$getObjectName(res.url);
-                              Record.Uploaded.push(name);
-                              dicomInfo.failedFileCount++;
-                              Record.FileCount++;
+                                FileSize: o.FileSize,
+                              })
+                              o.myPath = scope.$getObjectName(res.url)
+                              Record.Uploaded.push(name)
+                              dicomInfo.failedFileCount++
+                              Record.FileCount++
                             } else {
-                              Record.Failed.push(name);
-                              Record.FileCount++;
+                              Record.Failed.push(name)
+                              Record.FileCount++
                             }
                           }
-                          resolve1();
+                          resolve1()
                         } catch (e) {
-                          console.log(e);
-                          resolve1();
+                          console.log(e)
+                          resolve1()
                         }
-                      });
+                      })
                     })()
-                  );
-                  if (arr.length >= 66 || ii === v.instanceList.length - 1) {
-                    await Promise.all(arr);
-                    arr = [];
+                  )
+                  if (
+                    (arr.length >= 10 || ii === v.instanceList.length - 1) &&
+                    !scope.isClose
+                  ) {
+                    await Promise.all(arr)
+                    arr = []
                   }
                 }
                 params.study.seriesList.push({
@@ -1748,92 +1805,94 @@ export default {
                   bodyPartExamined: dicomInfo.bodyPart,
                   instanceList: instanceList,
                   ImageResizePath: ImageResizePath,
-                });
+                })
               }
-              let text = JSON.stringify(Record);
-              let logJsonBlob = scope.generateTxtFile(text);
-              let logJsonObjectName = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`;
-              let logRes;
+              let text = JSON.stringify(Record)
+              let logJsonBlob = scope.generateTxtFile(text)
+              let logJsonObjectName = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              let logRes
               try {
                 logRes = await scope.OSSclient.put(
                   logJsonObjectName,
                   logJsonBlob
-                );
+                )
               } catch (e) {
-                scope.uploadQueues[index].uploadState.record = Record;
-                scope.studyErrorList.push(dicomInfo.accNumber);
-                clearInterval(t);
-                resolve();
+                scope.uploadQueues[index].uploadState.record = Record
+                scope.studyErrorList.push(dicomInfo.accNumber)
+                clearInterval(t)
+                resolve()
               }
               for (let i = 0; i < seriesList.length; i++) {
-                let v = seriesList[i];
+                let v = seriesList[i]
                 let o = params.study.seriesList.find((o) => {
-                  return o.seriesInstanceUid === v.seriesUid;
-                });
+                  return o.seriesInstanceUid === v.seriesUid
+                })
                 if (o && !o.ImageResizePath) {
                   let fileId =
                     cornerstoneWADOImageLoader.wadouri.fileManager.add(
                       v.instanceList[0].file
-                    );
+                    )
                   let blob = await scope.dicomToPng(
                     fileId,
                     v.instanceList[0].imageColumns,
                     v.instanceList[0].imageRows
-                  );
-                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
-                  let OSSclient = scope.OSSclient;
+                  )
+                  let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
+                  let OSSclient = scope.OSSclient
                   try {
-                    let seriesRes = await OSSclient.put(thumbnailPath, blob);
+                    let seriesRes = await OSSclient.put(thumbnailPath, blob)
                     if (seriesRes && seriesRes.url) {
-                      o.ImageResizePath = scope.$getObjectName(seriesRes.url);
+                      o.ImageResizePath = scope.$getObjectName(seriesRes.url)
                     }
                   } catch (e) {
-                    console.log(e);
+                    console.log(e)
                   }
                 }
               }
               if (logRes && logRes.url) {
-                params.study.instanceCount = dicomInfo.failedFileCount;
-                params.RecordPath = scope.$getObjectName(logRes.url);
+                params.study.instanceCount = dicomInfo.failedFileCount
+                params.RecordPath = scope.$getObjectName(logRes.url)
+                if (scope.isClose) return false
+                console.log(params)
                 addOrUpdateArchiveStudy(params)
                   .then((res) => {
                     if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
                       scope.$message.success(
-                        scope.$t("trials:uploadDicomList:label:uploaded")
-                      );
+                        scope.$t('trials:uploadDicomList:label:uploaded')
+                      )
                     } else {
-                      scope.studyErrorList.push(dicomInfo.accNumber);
+                      scope.studyErrorList.push(dicomInfo.accNumber)
                     }
-                    scope.uploadQueues[index].uploadState.record = Record;
+                    scope.uploadQueues[index].uploadState.record = Record
                     let flag =
-                      res.Result === "PET-CT" ||
-                      res.Result === "CT、PT" ||
-                      res.Result === "PT、CT";
+                      res.Result === 'PET-CT' ||
+                      res.Result === 'CT、PT' ||
+                      res.Result === 'PT、CT'
                     // let flag = params.study.seriesList.some(item=>item.modality==='PT');
                     if (flag && scope.relationInfo.IsHaveStudyClinicalData) {
-                      scope.confirmFlag = true;
+                      scope.confirmFlag = true
                     }
-                    scope.getStudyInfo();
+                    scope.getStudyInfo()
                     if (
                       scope.$route.path !==
-                      "/trials/trials-panel/visit/crc-question"
+                      '/trials/trials-panel/visit/crc-question'
                     ) {
-                      scope.$emit("getList");
+                      scope.$emit('getList')
                     }
-                    clearInterval(t);
-                    resolve();
+                    clearInterval(t)
+                    resolve()
                   })
                   .catch((res) => {
-                    scope.uploadQueues[index].uploadState.record = Record;
-                    scope.studyErrorList.push(dicomInfo.accNumber);
-                    clearInterval(t);
-                    resolve();
-                  });
+                    scope.uploadQueues[index].uploadState.record = Record
+                    scope.studyErrorList.push(dicomInfo.accNumber)
+                    clearInterval(t)
+                    resolve()
+                  })
               } else {
-                scope.uploadQueues[index].uploadState.record = Record;
-                scope.studyErrorList.push(dicomInfo.accNumber);
-                clearInterval(t);
-                resolve();
+                scope.uploadQueues[index].uploadState.record = Record
+                scope.studyErrorList.push(dicomInfo.accNumber)
+                clearInterval(t)
+                resolve()
               }
             })
             .catch(() => {
@@ -1842,200 +1901,200 @@ export default {
                 Existed: [],
                 Uploaded: [],
                 FileCount: 0,
-              };
-              let fileList = scope.uploadQueues[index].fileList;
+              }
+              let fileList = scope.uploadQueues[index].fileList
               fileList.forEach((v) => {
-                Record.Failed.push(v.webkitRelativePath);
-              });
-              scope.uploadQueues[index].uploadState.record = Record;
-              scope.studyErrorList.push(dicomInfo.accNumber);
-              resolve();
-            });
+                Record.Failed.push(v.webkitRelativePath)
+              })
+              scope.uploadQueues[index].uploadState.record = Record
+              scope.studyErrorList.push(dicomInfo.accNumber)
+              resolve()
+            })
         } catch (e) {
-          console.log(e);
-          resolve();
+          console.log(e)
+          resolve()
         }
-      });
+      })
     },
     generateTxtFile(text) {
-      let blob = new Blob(["\ufeff", text], { type: "text/plain" });
-      return blob;
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
     },
     // warning弹框取消按钮回调
     handleCancelWarnVisible() {
-      this.warning_cfg.visible = false;
+      this.warning_cfg.visible = false
       for (var i = 0; i < this.selectArr.length; ++i) {
-        const index = this.selectArr[i].studyIndex;
-        this.uploadQueues[index].uploadState.stateCode = "";
+        const index = this.selectArr[i].studyIndex
+        this.uploadQueues[index].uploadState.stateCode = ''
       }
     },
     // 忽略warning继续上传
     handleContinueUpload() {
-      this.warning_cfg.visible = false;
-      this.verifyStudy();
+      this.warning_cfg.visible = false
+      this.verifyStudy()
     },
     // 预览影像
     handlePreview(uid) {
-      this.previewVisible = true;
-      this.uid = uid;
+      this.previewVisible = true
+      this.uid = uid
     },
     // 删除影像列表中的某个影像
     handleDelete(index, row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.$refs.uploadForm.reset();
-        this.uploadQueues.splice(index, 1);
+        this.$refs.uploadForm.reset()
+        this.uploadQueues.splice(index, 1)
         this.uploadQueues.forEach((v, i) => {
           if (v.uploadState.record) {
-            v.uploadState.selected = false;
-            this.$refs.dicomFilesTable.toggleRowSelection(v, true);
+            v.uploadState.selected = false
+            this.$refs.dicomFilesTable.toggleRowSelection(v, true)
           }
-          v.studyIndex = i;
-        });
-        this.handleSelectionChange(this.uploadQueues);
-      });
+          v.studyIndex = i
+        })
+        this.handleSelectionChange(this.uploadQueues)
+      })
     },
     // 当选择项发生变化时收集待上传文件数据
     handleSelectionChange(selection) {
       selection.sort((n1, n2) => {
-        return n1.studyIndex - n2.studyIndex;
-      });
-      this.selectArr = selection;
+        return n1.studyIndex - n2.studyIndex
+      })
+      this.selectArr = selection
     },
     // 根据是否上传状态决定CheckBox 是否可以勾选
     handleSelectable(row) {
       if (row.uploadState.selected || this.btnLoading) {
-        return false;
+        return false
       } else {
-        return true;
+        return true
       }
     },
     // 收集已上传文件列表勾选项
     handleUploadedSelectionChange(selection) {
-      this.deleteArr = [];
+      this.deleteArr = []
       selection.forEach((item) => {
-        this.deleteArr.push(item.StudyId);
-      });
+        this.deleteArr.push(item.StudyId)
+      })
     },
     // 批量删除已上传的影像
     handleBatchDelete() {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true;
+          this.studyLoading = true
           deleteStudyList(this.trialId, this.subjectVisitId, this.deleteArr)
             .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo();
+                this.getStudyInfo()
                 if (
-                  this.$route.path !== "/trials/trials-panel/visit/crc-question"
+                  this.$route.path !== '/trials/trials-panel/visit/crc-question'
                 ) {
-                  this.$emit("getList");
+                  this.$emit('getList')
                 }
                 this.$message.success(
-                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-                );
+                  this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+                )
               }
             })
             .catch(() => {
-              this.studyLoading = true;
-            });
+              this.studyLoading = true
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 删除已上传的某个检查
     handleDeleteStudy(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true;
+          this.studyLoading = true
           deleteStudyList(this.trialId, this.subjectVisitId, [row.StudyId])
             .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo();
-                if (this.uploadActiveName === "pacs") {
-                  this.$refs.dicomPacs.getList();
+                this.getStudyInfo()
+                if (this.uploadActiveName === 'pacs') {
+                  this.$refs.dicomPacs.getList()
                 }
                 if (
-                  this.$route.path !== "/trials/trials-panel/visit/crc-question"
+                  this.$route.path !== '/trials/trials-panel/visit/crc-question'
                 ) {
-                  this.$emit("getList");
+                  this.$emit('getList')
                 }
                 this.$message.success(
-                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-                );
+                  this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+                )
               }
             })
             .catch(() => {
-              this.studyLoading = true;
-            });
+              this.studyLoading = true
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // cancel按钮回调
     cancel() {
-      this.scanState = "cancelling";
+      this.scanState = 'cancelling'
       // 关闭上传模态框
-      this.$emit("close");
+      this.$emit('close')
     },
     compare(start, end) {
-      start = new Date(start);
-      start = start.getTime();
-      end = new Date(end);
-      end = end.getTime();
-      var time = 0;
+      start = new Date(start)
+      start = start.getTime()
+      end = new Date(end)
+      end = end.getTime()
+      var time = 0
       if (start > end) {
-        time = start - end;
+        time = start - end
       } else {
-        time = end - start;
+        time = end - start
       }
-      return Math.floor(time / 86400000);
+      return Math.floor(time / 86400000)
     },
     exportFailedFiles(errorFiles) {
-      var elementA = document.createElement("a");
-      var str = "";
+      var elementA = document.createElement('a')
+      var str = ''
       errorFiles.forEach((el) => {
-        str += el + "\n";
-      });
-      elementA.setAttribute("href", "data:text/html;charset=utf-8," + str);
-      elementA.setAttribute("download", +new Date() + ".txt");
-      elementA.style.display = "none";
-      document.body.appendChild(elementA);
-      elementA.click();
-      document.body.removeChild(elementA);
+        str += el + '\n'
+      })
+      elementA.setAttribute('href', 'data:text/html;charset=utf-8,' + str)
+      elementA.setAttribute('download', +new Date() + '.txt')
+      elementA.style.display = 'none'
+      document.body.appendChild(elementA)
+      elementA.click()
+      document.body.removeChild(elementA)
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return "delete-row";
+        return 'delete-row'
       } else {
-        return "";
+        return ''
       }
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return "";
-      var separator = ",";
-      if (bodyPart.indexOf("|") > -1) {
-        separator = "|";
-      } else if (bodyPart.indexOf(",") > -1) {
-        separator = ",";
-      } else if (bodyPart.indexOf("，") > -1) {
-        separator = "，";
+      if (!bodyPart) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
       }
-      var arr = bodyPart.split(separator);
+      var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
-        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart, "Name");
-      });
-      return newArr.join(" | ");
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      return newArr.join(' | ')
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .upload-dicom-files-wrapper {
@@ -2061,7 +2120,7 @@ export default {
     overflow: hidden;
     display: inline-block;
   }
-  #inputForm .file-input input[type="file"] {
+  #inputForm .file-input input[type='file'] {
     position: absolute;
     top: 0;
     left: 0;
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
index 7cfeca94..ee7b8868 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
@@ -75,8 +75,6 @@
     <template slot="main-container">
       <el-table
         v-loading="loading"
-        v-adaptive="{ bottomOffset: 85 }"
-        height="100"
         :data="list"
         class="table"
         @selection-change="handleSelectChange"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index e3fa8561..8ec06152 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -1,8 +1,15 @@
 <template>
   <div v-loading="loading" class="non-dicom-wrapper">
     <!-- <h4 class="box-title">既往放疗史</h4> -->
-    <div style="text-align:right">
-      <el-button v-if="(allowAddOrEdit)" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']" icon="el-icon-plus" type="primary" size="small" @click.native.prevent="handleAdd">
+    <div style="text-align: right">
+      <el-button
+        v-if="allowAddOrEdit"
+        v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
+        icon="el-icon-plus"
+        type="primary"
+        size="small"
+        @click.native.prevent="handleAdd"
+      >
         {{ $t('common:button:new') }}
       </el-button>
       <el-button
@@ -16,10 +23,7 @@
       </el-button>
     </div>
 
-    <el-table
-      :data="nonDicomStudyList"
-      style="width: 100%"
-    >
+    <el-table :data="nonDicomStudyList" style="width: 100%">
       <!-- 检查编号 -->
       <el-table-column
         prop="CodeView"
@@ -36,7 +40,7 @@
         :label="$t('trials:uploadNonDicoms:table:bodyPart')"
       >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPart)}}
+          {{ getBodyPart(scope.row.BodyPart) }}
         </template>
       </el-table-column>
       <!-- 文件 -->
@@ -45,36 +49,97 @@
         :label="$t('trials:uploadNonDicoms:table:files')"
       >
         <template slot-scope="scope">
-          <el-popover v-if="scope.row.FileCount" trigger="click" placement="bottom">
-            <el-table v-loading="filesLoading" :data="nonDicomfilesList" height="300" size="small">
+          <el-popover
+            v-if="scope.row.FileCount"
+            trigger="click"
+            placement="bottom"
+          >
+            <el-table
+              v-loading="filesLoading"
+              :data="nonDicomfilesList"
+              height="300"
+              size="small"
+            >
               <!-- 文件名称 -->
               <el-table-column
                 prop="FileName"
                 :label="$t('trials:uploadNonDicoms:table:fileName')"
                 width="200"
               />
+              <el-table-column
+                prop="FileSize"
+                :label="$t('trials:audit:table:nonDicomsFileSize')"
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <span>{{
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                      : ''
+                  }}</span>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('common:action:action')" width="120">
                 <template slot-scope="files">
-                  <!-- 预览 -->
-                  <el-button
-                    icon="el-icon-view"
-                    circle
-                    :title="$t('trials:uploadNonDicoms:action:preview')"
-                    size="small"
-                    :disabled="files.row.FileType&&files.row.FileType.indexOf('zip') >= 0"
-                    @click.native.prevent="files.row.type === 'MP4' ? handleLookVideo(scope.row) : handlePreviewImg(files.row)"
-                  />
-                  <!-- 删除 -->
-                  <el-button
-                    v-if="allowAddOrEdit"
-                    v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
-                    icon="el-icon-delete"
-                    circle
-                    :title="$t('trials:uploadNonDicoms:action:delete')"
-                    size="small"
-                    @click.native.prevent="files.row.type === 'MP4' ? hadnleDeleteVideo(scope.row) : handleDeleteFile(files.row.Id)"
-                  />
+                  <div style="display: flex">
+                    <!-- 预览 -->
+                    <viewer
+                      v-if="files.row.type !== 'MP4'"
+                      :ref="files.row.FullFilePath"
+                      style="margin: 0 10px"
+                      :images="[
+                        `${OSSclientConfig.basePath}${files.row.FullFilePath}`,
+                      ]"
+                    >
+                      <el-button
+                        icon="el-icon-view"
+                        circle
+                        :title="$t('trials:uploadNonDicoms:action:preview')"
+                        size="small"
+                        :disabled="
+                          files.row.FileType &&
+                          files.row.FileType.indexOf('zip') >= 0
+                        "
+                        @click.native.prevent="handlePreviewImg(files.row)"
+                      >
+                      </el-button>
+                      <img
+                        v-show="false"
+                        crossorigin="anonymous"
+                        :src="`${OSSclientConfig.basePath}${files.row.FullFilePath}`"
+                        alt="Image"
+                      />
+                    </viewer>
 
+                    <el-button
+                      v-if="files.row.type === 'MP4'"
+                      icon="el-icon-view"
+                      circle
+                      :title="$t('trials:uploadNonDicoms:action:preview')"
+                      size="small"
+                      :disabled="
+                        files.row.FileType &&
+                        files.row.FileType.indexOf('zip') >= 0
+                      "
+                      @click.native.prevent="handleLookVideo(scope.row)"
+                    />
+                    <!-- 删除 -->
+                    <el-button
+                      v-if="allowAddOrEdit"
+                      v-hasPermi="[
+                        'trials:trials-panel:visit:crc-upload:delete',
+                      ]"
+                      icon="el-icon-delete"
+                      circle
+                      :title="$t('trials:uploadNonDicoms:action:delete')"
+                      size="small"
+                      @click.native.prevent="
+                        files.row.type === 'MP4'
+                          ? hadnleDeleteVideo(scope.row)
+                          : handleDeleteFile(files.row.Id)
+                      "
+                    />
+                  </div>
                 </template>
               </el-table-column>
             </el-table>
@@ -104,22 +169,19 @@
         prop="UpdateTime"
         :label="$t('trials:uploadNonDicoms:table:updateTime')"
       />
-      <el-table-column
-        :label="$t('common:action:action')"
-        min-width="200"
-      >
+      <el-table-column :label="$t('common:action:action')" min-width="200">
         <template slot-scope="scope">
           <!-- 预览 -->
           <el-button
             icon="el-icon-view"
             circle
             :title="$t('trials:uploadNonDicoms:action:preview')"
-            :disabled="scope.row.FileCount===0"
+            :disabled="scope.row.FileCount === 0"
             @click.native.prevent="handlePreviewAllFiles(scope.row)"
           />
           <!-- 上传 -->
           <el-button
-            v-if="( allowAddOrEdit)"
+            v-if="allowAddOrEdit"
             icon="el-icon-upload2"
             circle
             :title="$t('trials:uploadNonDicoms:action:upload')"
@@ -135,7 +197,7 @@
           /> -->
           <!-- 编辑 -->
           <el-button
-            v-if="(allowAddOrEdit)"
+            v-if="allowAddOrEdit"
             v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             icon="el-icon-edit-outline"
             circle
@@ -164,14 +226,13 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <el-form
-        ref="editForm"
-        :model="form"
-        label-width="100px"
-      >
+      <el-form ref="editForm" :model="form" label-width="100px">
         <div class="base-dialog-body">
           <!-- 检查编号 -->
-          <el-form-item v-if="!!form.CodeView" :label="$t('trials:uploadNonDicoms:table:studyId')">
+          <el-form-item
+            v-if="!!form.CodeView"
+            :label="$t('trials:uploadNonDicoms:table:studyId')"
+          >
             <el-input v-model="form.CodeView" disabled />
           </el-form-item>
           <!-- 检查类型 -->
@@ -179,12 +240,21 @@
             :label="$t('trials:uploadNonDicoms:table:modality')"
             prop="Modality"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
             ]"
           >
             <el-radio-group v-model="form.Modality">
               <template v-for="m in trialModalitys">
-                <el-radio  v-if="m !== ''" :key="m" :label="m" style="line-height: 40px" />
+                <el-radio
+                  v-if="m !== ''"
+                  :key="m"
+                  :label="m"
+                  style="line-height: 40px"
+                />
               </template>
             </el-radio-group>
           </el-form-item>
@@ -193,11 +263,22 @@
             :label="$t('trials:uploadNonDicoms:table:bodyPart')"
             prop="BodyParts"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
             ]"
           >
             <el-checkbox-group v-model="form.BodyParts">
-              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{$fd("Bodypart", bodyPart,'Code',BodyPart,'Name')}}</el-checkbox>
+              <el-checkbox
+                v-for="bodyPart in trialBodyPartTypes"
+                :key="bodyPart"
+                :label="bodyPart"
+                >{{
+                  $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
+                }}</el-checkbox
+              >
             </el-checkbox-group>
           </el-form-item>
           <!-- 检查日期 -->
@@ -205,7 +286,11 @@
             :label="$t('trials:uploadNonDicoms:table:studyDate')"
             prop="ImageDate"
             :rules="[
-              { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
             ]"
           >
             <el-date-picker
@@ -214,16 +299,29 @@
               :picker-options="pickerOption"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
         </div>
-        <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+        <div
+          class="base-dialog-footer"
+          style="text-align: right; margin-top: 10px"
+        >
           <el-form-item>
-            <el-button size="small" type="primary" :disabled="btnLoading" @click="dialogVisible = false">
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="btnLoading"
+              @click="dialogVisible = false"
+            >
               {{ $t('common:button:cancel') }}
             </el-button>
-            <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+            <el-button
+              size="small"
+              type="primary"
+              :loading="btnLoading"
+              @click="handleSave"
+            >
               {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
@@ -244,21 +342,42 @@
     >
       <!-- 多文件上传 -->
       <form id="inputForm" ref="uploadForm">
-        <el-divider content-position="left">{{ $t('trials:uploadNonDicoms:label:fileType') }}</el-divider>
+        <el-divider content-position="left">{{
+          $t('trials:uploadNonDicoms:label:fileType')
+        }}</el-divider>
         <div class="form-group">
           <div class="upload" style="margin-right: 10px">
-            <input multiple="multiple" webkitdirectory="" directory accept="*/*" type="file" name="uploadFolder" class="select-file" title="" @change="beginScanFiles($event)" v-if='!btnLoading'>
+            <input
+              multiple="multiple"
+              webkitdirectory=""
+              directory
+              accept="*/*"
+              type="file"
+              name="uploadFolder"
+              class="select-file"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:selectFolder') }}
             </div>
           </div>
           <div class="upload">
-            <input class="select-file" multiple="" :accept="faccept.join(',')" type="file" name="uploadFile" title="" @change="beginScanFiles($event)" v-if='!btnLoading'>
+            <input
+              class="select-file"
+              multiple=""
+              :accept="faccept.join(',')"
+              type="file"
+              name="uploadFile"
+              title=""
+              @change="beginScanFiles($event)"
+              v-if="!btnLoading"
+            />
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:select') }}
             </div>
           </div>
-
         </div>
       </form>
       <!-- 文件列表 -->
@@ -272,12 +391,9 @@
         <el-table-column
           type="selection"
           width="55"
-          :selectable="(row,index)=>row.status !== 2 && !btnLoading"
-        />
-        <el-table-column
-          type="index"
-          width="50"
+          :selectable="(row, index) => row.status !== 2 && !btnLoading"
         />
+        <el-table-column type="index" width="50" />
         <!-- 文件名称 -->
         <el-table-column
           prop="name"
@@ -289,13 +405,13 @@
           prop="size"
           :label="$t('trials:uploadNonDicoms:table:fileSize')"
         >
-        <template slot-scope="scope">
-          <span>{{
-            scope.row.size && scope.row.size > 0
-              ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
-              : 0
-          }}</span>
-        </template>
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.size && scope.row.size > 0
+                ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                : ''
+            }}</span>
+          </template>
         </el-table-column>
         <!-- 文件类型 -->
         <el-table-column
@@ -308,17 +424,28 @@
           :label="$t('trials:uploadNonDicoms:table:uploadStatus')"
           min-width="100"
         >
-        <template slot-scope="scope">
-          <el-tag
-            :type="
-              ['warning', 'info', 'success', 'danger'][
-                scope.row.status
-              ]
-            "
-            v-if="scope.row.status || scope.row.status === 0"
-            >{{ $fd("NoneDicomUploadStatus", scope.row.status) }}
-          </el-tag>
-        </template>
+          <template slot-scope="scope">
+            <el-tag
+              :type="['warning', 'info', 'success', 'danger'][scope.row.status]"
+              v-if="scope.row.status || scope.row.status === 0"
+              >{{ $fd('NoneDicomUploadStatus', scope.row.status) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          :label="$t('trials:uploadNonDicoms:table:failedFileCount')"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-progress
+              color="#409eff"
+              :percentage="
+                ((scope.row.uploadFileSize * 100) / scope.row.size).toFixed(2) *
+                1
+              "
+            />
+          </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
@@ -333,7 +460,10 @@
           </template>
         </el-table-column>
       </el-table>
-      <div style="text-align:right;padding: 10px 0px">
+      <div style="text-align: right; padding: 10px 0px">
+        <span style="margin-right: 10px">{{
+          $store.state.trials.uploadTip
+        }}</span>
         <el-button
           size="small"
           type="primary"
@@ -370,16 +500,20 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <div style="display: flex;justify-content: center">
-        <video v-if="lookVideoVisible" id="video" controls crossorigin="anonymous" width="400" height="270">
-          <source :src="currentRow.VideoUrl" type="video/mp4">
+      <div style="display: flex; justify-content: center">
+        <video
+          v-if="lookVideoVisible"
+          id="video"
+          controls
+          crossorigin="anonymous"
+          width="400"
+          height="270"
+        >
+          <source :src="currentRow.VideoUrl" type="video/mp4" />
         </video>
       </div>
-      <div style="text-align:right;padding: 10px 0px">
-        <el-button
-          size="small"
-          @click="lookVideoVisible = false"
-        >
+      <div style="text-align: right; padding: 10px 0px">
+        <el-button size="small" @click="lookVideoVisible = false">
           关闭
         </el-button>
       </div>
@@ -391,52 +525,65 @@
       append-to-body
       width="565px"
     >
-      <div v-loading="imageLoading" class="base-modal-body" style="border:2px solid #ccc;padding: 10px;">
+      <div
+        v-loading="imageLoading"
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
         <el-image
           :src="`${OSSclientConfig.basePath}${imgUrl}`"
           crossorigin="anonymous"
           fit="fit"
-          style="height:500px;width:500px"
+          style="height: 500px; width: 500px"
           @error="imageLoading = false"
           @load="imageLoading = false"
+          :preview-src-list="[`${OSSclientConfig.basePath}${imgUrl}`]"
         />
       </div>
-
     </el-dialog>
-
   </div>
 </template>
 <script>
-import { preArchiveStudy, getNoneDicomStudyList, getNoneDicomStudyFileList, uploadNoneDicomFile, addOrUpdateNoneDicomStudy, deleteNoneDicomStudy, deleteNoneDicomStudyFile } from '@/api/trials'
+import {
+  preArchiveStudy,
+  getNoneDicomStudyList,
+  getNoneDicomStudyFileList,
+  uploadNoneDicomFile,
+  addOrUpdateNoneDicomStudy,
+  deleteNoneDicomStudy,
+  deleteNoneDicomStudyFile,
+} from '@/api/trials'
 import { getToken } from '@/utils/auth'
 // import PreviewFiles from './previewFiles'
 // import uploadVideos from '@/components/videos'
 import moment from 'moment'
-import store from "@/store";
+import store from '@/store'
 export default {
   name: 'UploadNonDicomFiles',
   // components: { uploadVideos },
   props: {
     bodyParts: {
       type: String,
-      default: ''
+      default: '',
     },
     modalities: {
       type: String,
-      default: ''
+      default: '',
     },
     data: {
       type: Object,
-      default() { return {} }
+      default() {
+        return {}
+      },
     },
     subjectVisitId: {
       type: String,
-      required: true
+      required: true,
     },
     allowAddOrEdit: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
@@ -448,18 +595,25 @@ export default {
       trialModalitys: [],
       btnLoading: false,
       title: '',
-      form: { CodeView: '', Id: '', BodyPart: '', BodyParts: [], Modality: '', ImageDate: '' },
+      form: {
+        CodeView: '',
+        Id: '',
+        BodyPart: '',
+        BodyParts: [],
+        Modality: '',
+        ImageDate: '',
+      },
       pickerOption: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
       uploadVisible: false,
       fileList: [],
       selectArr: [],
-      successFileList:[],
-      isFail:false,
-      faccept: ['.jpg', '.jpeg', '.png', '.bmp' ,'.zip'],
+      successFileList: [],
+      isFail: false,
+      faccept: ['.jpg', '.jpeg', '.png', '.bmp', '.zip'],
       fCount: 0,
       currentRow: {},
       filesLoading: false,
@@ -471,54 +625,64 @@ export default {
       uploadVideoVisible: false,
       trialId: this.$route.query.trialId,
       moment,
-      BodyPart:{},
-      studyMonitorId: null
-    };
+      BodyPart: {},
+      studyMonitorId: null,
+    }
   },
   async mounted() {
+    console.log(this.data)
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getNoneDicomList()
     this.trialBodyPartTypes = this.bodyParts ? this.bodyParts.split('|') : []
     this.trialModalitys = this.modalities ? this.modalities.split('|') : []
+    this.OSSclient.close()
   },
-   watch: {
+  watch: {
     isFail() {
       if (this.isFail) {
-        this.$confirm(this.$t("trials:visit:crcUpload:nomDicomFiles:failUpload"), {
-          type: "warning",
-          distinguishCancelAndClose: true,
-          confirmButtonText: this.$t("common:button:confirm"),
-          cancelButtonText: this.$t("common:button:cancel"),
-        })
-        .then(() => {
-          this.beginUpload();
-        })
-        .catch((err) => {
-          this.btnLoading = false;
-          console.log(err);
-        });
+        this.$confirm(
+          this.$t('trials:visit:crcUpload:nomDicomFiles:failUpload'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t('common:button:confirm'),
+            cancelButtonText: this.$t('common:button:cancel'),
+          }
+        )
+          .then(() => {
+            this.beginUpload()
+          })
+          .catch((err) => {
+            this.btnLoading = false
+            console.log(err)
+          })
       }
     },
-    btnLoading(){
-      store.dispatch("trials/setUnLock", this.btnLoading);
-    }
+    btnLoading() {
+      store.dispatch('trials/setUnLock', this.btnLoading)
+    },
   },
-  beforeDestroy(){
-    store.dispatch("trials/setUnLock", false);
+  beforeDestroy() {
+    store.dispatch('trials/setUnLock', false)
+    this.OSSclient.close()
   },
   methods: {
     // 初始化非Dicom列表数据
     getNoneDicomList() {
       this.loading = true
-      getNoneDicomStudyList(this.subjectVisitId).then(res => {
-        this.nonDicomStudyList = res.Result.map(v => {
-          if (v.VideoObjectName) {
-            v.FileCount += 1
-          }
-          return v
+      getNoneDicomStudyList(this.subjectVisitId)
+        .then((res) => {
+          this.nonDicomStudyList = res.Result.map((v) => {
+            if (v.VideoObjectName) {
+              v.FileCount += 1
+            }
+            return v
+          })
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
         })
-        this.loading = false
-      }).catch(() => { this.loading = false })
     },
     // 打开新增弹框，并初始化数据
     handleAdd() {
@@ -545,7 +709,7 @@ export default {
     },
     // 保存非Dicom检查信息
     handleSave() {
-      this.$refs.editForm.validate(valid => {
+      this.$refs.editForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         this.form.BodyPart = this.form.BodyParts.join(', ')
@@ -553,18 +717,20 @@ export default {
         this.form.TrialSiteId = this.data.TrialSiteId
         this.form.SubjectId = this.data.SubjectId
         this.form.SubjectVisitId = this.subjectVisitId
-        addOrUpdateNoneDicomStudy(this.form).then(res => {
-          this.btnLoading = false
-          this.$refs.editForm.resetFields()
-          this.getNoneDicomList()
-          // 刷新父组件列表
-          this.$emit('getList')
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        addOrUpdateNoneDicomStudy(this.form)
+          .then((res) => {
+            this.btnLoading = false
+            this.$refs.editForm.resetFields()
+            this.getNoneDicomList()
+            // 刷新父组件列表
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
 
-          this.dialogVisible = false
-        }).catch(() => {
-          this.btnLoading = false
-        })
+            this.dialogVisible = false
+          })
+          .catch(() => {
+            this.btnLoading = false
+          })
       })
     },
     // 根据id删除某个非Dicom检查信息
@@ -577,22 +743,33 @@ export default {
       }
       this.$confirm(message, {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       })
         .then(() => {
           this.loading = true
           deleteNoneDicomStudy(this.trialId, this.subjectVisitId, row.Id)
-            .then(res => {
+            .then((res) => {
               this.loading = false
               if (res.IsSuccess) {
                 // 刷新父组件列表
                 this.$emit('getList')
-                this.nonDicomStudyList.splice(this.nonDicomStudyList.findIndex(item => item.Id === row.Id), 1)
+                this.nonDicomStudyList.splice(
+                  this.nonDicomStudyList.findIndex(
+                    (item) => item.Id === row.Id
+                  ),
+                  1
+                )
 
-                this.$message.success(this.$t('trials:uploadNonDicoms:message:deletedSuccessfully'))
+                this.$message.success(
+                  this.$t('trials:uploadNonDicoms:message:deletedSuccessfully')
+                )
               }
-            }).catch(() => { this.loading = false })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => {})
     },
     // 打开上传文件弹窗
     handleUpload(row) {
@@ -612,28 +789,31 @@ export default {
     hadnleDeleteVideo(row) {
       this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.filesLoading = true
-          this.loading = true
-          var params = Object.assign({}, row)
-          params.VideoName = ''
-          params.VideoObjectName = ''
-          params.VideoUrl = ''
-          params.UploadVideoTime = ''
-          addOrUpdateNoneDicomStudy(params).then(res => {
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.filesLoading = true
+        this.loading = true
+        var params = Object.assign({}, row)
+        params.VideoName = ''
+        params.VideoObjectName = ''
+        params.VideoUrl = ''
+        params.UploadVideoTime = ''
+        addOrUpdateNoneDicomStudy(params)
+          .then((res) => {
             this.filesLoading = false
             this.loading = false
             this.nonDicomfilesList.pop()
             this.$emit('getList')
-            this.$message.success(this.$t('trials:uploadNonDicoms:message:deletedSuccessfully'))
+            this.$message.success(
+              this.$t('trials:uploadNonDicoms:message:deletedSuccessfully')
+            )
             this.getNoneDicomList()
-          }).catch(() => {
+          })
+          .catch(() => {
             this.filesLoading = false
             this.loading = false
           })
-        })
+      })
     },
     uploadOver(isSuccess, res, fileName) {
       if (isSuccess) {
@@ -642,15 +822,17 @@ export default {
         params.VideoObjectName = res.name
         params.VideoUrl = res.url
         params.UploadVideoTime = this.parseTime(new Date())
-        addOrUpdateNoneDicomStudy(params).then(res => {
-          this.getNoneDicomList()
-          // 刷新父组件列表
-          this.uploadVideoVisible = false
-          this.$emit('getList')
-          this.$message.success(this.$t('components:uploadvideo:message:xf1'))
-        }).catch(() => {
-          this.uploadVideoVisible = false
-        })
+        addOrUpdateNoneDicomStudy(params)
+          .then((res) => {
+            this.getNoneDicomList()
+            // 刷新父组件列表
+            this.uploadVideoVisible = false
+            this.$emit('getList')
+            this.$message.success(this.$t('components:uploadvideo:message:xf1'))
+          })
+          .catch(() => {
+            this.uploadVideoVisible = false
+          })
       }
     },
     // 扫描待上传文件
@@ -658,26 +840,41 @@ export default {
       var files = [...e.target.files]
       console.log(files)
       var sameFiles = []
-      files.forEach(file => {
-        var extendName = file.name.substring(file.name.lastIndexOf('.')).toLocaleLowerCase()
-        if (this.faccept.indexOf(extendName) !== -1 && this.fileList.findIndex(v => v.name === file.name) > -1) {
+      files.forEach((file) => {
+        var extendName = file.name
+          .substring(file.name.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (
+          this.faccept.indexOf(extendName) !== -1 &&
+          this.fileList.findIndex((v) => v.name === file.name) > -1
+        ) {
           sameFiles.push(file.name)
         }
       })
       var scope = this
       if (sameFiles.length > 0) {
         const h = this.$createElement
-        var msg = this.$t('trials:uploadNonDicoms:message:exsitSameFile').replace('xxx', sameFiles.join(', '))
+        var msg = this.$t(
+          'trials:uploadNonDicoms:message:exsitSameFile'
+        ).replace('xxx', sameFiles.join(', '))
         this.$msgbox({
           message: h('div', { style: 'maxHeight:300px;overflow: auto;' }, [
             h('p', null, msg),
-            h('p', null, this.$t('trials:uploadNonDicoms:message:isContinueUpload'))
+            h(
+              'p',
+              null,
+              this.$t('trials:uploadNonDicoms:message:isContinueUpload')
+            ),
           ]),
           type: 'warning',
-          showCancelButton: true
-        }).then(() => {
-          scope.pendingUploadQuene(files)
-        }).catch(() => { scope.resetUploadForm() })
+          showCancelButton: true,
+        })
+          .then(() => {
+            scope.pendingUploadQuene(files)
+          })
+          .catch(() => {
+            scope.resetUploadForm()
+          })
       } else {
         scope.pendingUploadQuene(files)
       }
@@ -685,17 +882,20 @@ export default {
     pendingUploadQuene(files) {
       for (var i = 0; i < files.length; ++i) {
         const fileName = files[i].name
-        var extendName = fileName.substring(fileName.lastIndexOf('.')).toLocaleLowerCase()
+        var extendName = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
         if (this.faccept.indexOf(extendName) !== -1) {
-          files[i].id = `${files[i].lastModified}${files[i].name}`;
+          files[i].id = `${files[i].lastModified}${files[i].name}`
           let obj = {
-            name:files[i].name,
-            size:files[i].size,
-            type:extendName.split('.')[1],
-            status:0,
-            file:files[i],
-            id:`${files[i].lastModified}${files[i].name}`,
-            fileType:files[i].type
+            name: files[i].name,
+            size: files[i].size,
+            type: extendName.split('.')[1],
+            status: 0,
+            file: files[i],
+            id: `${files[i].lastModified}${files[i].name}`,
+            fileType: files[i].type,
+            uploadFileSize: 0,
           }
           this.fileList.push(obj)
           this.$refs.filesTable.toggleRowSelection(obj, true)
@@ -709,16 +909,19 @@ export default {
       })
     },
     handlePreviewImg(row) {
-      this.imgUrl = row.FullFilePath
-      this.previewImgVisible = true
-      this.imageLoading = true
+      // this.imgUrl = row.FullFilePath
+      // this.previewImgVisible = true
+      // this.imageLoading = true
+      this.$refs[row.FullFilePath].$viewer.show()
     },
     beginScanFolder(e) {
       var files = e.target.files
       this.fCount += files.Count
       for (var i = 0; i < files.length; ++i) {
         const fileName = files[i].name
-        var extendName = fileName.substring(fileName.lastIndexOf('.')).toLocaleLowerCase()
+        var extendName = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
         if (this.faccept.indexOf(extendName) !== -1) {
           files[i].id = `${files[i].lastModified}${files[i].name}`
           this.fileList.push(files[i])
@@ -728,28 +931,34 @@ export default {
     handleRemoveFile(row) {
       this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.fileList.splice(this.fileList.findIndex(item => item.id === row.id), 1);
-          let flag = this.successFileList.some(item=>item.id === row.id);
-          if(flag){
-            this.successFileList.splice(this.successFileList.findIndex(item => item.id === row.id), 1);
+          this.fileList.splice(
+            this.fileList.findIndex((item) => item.id === row.id),
+            1
+          )
+          let flag = this.successFileList.some((item) => item.id === row.id)
+          if (flag) {
+            this.successFileList.splice(
+              this.successFileList.findIndex((item) => item.id === row.id),
+              1
+            )
           }
-        }).catch(() => {})
+        })
+        .catch(() => {})
     },
     // 获取待上传文件信息
     handleSelectionChange(selection) {
       this.selectArr = selection
-      console.log(this.selectArr,'selectArr');
     },
     // 开始上传文件
     async beginUpload() {
       this.btnLoading = true
-      this.isFail = false;
-      const fileMaxSize = 1024 * 1024 * 1024 * 1 // 1G
+      this.isFail = false
+      const fileMaxSize = 1024 * 1024 * 1024 * 2 // 1G
       var currentFilesSize = 0
-      this.selectArr.forEach(item => {
+      this.selectArr.forEach((item) => {
         currentFilesSize += item.size
       })
       if (currentFilesSize / fileMaxSize > 1) {
@@ -757,141 +966,238 @@ export default {
         this.$alert(this.$t('trials:uploadNonDicoms:message:uploadSize'))
         this.btnLoading = false
       } else {
-        this.selectArr.forEach(item=>item.status = 0);
-        let num = this.selectArr.length > 6 ? 6 : this.selectArr.length;
-        let funArr = [];
+        this.selectArr.forEach((item) => (item.status = 0))
+        let num = this.selectArr.length > 6 ? 6 : this.selectArr.length
+        let funArr = []
         let res = await preArchiveStudy({
           subjectVisitId: this.subjectVisitId,
-          isDicom: false
-        });
-        if(res.IsSuccess){
-          this.studyMonitorId = res.Result;
+          isDicom: false,
+          FileCount: this.selectArr.length,
+        })
+        if (res.IsSuccess) {
+          this.studyMonitorId = res.Result
           for (let i = 0; i < num; i++) {
-            funArr.push(this.handleUploadTask(this.selectArr, i));
+            funArr.push(this.handleUploadTask(this.selectArr, i))
           }
           if (funArr.length > 0) {
-            let res = await Promise.all(funArr);
+            let res = await Promise.all(funArr)
           }
-        }else{
-          this.isFail = true;
+        } else {
+          this.isFail = true
         }
       }
     },
     // 并发上传
-    async handleUploadTask(arr, index){
-      if(!this.uploadVisible) return;
-      let file = this.fileList.filter(item=> item.id === arr[index].id)[0];
-      file.status=1;
-      let path = `/${this.trialId}/Image/${this.data.SubjectId}/${this.data.VisitName}/${file.name}`;
-      const fileData = await this.fileToBlob(file.file);
-      let res = await this.fileToOss(path,fileData);
-      if(res){
-        file.status = 2;
-        this.successFileList.push({ fileName: file.name, filePath: this.$getObjectName(res.url),fileFize: file.size,fileType:file.fileType})
-        let flag = arr.every(item=>item.status === 2);
-        if(flag){
-          return this.submitFile(this.successFileList);
+    async handleUploadTask(arr, index) {
+      if (!this.uploadVisible) return
+      let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
+      file.status = 1
+      let path = `/${this.trialId}/Image/${this.data.SubjectId}/${
+        this.data.Id
+      }/${this.$guid()}${file.name
+        .substring(file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()}`
+      file.curPath = path
+      const fileData = await this.fileToBlob(file.file)
+      let res = await this.fileToOss(path, fileData, file)
+      if (res) {
+        file.status = 2
+        this.successFileList.push({
+          fileName: file.name,
+          filePath: this.$getObjectName(res.url),
+          fileFize: file.size,
+          fileType: file.fileType,
+        })
+        let flag = arr.every((item) => item.status === 2)
+        if (flag) {
+          let RecordPath = await this.uploadRecord(arr)
+          return this.submitFile(this.successFileList, RecordPath)
         }
-      }else{
-        file.status = 3;
+      } else {
+        file.status = 3
       }
-      let flag = arr.every(item=>item.status > 1);
-      if(flag){
-        let failFileList = arr.filter(item=>item.status === 3);
-        if(failFileList&&failFileList.length > 0){
-          this.$refs.filesTable.clearSelection();
+      let flag = arr.every((item) => item.status > 1)
+      if (flag) {
+        let failFileList = arr.filter((item) => item.status === 3)
+        if (failFileList && failFileList.length > 0) {
+          let RecordPath = await this.uploadRecord(arr)
+          this.$refs.filesTable.clearSelection()
           failFileList.forEach((row) => {
-            this.$refs.filesTable.toggleRowSelection(row);
-          });
-          this.isFail = true;
-          return false;
+            row.uploadFileSize = 0
+            this.$refs.filesTable.toggleRowSelection(row)
+          })
+          this.isFail = true
+          this.submitFile(this.successFileList, RecordPath, true)
+          return false
         }
       }
-      let ind = arr.findIndex(item=>item.status === 0);
-      if(ind >= 0){
-        return this.handleUploadTask(arr,ind);
-      }else{
-        return false;
+      let ind = arr.findIndex((item) => item.status === 0)
+      if (ind >= 0) {
+        return this.handleUploadTask(arr, ind)
+      } else {
+        return false
       }
     },
     // file上传到oss
-    async fileToOss(path,file){
-      try{
-        let res = await this.OSSclient.put(path,file);
-        if(res){
-          return res;
-        }else{
-          return false;
+    async fileToOss(path, file, item) {
+      try {
+        let res = await this.OSSclient.multipartUpload(
+          {
+            path,
+            file,
+            speed: true,
+          },
+          (percentage, checkpoint, lastPer) => {
+            item.uploadFileSize += checkpoint.size * (percentage - lastPer)
+            if (item.uploadFileSize > file.fileSize) {
+              item.uploadFileSize = file.fileSize
+            }
+          }
+        )
+        if (res) {
+          return res
+        } else {
+          return false
         }
-      }catch(err){
-        console.log(err);
-        return false;
+      } catch (err) {
+        console.log(err)
+        return false
       }
     },
     // 非Dicom文件上传归档
-    submitFile(uploadedFileList){
-      if(!this.uploadVisible) return;
-        this.btnLoading = true
-        var params = {
-          trialId: this.trialId,
-          subjectVisitId: this.subjectVisitId,
-          noneDicomStudyId:this.currentRow.Id,
-          studyMonitorId: this.studyMonitorId,
-          uploadedFileList: uploadedFileList
-        }
-        uploadNoneDicomFile(params).then(res => {
-          this.resetFileDiaolg();
+    submitFile(uploadedFileList, RecordPath, isReLoad = false) {
+      if (!this.uploadVisible) return
+      this.btnLoading = true
+      var params = {
+        trialId: this.trialId,
+        subjectVisitId: this.subjectVisitId,
+        noneDicomStudyId: this.currentRow.Id,
+        studyMonitorId: this.studyMonitorId,
+        uploadedFileList: uploadedFileList,
+      }
+      if (RecordPath) {
+        params.RecordPath = RecordPath.path
+        params.FailedFileCount = RecordPath.Record.Failed.length
+      }
+      uploadNoneDicomFile(params)
+        .then((res) => {
+          if (!isReLoad) {
+            this.resetFileDiaolg()
+          }
           this.getNoneDicomList()
           // 刷新父组件列表
           this.$emit('getList')
-          this.$message.success(this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully'))
-        }).catch(() => { this.btnLoading = false })
+          this.$message.success(
+            this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully')
+          )
+        })
+        .catch(() => {
+          this.btnLoading = false
+        })
     },
-    resetFileDiaolg(){
+    // 上传提交记录
+    uploadRecord(arr) {
+      return new Promise(async (resolve) => {
+        try {
+          let Record = {
+            Failed: [],
+            Existed: [],
+            Uploaded: [],
+            FileCount: arr.length,
+          }
+          arr.forEach((item) => {
+            let file = this.fileList.find((data) => data.id === item.id)
+            if (file.status === 2) {
+              Record.Uploaded.push(file.curPath)
+            }
+            if (file.status === 3) {
+              Record.Failed.push(file.curPath)
+            }
+          })
+          let text = JSON.stringify(Record)
+          let logJsonBlob = this.generateTxtFile(text)
+          let logJsonObjectName = `/${this.trialId}/Image/${this.data.SubjectId}/${this.data.Id}/${this.studyMonitorId}.txt`
+          let logRes
+          try {
+            logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)
+            if (logRes && logRes.url) {
+              resolve({ path: this.$getObjectName(logRes.url), Record })
+            } else {
+              resolve(false)
+            }
+          } catch (e) {
+            resolve(false)
+          }
+        } catch (err) {
+          console.log(err)
+          resolve(false)
+        }
+      })
+    },
+    generateTxtFile(text) {
+      let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
+      return blob
+    },
+    resetFileDiaolg() {
       this.btnLoading = false
       this.uploadVisible = false
-      this.selectArr = [];
-      this.successFileList=[];
+      this.selectArr = []
+      this.successFileList = []
+      this.OSSclient.close()
     },
     handleGetFilesList(row) {
       this.filesLoading = true
-      getNoneDicomStudyFileList(row.Id).then(res => {
-        this.nonDicomfilesList = res.Result
-        if (row.VideoName) {
-          this.nonDicomfilesList.push({ FileName: row.VideoName, type: 'MP4' })
-        }
-        this.filesLoading = false
-      }).catch(() => { this.filesLoading = false })
+      getNoneDicomStudyFileList(row.Id)
+        .then((res) => {
+          this.nonDicomfilesList = res.Result
+          if (row.VideoName) {
+            this.nonDicomfilesList.push({
+              FileName: row.VideoName,
+              type: 'MP4',
+            })
+          }
+          this.filesLoading = false
+        })
+        .catch(() => {
+          this.filesLoading = false
+        })
     },
     // 根据id删除某个文件
     handleDeleteFile(id) {
       this.$confirm(this.$t('trials:uploadNonDicoms:message:delete'), {
         type: 'warning',
-        distinguishCancelAndClose: true
+        distinguishCancelAndClose: true,
       })
         .then(() => {
           this.filesLoading = true
           this.loading = true
           deleteNoneDicomStudyFile(this.trialId, this.subjectVisitId, id)
-            .then(res => {
+            .then((res) => {
               this.filesLoading = false
               this.loading = false
               if (res.IsSuccess) {
                 // 刷新父组件列表
                 this.$emit('getList')
-                this.nonDicomfilesList.splice(this.nonDicomfilesList.findIndex(item => item.Id === id), 1)
-                this.$message.success(this.$t('trials:uploadNonDicoms:message:deletedSuccessfully'))
+                this.nonDicomfilesList.splice(
+                  this.nonDicomfilesList.findIndex((item) => item.Id === id),
+                  1
+                )
+                this.$message.success(
+                  this.$t('trials:uploadNonDicoms:message:deletedSuccessfully')
+                )
                 this.getNoneDicomList()
               }
-            }).catch(() => {
+            })
+            .catch(() => {
               this.filesLoading = false
               this.loading = false
             })
-        }).catch(() => {})
+        })
+        .catch(() => {})
     },
     // 预览
     handlePreview(row) {
-       window.open(row.FullFilePath, '_blank')
+      window.open(row.FullFilePath, '_blank')
     },
     // 预览访视下所有的非DICOM文件
     handlePreviewAllVisitFiles() {
@@ -899,7 +1205,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}`
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}`,
       })
       window.open(routeData.href, '_blank')
     },
@@ -908,7 +1214,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&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')
     },
@@ -923,16 +1229,16 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim(),'Code',this.BodyPart,'Name')
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
       return newArr.join(' | ')
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
-.upload{
+.upload {
   display: inline-block;
   height: 30px;
   width: 90px;
@@ -945,8 +1251,8 @@ export default {
   text-align: center;
   background: #428bca;
   border-color: #428bca;
-  color: #FFF;
-  .select-file{
+  color: #fff;
+  .select-file {
     height: 30px;
     width: 90px;
     position: absolute;
@@ -956,7 +1262,8 @@ export default {
     opacity: 0;
     font-size: 0;
   }
-  .btn-select {    //给显示在页面上的按钮写样式
+  .btn-select {
+    //给显示在页面上的按钮写样式
     width: 90px;
     height: 30px;
     line-height: 30px;
@@ -967,8 +1274,7 @@ export default {
     position: absolute;
     top: 0;
     left: 0;
-    pointer-events: none;        //pointer-events:none用来控制该标签的点击穿透事件
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
 }
-}
-
 </style>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
index 440434c0..c33a7465 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
@@ -13,7 +13,7 @@
         <!-- 格式化录入 -->
         <div v-if="cd.ClinicalUploadType === 0">
           <!-- 既往放疗史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:pastTreatment") }}</h4>
+          <h4>{{ $t('trials:uploadClinicalData:title:pastTreatment') }}</h4>
           <div v-if="allowAddOrEdit" style="text-align: right">
             <!-- 新增 -->
             <el-button
@@ -24,7 +24,7 @@
                 addPreviousHistory(cd.ClinicalDataTrialSetId)
               "
             >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
             </el-button>
           </div>
 
@@ -46,8 +46,8 @@
               <template slot-scope="scope">
                 {{
                   scope.row.StartTime
-                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
-                    : ""
+                    ? moment(scope.row.StartTime).format('YYYY-MM-DD')
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -59,8 +59,8 @@
               <template slot-scope="scope">
                 {{
                   scope.row.EndTime
-                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
-                    : ""
+                    ? moment(scope.row.EndTime).format('YYYY-MM-DD')
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -70,7 +70,7 @@
               :label="$t('trials:uploadClinicalData:table:isPD')"
             >
               <template slot-scope="scope">
-                {{ $fd("IsPdEnum", scope.row.IsPD) }}
+                {{ $fd('IsPdEnum', scope.row.IsPD) }}
               </template>
             </el-table-column>
             <el-table-column
@@ -104,7 +104,7 @@
             </el-table-column>
           </el-table>
           <!-- 既往手术史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:pastSurgery") }}</h4>
+          <h4>{{ $t('trials:uploadClinicalData:title:pastSurgery') }}</h4>
           <div v-if="allowAddOrEdit" style="text-align: right">
             <el-button
               type="primary"
@@ -112,7 +112,7 @@
               size="small"
               @click="addPreviousSurgery(cd.ClinicalDataTrialSetId)"
             >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
             </el-button>
           </div>
           <el-table
@@ -133,8 +133,8 @@
               <template slot-scope="scope">
                 {{
                   scope.row.OperationTime
-                    ? moment(scope.row.OperationTime).format("YYYY-MM-DD")
-                    : ""
+                    ? moment(scope.row.OperationTime).format('YYYY-MM-DD')
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -170,7 +170,7 @@
             </el-table-column>
           </el-table>
           <!-- 既往其他治疗史 -->
-          <h4>{{ $t("trials:uploadClinicalData:title:others") }}</h4>
+          <h4>{{ $t('trials:uploadClinicalData:title:others') }}</h4>
           <div v-if="allowAddOrEdit" style="text-align: right">
             <!-- 新增 -->
             <el-button
@@ -179,7 +179,7 @@
               size="small"
               @click="addPreviousOther(cd.ClinicalDataTrialSetId)"
             >
-              {{ $t("common:button:new") }}
+              {{ $t('common:button:new') }}
             </el-button>
           </div>
           <el-table
@@ -200,8 +200,8 @@
               <template slot-scope="scope">
                 {{
                   scope.row.StartTime
-                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
-                    : ""
+                    ? moment(scope.row.StartTime).format('YYYY-MM-DD')
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -213,8 +213,8 @@
               <template slot-scope="scope">
                 {{
                   scope.row.EndTime
-                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
-                    : ""
+                    ? moment(scope.row.EndTime).format('YYYY-MM-DD')
+                    : ''
                 }}
               </template>
             </el-table-column>
@@ -252,7 +252,10 @@
         </div>
         <!-- PDF录入 -->
         <div v-if="cd.ClinicalUploadType === 1">
-          <div v-if="allowAddOrEdit" style="text-align: right">
+          <div
+            v-if="allowAddOrEdit"
+            style="text-align: right; display: flex; justify-content: flex-end"
+          >
             <!-- 下载模板 -->
             <el-button
               v-if="cd.Path"
@@ -261,8 +264,9 @@
               size="small"
               :loading="downloadLoading"
               @click.native.prevent="handleDownloadTpl(cd)"
+              style="margin-right: 10px"
             >
-              {{ $t("trials:uploadClinicalData:button:downloadTemplate") }}
+              {{ $t('trials:uploadClinicalData:button:downloadTemplate') }}
             </el-button>
             <!-- 新增 -->
             <!-- <el-button
@@ -274,35 +278,38 @@
               {{ $t("common:button:new") }}
             </el-button> -->
             <!-- 新增 -->
-            <el-button
-              icon="el-icon-plus"
-              type="primary"
-              size="small"
-              :disabled="btnLoading"
-              :loading="btnLoading"
-            >
-              {{ $t("common:button:new") }}
-            </el-button>
-            <input
-              type="file"
-              name="file"
-              multiple
-              ref="addFile"
-              style="
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                opacity: 0;
-                cursor: pointer;
-              "
-              :accept="faccept.join(',')"
-              @change="
-                ($event) =>
-                  beginScanFiles($event, cd.Id, cd.ClinicalDataTrialSetId)
-              "
-            />
+            <div style="position: relative">
+              <el-button
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+              >
+                {{ $t('common:button:new') }}
+              </el-button>
+              <input
+                type="file"
+                name="file"
+                multiple
+                ref="addFile"
+                :title="$t('common:button:new')"
+                style="
+                  position: absolute;
+                  top: 0;
+                  left: 0;
+                  width: 100%;
+                  height: 100%;
+                  opacity: 0;
+                  cursor: pointer;
+                "
+                :accept="faccept.join(',')"
+                @change="
+                  ($event) =>
+                    beginScanFiles($event, cd.Id, cd.ClinicalDataTrialSetId)
+                "
+              />
+            </div>
           </div>
           <el-table :data="cd.PDFFileList" style="width: 100%" height="300">
             <el-table-column type="index" width="50" />
@@ -322,7 +329,7 @@
                 <span>{{
                   scope.row.Size && scope.row.Size > 0
                     ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
-                    : 0
+                    : ''
                 }}</span>
               </template>
             </el-table-column>
@@ -490,16 +497,16 @@ import {
   deletePreviousSurgery,
   getCRCClinicalData,
   addOrUpdateReadingClinicalData,
-} from "@/api/trials";
-import PreviousRadiotherapy from "./previousRadiotherapy";
-import PreviousSurgery from "./previousSurgery";
-import PreviousOther from "./previousOther";
-import PreviousFiles from "./previousFiles";
-import clinicalDataQuestions from "@/components/clinicalDataQuestions";
-import PreviewFile from "@/components/PreviewFile/index";
-import moment from "moment";
+} from '@/api/trials'
+import PreviousRadiotherapy from './previousRadiotherapy'
+import PreviousSurgery from './previousSurgery'
+import PreviousOther from './previousOther'
+import PreviousFiles from './previousFiles'
+import clinicalDataQuestions from '@/components/clinicalDataQuestions'
+import PreviewFile from '@/components/PreviewFile/index'
+import moment from 'moment'
 export default {
-  name: "uploadPetClinicalData",
+  name: 'uploadPetClinicalData',
   components: {
     PreviousRadiotherapy,
     PreviousSurgery,
@@ -512,14 +519,14 @@ export default {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     studyData: {
       required: true,
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     subjectVisitId: {
@@ -537,9 +544,9 @@ export default {
   },
   data() {
     return {
-      faccept: [".pdf"],
+      faccept: ['.pdf'],
       isShow: false,
-      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       loading: false,
       btnLoading: false,
       PreviousHistoryList: [],
@@ -556,11 +563,11 @@ export default {
       moment,
       downloadLoading: false,
       clinicalDatas: [],
-      previewObj: { visible: false, filePath: "", fileType: "" },
-    };
+      previewObj: { visible: false, filePath: '', fileType: '' },
+    }
   },
   mounted() {
-    this.getClinicalData();
+    this.getClinicalData()
   },
   methods: {
     beginScanFiles(e, id, clinicalDataTrialSetId) {
@@ -568,59 +575,59 @@ export default {
         Id: id,
         ClinicalDataTrialSetId: clinicalDataTrialSetId,
         SubjectId: this.data.SubjectId,
-      };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      var files = e.target.files;
-      this.fileList = [];
+      }
+      this.currentRow.TrialId = this.$route.query.trialId
+      var files = e.target.files
+      this.fileList = []
       for (var i = 0; i < files.length; ++i) {
-        const fileName = files[i].name;
+        const fileName = files[i].name
         var extendName = fileName
-          .substring(fileName.lastIndexOf("."))
-          .toLocaleLowerCase();
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
         if (this.faccept.indexOf(extendName) !== -1) {
           let obj = {
             size: files[i].size,
-            type: extendName.split(".")[1],
+            type: extendName.split('.')[1],
             file: files[i],
-          };
-          this.fileList.push(obj);
+          }
+          this.fileList.push(obj)
         }
       }
-      this.handleUploadFile();
+      this.handleUploadFile()
       this.$refs.addFile.forEach((item) => {
-        item.value = null;
-      });
+        item.value = null
+      })
     },
     async handleUploadFile() {
-      this.btnLoading = true;
-      this.loading = true;
-      this.addFileList = [];
+      this.btnLoading = true
+      this.loading = true
+      this.addFileList = []
       try {
         for (var i = 0; i < this.fileList.length; ++i) {
-          const file = await this.fileToBlob(this.fileList[i].file);
-          var timestamp = Date.now();
+          const file = await this.fileToBlob(this.fileList[i].file)
+          var timestamp = Date.now()
           const res = await this.OSSclient.put(
             `/${this.trialId}/ClinicalData/${timestamp}_${this.fileList[i].file.name}`,
             file
-          );
+          )
           this.addFileList.push({
             fileName: this.fileList[i].file.name,
             path: this.$getObjectName(res.url),
             url: this.$getObjectName(res.url),
             type: this.fileList[i].type,
             size: this.fileList[i].size,
-          });
+          })
         }
-        this.saveClinicalData();
+        this.saveClinicalData()
       } catch (err) {
-        console.log(err);
-        this.btnLoading = false;
-        this.loading = false;
+        console.log(err)
+        this.btnLoading = false
+        this.loading = false
       }
     },
     saveClinicalData() {
-      this.btnLoading = true;
-      this.loading = true;
+      this.btnLoading = true
+      this.loading = true
       var param = {
         id: this.currentRow.Id,
         trialId: this.currentRow.TrialId,
@@ -630,184 +637,185 @@ export default {
         isVisit: true,
         deleteFileIds: [],
         addFileList: this.addFileList,
-      };
+      }
       if (this.studyData.StudyId) {
-        param.StudyId = this.studyData.StudyId;
+        param.StudyId = this.studyData.StudyId
       }
       addOrUpdateReadingClinicalData(param)
         .then((response) => {
-          this.btnLoading = false;
-          this.loading = false;
+          this.btnLoading = false
+          this.loading = false
           // 刷新文件列表并关闭弹窗
-          this.getClinicalData();
+          this.getClinicalData()
           this.$message.success(
-            this.$t("trials:uploadClinicalData:message:uploadSuccessfully")
-          );
-          this.$emit("getStudyInfo");
+            this.$t('trials:uploadClinicalData:message:uploadSuccessfully')
+          )
+          this.$emit('getStudyInfo')
         })
         .catch(() => {
-          this.btnLoading = false;
-          this.loading = false;
-        });
+          this.btnLoading = false
+          this.loading = false
+        })
     },
     getClinicalData() {
-      this.loading = true;
-      this.data.TrialId = this.$route.query.trialId;
+      this.loading = true
+      this.data.TrialId = this.$route.query.trialId
       var param = {
+        SubjectVisitId: this.studyData.SubjectVisitId,
         StudyId: this.studyData.StudyId,
         TrialId: this.$route.query.trialId,
         SubjectId: this.studyData.SubjectId,
-      };
+      }
       getCRCClinicalData(param)
         .then((res) => {
-          this.clinicalDatas = res.Result;
-          this.loading = false;
+          this.clinicalDatas = res.Result
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 打开编辑框
     editRow(row, type) {
       if (type === 1) {
-        this.prVisible = true;
+        this.prVisible = true
       } else if (type === 2) {
-        this.psVisible = true;
+        this.psVisible = true
       } else if (type === 3) {
-        this.poVisible = true;
+        this.poVisible = true
       }
-      this.currentRow = { ...row };
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.currentRow = { ...row }
+      this.currentRow.TrialId = this.$route.query.trialId
     },
     // 根据ID删除既往放疗史
     deletePreviousHistory(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deletePreviousHistory(
           this.$route.query.trialId,
           this.subjectVisitId,
           row.Id
         )
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getClinicalData();
+              this.getClinicalData()
               this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getStudyInfo");
+                this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+              )
+              this.$emit('getStudyInfo')
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 根据ID删除既往手术史
     deletePreviousSurgery(row) {
-      console.log(this.$route.query.trialId);
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      console.log(this.$route.query.trialId)
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         // row.Type = '既往手术史'
-        this.loading = true;
+        this.loading = true
         deletePreviousSurgery(
           this.$route.query.trialId,
           this.subjectVisitId,
           row.Id
         )
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getClinicalData();
+              this.getClinicalData()
               this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getStudyInfo");
+                this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+              )
+              this.$emit('getStudyInfo')
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 根据ID删除既往其他资料史
     deletePreviousOther(row) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
         // row.Type = '既往其他治疗史'
-        this.loading = true;
+        this.loading = true
         deletePreviousOther(
           this.$route.query.trialId,
           this.subjectVisitId,
           row.Id
         )
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getClinicalData();
+              this.getClinicalData()
               this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
-              this.$emit("getStudyInfo");
+                this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+              )
+              this.$emit('getStudyInfo')
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 文件预览
     preview(row) {
-      if (!row.Path) return;
-      this.previewObj.fileName = row.FileName;
-      this.previewObj.filePath = row.Path;
-      this.previewObj.fileType = "pdf";
-      this.previewObj.visible = true;
+      if (!row.Path) return
+      this.previewObj.fileName = row.FileName
+      this.previewObj.filePath = row.Path
+      this.previewObj.fileType = 'pdf'
+      this.previewObj.visible = true
       // window.open(this.OSSclientConfig.basePath + path, '_blank')
     },
     addPreviousHistory(clinicalDataTrialSetId) {
-      console.log(clinicalDataTrialSetId);
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.prVisible = true;
+      console.log(clinicalDataTrialSetId)
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.prVisible = true
     },
     addPreviousSurgery(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.psVisible = true;
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.psVisible = true
     },
     addPreviousOther(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.poVisible = true;
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.poVisible = true
     },
     // 关闭既往放疗史窗口并刷新列表
     closePRDialog() {
-      this.prVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.prVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
     },
     closePSDialog() {
-      this.psVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.psVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
     },
     closePODialog() {
-      this.poVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.poVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
     },
     closeUpDialog() {
-      this.upVisible = false;
-      this.currentRow.TrialId = this.$route.query.trialId;
+      this.upVisible = false
+      this.currentRow.TrialId = this.$route.query.trialId
     },
     refresh() {
-      this.getClinicalData();
-      this.$emit("getStudyInfo");
+      this.getClinicalData()
+      this.$emit('getStudyInfo')
     },
     // 添加文件
     addFile(id, clinicalDataTrialSetId) {
@@ -815,38 +823,38 @@ export default {
         Id: id,
         ClinicalDataTrialSetId: clinicalDataTrialSetId,
         SubjectId: this.data.SubjectId,
-      };
-      this.currentRow.TrialId = this.$route.query.trialId;
-      this.upVisible = true;
+      }
+      this.currentRow.TrialId = this.$route.query.trialId
+      this.upVisible = true
     },
     // 删除文件
     deleteFile(id) {
-      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deleteReadingClinicalDataPDF(id)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              this.getClinicalData();
-              this.$emit("getStudyInfo");
+              this.getClinicalData()
+              this.$emit('getStudyInfo')
               this.$message.success(
-                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
-              );
+                this.$t('trials:uploadedDicoms:message:deleteSuccessfully')
+              )
             }
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     handleDownloadTpl(cd) {
-      window.open(this.OSSclientConfig.basePath + cd.Path);
+      window.open(this.OSSclientConfig.basePath + cd.Path)
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .clinical-data-wrapper {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index adfbcf59..12c2cd8f 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -127,7 +127,7 @@
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            {{ $t("common:button:search") }}
+            {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
           <el-button
@@ -135,7 +135,7 @@
             icon="el-icon-refresh-left"
             @click="handleReset"
           >
-            {{ $t("common:button:reset") }}
+            {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
           <el-button
@@ -143,7 +143,7 @@
             icon="el-icon-download"
             @click="handleExport"
           >
-            {{ $t("common:button:export") }}
+            {{ $t('common:button:export') }}
           </el-button>
           <!-- 批量提交 -->
           <el-button
@@ -153,7 +153,7 @@
             :disabled="selectArr.length === 0"
             @click="handleBulkSubmit"
           >
-            {{ $t("trials:crcUpload:button:submit") }}
+            {{ $t('trials:crcUpload:button:submit') }}
           </el-button>
           <!-- 计划外访视 -->
           <el-button
@@ -162,7 +162,7 @@
             icon="el-icon-plus"
             @click="handleAdd"
           >
-            {{ $t("trials:crcUpload:button:add") }}
+            {{ $t('trials:crcUpload:button:add') }}
           </el-button>
           <!--          <el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:submit']" type="primary" @click="handleUpload">-->
           <!--            临床数据-->
@@ -235,10 +235,10 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsUrgent" type="danger">{{
-              $fd("YesOrNo", scope.row.IsUrgent)
+              $fd('YesOrNo', scope.row.IsUrgent)
             }}</el-tag>
             <el-tag v-else type="primary">{{
-              $fd("YesOrNo", scope.row.IsUrgent)
+              $fd('YesOrNo', scope.row.IsUrgent)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -265,7 +265,7 @@
               v-if="scope.row.SubjectFirstGiveMedicineTime"
               class="status-primary-circle"
             >
-              {{ $t("trials:crcUpload:label:firstGiveMedicineTime") }}
+              {{ $t('trials:crcUpload:label:firstGiveMedicineTime') }}
             </span>
           </template>
         </el-table-column>
@@ -288,22 +288,22 @@
             <span v-else>{{ scope.row.VisitName }}</span>
             <!-- PD -->
             <span v-if="scope.row.PDState" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:pd") }}
+              {{ $t('trials:crcUpload:label:pd') }}
             </span>
             <!-- 失 -->
             <span v-if="scope.row.IsLostVisit" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:lostVisit") }}
+              {{ $t('trials:crcUpload:label:lostVisit') }}
             </span>
             <!-- 末 -->
             <span v-if="scope.row.IsFinalVisit" class="status-primary-circle">
-              {{ $t("trials:crcUpload:label:finalVisit") }}
+              {{ $t('trials:crcUpload:label:finalVisit') }}
             </span>
             <!-- 入 -->
             <span
               v-if="scope.row.IsEnrollmentConfirm"
               class="status-primary-circle"
             >
-              {{ $t("trials:crcUpload:label:enrollmentConfirm") }}
+              {{ $t('trials:crcUpload:label:enrollmentConfirm') }}
             </span>
           </template>
         </el-table-column>
@@ -319,7 +319,7 @@
               <div slot="content">
                 <!-- DICOM/Non-DICOM/Clinical data -->
                 <span
-                  >{{ $t("trials:crcUpload:label:dicom") }}:
+                  >{{ $t('trials:crcUpload:label:dicom') }}:
                   {{ scope.row.DicomStudyCount }},
                 </span>
                 <span
@@ -329,16 +329,16 @@
                   "
                 >
                   <span
-                    >{{ $t("trials:crcUpload:label:noneDicom") }}:
+                    >{{ $t('trials:crcUpload:label:noneDicom') }}:
                     {{ scope.row.NoneDicomStudyCount }},
                   </span>
                   <span
-                    >{{ $t("trials:crcUpload:label:clinicalData") }}:
-                    {{ scope.row.IsHaveClinicalData ? "w/" : "w/o" }}</span
+                    >{{ $t('trials:crcUpload:label:clinicalData') }}:
+                    {{ scope.row.IsHaveClinicalData ? 'w/' : 'w/o' }}</span
                   >
                 </span>
                 <span v-else
-                  >{{ $t("trials:crcUpload:label:noneDicom") }}:
+                  >{{ $t('trials:crcUpload:label:noneDicom') }}:
                   {{ scope.row.NoneDicomStudyCount }}</span
                 >
               </div>
@@ -349,12 +349,12 @@
                     ? [
                         scope.row.DicomStudyCount,
                         scope.row.NoneDicomStudyCount,
-                        scope.row.IsHaveClinicalData ? "w/" : "w/o",
-                      ].join(", ")
+                        scope.row.IsHaveClinicalData ? 'w/' : 'w/o',
+                      ].join(', ')
                     : [
                         scope.row.DicomStudyCount,
                         scope.row.NoneDicomStudyCount,
-                      ].join(", ")
+                      ].join(', ')
                 }}
               </span>
             </el-tooltip>
@@ -371,8 +371,8 @@
           <template slot-scope="scope">
             {{
               scope.row.EarliestScanDate
-                ? moment(scope.row.EarliestScanDate).format("YYYY-MM-DD")
-                : ""
+                ? moment(scope.row.EarliestScanDate).format('YYYY-MM-DD')
+                : ''
             }}
           </template>
         </el-table-column>
@@ -387,8 +387,8 @@
           <template slot-scope="scope">
             {{
               scope.row.LatestScanDate
-                ? moment(scope.row.LatestScanDate).format("YYYY-MM-DD")
-                : ""
+                ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                : ''
             }}
           </template>
         </el-table-column>
@@ -402,13 +402,13 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.SubmitState * 1 === 0" type="warning">{{
-              $fd("SubmitState", scope.row.SubmitState * 1)
+              $fd('SubmitState', scope.row.SubmitState * 1)
             }}</el-tag>
             <el-tag v-else-if="scope.row.SubmitState * 1 === 1" type="danger">{{
-              $fd("SubmitState", scope.row.SubmitState * 1)
+              $fd('SubmitState', scope.row.SubmitState * 1)
             }}</el-tag>
             <el-tag v-else-if="scope.row.SubmitState * 1 === 2">{{
-              $fd("SubmitState", scope.row.SubmitState * 1)
+              $fd('SubmitState', scope.row.SubmitState * 1)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -431,41 +431,41 @@
           <template slot-scope="scope">
             <span v-if="scope.row.AuditState * 1 === 0">--</span>
             <el-tag v-else-if="scope.row.AuditState * 1 === 3" type="warning">{{
-              $fd("AuditStatePE", scope.row.AuditState * 1)
+              $fd('AuditStatePE', scope.row.AuditState * 1)
             }}</el-tag>
             <el-tag
               v-else-if="
                 scope.row.AuditState * 1 === 4 && otherInfo.QCProcessEnum === 1
               "
               type="warning"
-              >{{ $fd("AuditStatePE", scope.row.AuditState * 1) }}</el-tag
+              >{{ $fd('AuditStatePE', scope.row.AuditState * 1) }}</el-tag
             >
             <el-tag
               v-else-if="
                 scope.row.AuditState * 1 === 4 && otherInfo.QCProcessEnum === 2
               "
               type="warning"
-              >{{ $fd("AuditStateRC", scope.row.AuditState * 1) }}</el-tag
+              >{{ $fd('AuditStateRC', scope.row.AuditState * 1) }}</el-tag
             >
             <el-tag
               v-else-if="
                 scope.row.AuditState * 1 === 5 && otherInfo.QCProcessEnum === 2
               "
               type="warning"
-              >{{ $fd("AuditStateRC", scope.row.AuditState * 1) }}</el-tag
+              >{{ $fd('AuditStateRC', scope.row.AuditState * 1) }}</el-tag
             >
             <el-tag
               v-else-if="
                 scope.row.AuditState * 1 === 6 && otherInfo.QCProcessEnum === 2
               "
               type="warning"
-              >{{ $fd("AuditStateRC", scope.row.AuditState * 1) }}</el-tag
+              >{{ $fd('AuditStateRC', scope.row.AuditState * 1) }}</el-tag
             >
             <el-tag v-else-if="scope.row.AuditState * 1 === 7" type="danger">{{
-              $fd("AuditStateRC", scope.row.AuditState * 1)
+              $fd('AuditStateRC', scope.row.AuditState * 1)
             }}</el-tag>
             <el-tag v-else-if="scope.row.AuditState * 1 === 8" type="primary">{{
-              $fd("AuditStateRC", scope.row.AuditState * 1)
+              $fd('AuditStateRC', scope.row.AuditState * 1)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -577,28 +577,28 @@
       <!-- {{ $t('trials:crcUpload:tips:remark') }} -->
       <!-- √：已设置访视基准日期；末：末次访视；失：失访；PD：PD进展；入：入组确认 -->
       <span class="status-primary-circle">
-        {{ $t("trials:crcUpload:label:firstGiveMedicineTime") }}
+        {{ $t('trials:crcUpload:label:firstGiveMedicineTime') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:firstGiveMedicineTimeD") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:firstGiveMedicineTimeD') }}</span>
 
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:finalVisit") }}
+        {{ $t('trials:crcUpload:label:finalVisit') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:finalVisitDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:finalVisitDetail') }}</span>
 
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:lostVisit") }}
+        {{ $t('trials:crcUpload:label:lostVisit') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:lostVisitDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:lostVisitDetail') }}</span>
 
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:pd") }}
+        {{ $t('trials:crcUpload:label:pd') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:pdDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:pdDetail') }}</span>
       <span class="status-primary-circle" style="margin-left: 10px">
-        {{ $t("trials:crcUpload:label:enrollmentConfirm") }}
+        {{ $t('trials:crcUpload:label:enrollmentConfirm') }}
       </span>
-      <span>: {{ $t("trials:crcUpload:label:enrollmentConfirmDetail") }}</span>
+      <span>: {{ $t('trials:crcUpload:label:enrollmentConfirmDetail') }}</span>
     </div>
     <!-- 新增/编辑 -->
     <el-dialog
@@ -721,10 +721,14 @@
               style="margin-left: 10px"
               @click="relationVisible = true"
             >
-              {{ $t("common:button:edit") }}
+              {{ $t('common:button:edit') }}
             </el-button>
           </el-form-item>
         </el-form>
+        <div class="tip">
+          <i class="el-icon-warning-outline"></i>
+          <div v-html="$t('trials:uploadedDicoms:tip:message')"></div>
+        </div>
         <el-tabs v-model="activeName" type="border-card" style="flex: 1">
           <!-- DICOM影像上传 -->
           <el-tab-pane
@@ -869,7 +873,7 @@
           </el-form-item>
         </el-form>
         <!-- DICOM影像  -->
-        <h4 class="box-title">{{ $t("trials:crcUpload:label:dicom") }}</h4>
+        <h4 class="box-title">{{ $t('trials:crcUpload:label:dicom') }}</h4>
         <el-card class="box-card">
           <StudyInfo
             v-if="rowData.Id"
@@ -880,7 +884,7 @@
         </el-card>
         <!-- 非DICOM影像 -->
         <h4 class="box-title" style="margin-top: 10px">
-          {{ $t("trials:crcUpload:label:noneDicom") }}
+          {{ $t('trials:crcUpload:label:noneDicom') }}
         </h4>
         <el-card class="box-card">
           <UploadNonDicomFiles
@@ -905,7 +909,7 @@
           class="box-title"
           style="margin-top: 10px"
         >
-          {{ $t("trials:crcUpload:label:clinicalData") }}
+          {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
         <el-card
           v-if="
@@ -930,7 +934,7 @@
           class="box-title"
           style="margin-top: 10px"
         >
-          {{ $t("trials:crcUpload:label:clinicalData") }}
+          {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
         <el-card
           v-if="!rowData.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
@@ -1031,7 +1035,7 @@
               :disabled="btnLoading"
               @click="relationVisible = false"
             >
-              {{ $t("common:button:cancel") }}
+              {{ $t('common:button:cancel') }}
             </el-button>
             <el-button
               size="small"
@@ -1039,7 +1043,7 @@
               :loading="btnLoading"
               @click="saveRelationInfo"
             >
-              {{ $t("common:button:save") }}
+              {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
         </div>
@@ -1056,9 +1060,9 @@
       custom-class="base-dialog-wrapper"
     >
       <div slot="title">
-        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
+        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
-          `(${$t("common:label:sign")}${currentUser})`
+          `(${$t('common:label:sign')}${currentUser})`
         }}</span>
       </div>
       <SignForm
@@ -1078,12 +1082,12 @@
     >
       <div slot="title">
         <span style="font-size: 18px">{{
-          $t("trials:crcUpload:dialogTitle:edit")
+          $t('trials:crcUpload:dialogTitle:edit')
         }}</span>
       </div>
       <div style="color: #f66; margin-bottom: 20px; margin-left: 40px">
         <!-- 该受试者访视基准日期未填写，请补充后，再提交访视影像。 -->
-        {{ $t("trials:crcUpload:message:baseDate") }}
+        {{ $t('trials:crcUpload:message:baseDate') }}
       </div>
       <!-- <SubjectsForm :data="SubjectInfo" :other-info="otherInfo" @submit="handleSubmit(rowData, true)" /> -->
       <SubjectsForm
@@ -1109,7 +1113,7 @@
         type="border-card"
         :before-leave="
           () => {
-            handleUpload(subjectRowData);
+            handleUpload(subjectRowData)
           }
         "
       >
@@ -1174,7 +1178,7 @@
               :limit.sync="clinicalPage.PageSize"
               @pagination="
                 () => {
-                  handleUpload(subjectRowData);
+                  handleUpload(subjectRowData)
                 }
               "
             />
@@ -1214,7 +1218,7 @@
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.LatestScanDate.split(" ")[0] }}
+                    {{ scope.row.LatestScanDate.split(' ')[0] }}
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -1224,7 +1228,7 @@
                 />
                 <el-table-column prop="" label="是否确认" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{ $fd("YesOrNo", scope.row.IsCRCConfirm) }}
+                    {{ $fd('YesOrNo', scope.row.IsCRCConfirm) }}
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -1274,7 +1278,7 @@
                   :limit.sync="confirmPage.PageSize"
                   @pagination="
                     () => {
-                      handleUpload(subjectRowData);
+                      handleUpload(subjectRowData)
                     }
                   "
                 />
@@ -1340,7 +1344,7 @@
                   }"
                   @click="selectCheckDate(date)"
                 >
-                  {{ date.CheckDate.split(" ")[0] }}
+                  {{ date.CheckDate.split(' ')[0] }}
                 </div>
               </div>
             </div>
@@ -1369,11 +1373,11 @@
       >
         <!-- 取消 -->
         <el-button size="small" type="primary" @click="confirmVisible = false">
-          {{ $t("common:button:cancel") }}
+          {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
         <el-button size="small" type="primary" @click="confirmClinicalData">
-          {{ $t("common:button:confirm") }}
+          {{ $t('common:button:confirm') }}
         </el-button>
       </div>
     </el-dialog>
@@ -1399,9 +1403,9 @@
         :clinical-upload-type="clinicalUploadType"
         :Clinical-data-level="rowData.ClinicalDataLevel"
         @close="
-          preview.visible = false;
-          handleUpload(subjectRowData);
-          handleView(formRow, true);
+          preview.visible = false
+          handleUpload(subjectRowData)
+          handleView(formRow, true)
         "
       />
     </el-dialog>
@@ -1467,42 +1471,39 @@ import {
   verifyCRCRequestToQC,
   deleteSubjectVisit,
   updateSubjectAndSVInfo,
-  getImageClinicalDataToBeDoneList,
   getTrialCriterionList,
   getCRCSubjectClinicalList,
   deleteClinicalForm,
   getCRCConfirmList,
-  getCRCBeConfirmList,
   cRCConfirmClinical,
   cRCCancelConfirmClinical,
   getClinicalTableList,
   getClinicalDateList,
-} from "@/api/trials";
-import { cRCRequestToQC } from "@/api/trials/visit";
-import { cRCVisitList_Export } from "@/api/export";
-import BaseContainer from "@/components/BaseContainer";
-import Pagination from "@/components/Pagination";
-import VisitForm from "./components/visitForm";
-import UploadDicomFiles from "./components/uploadDicomFiles";
-import UploadDicomFiles2 from "./components/uploadDicomFiles2";
-import UploadNonDicomFiles from "./components/uploadNonDicomFiles";
-import UploadClinicalData from "./components/uploadClinicalData";
-import HistoryChat from "./components/historyChat";
-import StudyInfo from "./components/studyInfo";
-import SubjectsForm from "./components/SubjectsForm";
-import SignForm from "@/views/trials/components/newSignForm";
-import BaseModel from "@/components/BaseModel";
-import dicomStore from "@/utils/dicom-store";
-import { getClinicalQuestionFormList } from "@/api/dictionary";
-import moment from "moment";
-import const_ from "@/const/sign-code";
-import { changeURLStatic } from "@/utils/history.js";
-import { getToken } from "@/utils/auth";
-import clinicalDataQuestions from "@/components/clinicalDataQuestions";
+} from '@/api/trials'
+import { cRCRequestToQC } from '@/api/trials/visit'
+import { cRCVisitList_Export } from '@/api/export'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import VisitForm from './components/visitForm'
+import UploadDicomFiles from './components/uploadDicomFiles'
+import UploadDicomFiles2 from './components/uploadDicomFiles2'
+import UploadNonDicomFiles from './components/uploadNonDicomFiles'
+import UploadClinicalData from './components/uploadClinicalData'
+import HistoryChat from './components/historyChat'
+import StudyInfo from './components/studyInfo'
+import SubjectsForm from './components/SubjectsForm'
+import SignForm from '@/views/trials/components/newSignForm'
+import BaseModel from '@/components/BaseModel'
+import dicomStore from '@/utils/dicom-store'
+import { getClinicalQuestionFormList } from '@/api/dictionary'
+import moment from 'moment'
+import const_ from '@/const/sign-code'
+import { changeURLStatic } from '@/utils/history.js'
+import clinicalDataQuestions from '@/components/clinicalDataQuestions'
 const searchDataDefault = () => {
   return {
-    SubjectInfo: "",
-    TrialSiteId: "",
+    SubjectInfo: '',
+    TrialSiteId: '',
     PageIndex: 1,
     PageSize: 20,
     VisitPlanArray: [],
@@ -1511,10 +1512,10 @@ const searchDataDefault = () => {
     ChallengeState: null,
     // SortField: '',
     // Asc: false
-  };
-};
+  }
+}
 export default {
-  name: "VisitList",
+  name: 'VisitList',
   components: {
     clinicalDataQuestions,
     BaseContainer,
@@ -1532,7 +1533,7 @@ export default {
   },
   data() {
     return {
-      edit_cfg: { visible: false, title: "", width: "600px", showClose: true },
+      edit_cfg: { visible: false, title: '', width: '600px', showClose: true },
       SubjectVisible: false,
       formRow: {},
       searchData: searchDataDefault(),
@@ -1545,25 +1546,25 @@ export default {
       visitPlanOptions: [],
       rowData: {},
       moment,
-      activeName: "dicom",
+      activeName: 'dicom',
       studyVisible: false,
       studyLoading: false,
       studyList: [],
       deleteArr: [],
-      currentVisitId: "",
+      currentVisitId: '',
       urgentForm: { isUrgent: null },
       btnLoading: false,
-      chat_cfg: { visible: false, title: "", width: "1000px", showClose: true },
+      chat_cfg: { visible: false, title: '', width: '1000px', showClose: true },
       relationVisible: false,
       otherInfo: {},
       SubjectInfo: {},
       selectArr: [],
       signVisible: false,
       signCode: null,
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       pickerOption: {
         disabledDate: (time) => {
-          return time.getTime() > Date.now();
+          return time.getTime() > Date.now()
         },
       },
       trialId: this.$route.query.trialId,
@@ -1585,17 +1586,17 @@ export default {
       pos2: 0,
       spanArr2: 0,
       confirmData: [],
-      preview: { visible: false, title: "临床数据自定义问题" },
-      preview2: { visible: false, title: "已上传临床数据列表" },
-      openType: "look",
+      preview: { visible: false, title: '临床数据自定义问题' },
+      preview2: { visible: false, title: '已上传临床数据列表' },
+      openType: 'look',
       formListData: {},
       confirmVisible: false,
       subjectRowData: {},
       beConfirmList: [],
       cdList: [],
       trialCriterionList: [],
-      TrialReadingCriterionId: "0",
-      confirmType: "look",
+      TrialReadingCriterionId: '0',
+      confirmType: 'look',
       confirmPageTotal: 0,
       clinicalPageTotal: 0,
       clinicalPage: {
@@ -1608,65 +1609,65 @@ export default {
       },
       TrialReadingCriterionName: null,
       TrialCode: null,
-    };
+    }
   },
   watch: {
     list() {
       this.$nextTick(() => {
-        this.$refs.visitList.doLayout();
-      });
+        this.$refs.visitList.doLayout()
+      })
     },
     TrialReadingCriterionId(v, old) {
-      if (v === "0") return;
-      if (old === "0" || old === null) {
-        this.handleUpload2(this.subjectRowData, true);
+      if (v === '0') return
+      if (old === '0' || old === null) {
+        this.handleUpload2(this.subjectRowData, true)
       } else {
-        this.handleUpload2(this.subjectRowData);
+        this.handleUpload2(this.subjectRowData)
       }
       // if (v === '0') return
       this.TrialReadingCriterionName = this.trialCriterionList.find(
         (o) => v === o.TrialReadingCriterionId
-      ).TrialReadingCriterionName;
+      ).TrialReadingCriterionName
       // this.handleUpload2(this.subjectRowData)
     },
     uploadVisible() {
       if (!this.uploadVisible) {
-        this.$store.state.trials.checkTaskId = null;
+        this.$store.state.trials.checkTaskId = null
       }
     },
   },
   mounted() {
-    this.getSite();
+    this.getSite()
     if (this.$route.query.subjectCode) {
-      this.searchData.SubjectInfo = this.$route.query.subjectCode;
+      this.searchData.SubjectInfo = this.$route.query.subjectCode
     }
-    changeURLStatic("subjectCode", "");
-    this.TrialCode = this.$route.query.trialCode;
-    this.getList();
-    this.getVisitPlanOptions();
-    this.getTrialCriterionList();
+    changeURLStatic('subjectCode', '')
+    this.TrialCode = this.$route.query.trialCode
+    this.getList()
+    this.getVisitPlanOptions()
+    this.getTrialCriterionList()
   },
   methods: {
     selectCheckDate(date) {
-      this.isShow = false;
-      this.selected.ClinicalFormId = date.ClinicalFormId;
-      this.selected.ClinicalDataTrialSetId = date.ClinicalDataTrialSetId;
-      this.selected.TrialId = this.subjectRowData.TrialId;
-      this.selected.SubjectId = this.subjectRowData.SubjectId;
+      this.isShow = false
+      this.selected.ClinicalFormId = date.ClinicalFormId
+      this.selected.ClinicalDataTrialSetId = date.ClinicalDataTrialSetId
+      this.selected.TrialId = this.subjectRowData.TrialId
+      this.selected.SubjectId = this.subjectRowData.SubjectId
       this.$nextTick(() => {
-        this.isShow = true;
-      });
+        this.isShow = true
+      })
     },
     getTrialCriterionList(row) {
-      this.TrialReadingCriterionId = "0";
+      this.TrialReadingCriterionId = '0'
       getTrialCriterionList(this.trialId, false)
         .then(async (res) => {
-          this.trialCriterionList = res.Result;
+          this.trialCriterionList = res.Result
           this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId;
+            this.trialCriterionList[0].TrialReadingCriterionId
           // this.handleUpload2(this.subjectRowData)
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     confirmClinicalData() {
       cRCConfirmClinical({
@@ -1674,120 +1675,120 @@ export default {
         SubjectId: this.rowData.SubjectId,
         ReadModuleId: this.rowData.ReadModuleId,
       }).then((res) => {
-        this.$message.success("确认成功");
-        this.handleUpload2(this.subjectRowData);
-        this.confirmVisible = false;
-      });
+        this.$message.success('确认成功')
+        this.handleUpload2(this.subjectRowData)
+        this.confirmVisible = false
+      })
     },
     handleUnConfirm(row) {
-      this.rowData = { ...row };
-      this.$confirm("确定撤销确认吗？").then((res) => {
+      this.rowData = { ...row }
+      this.$confirm('确定撤销确认吗？').then((res) => {
         cRCCancelConfirmClinical({
           TrialId: this.subjectRowData.TrialId,
           ReadModuleId: row.ReadModuleId,
         }).then((res) => {
-          this.$message.success("撤销成功");
-          this.handleUpload2(this.subjectRowData);
-        });
-      });
+          this.$message.success('撤销成功')
+          this.handleUpload2(this.subjectRowData)
+        })
+      })
     },
     getCRCBeConfirmList(row, type) {
-      this.rowData = { ...row };
-      this.confirmVisible = true;
-      this.confirmType = type;
-      this.IsHaveTableQuestion = this.rowData.IsHaveTableQuestion;
+      this.rowData = { ...row }
+      this.confirmVisible = true
+      this.confirmType = type
+      this.IsHaveTableQuestion = this.rowData.IsHaveTableQuestion
       if (!this.rowData.IsHaveTableQuestion) {
         getClinicalTableList({
           TrialId: this.subjectRowData.TrialId,
           ReadModuleId: row.ReadModuleId,
         }).then((res) => {
-          this.beConfirmList = res.Result;
-        });
+          this.beConfirmList = res.Result
+        })
       } else {
         getClinicalDateList({
           TrialId: this.subjectRowData.TrialId,
           ReadModuleId: row.ReadModuleId,
         }).then((res) => {
-          this.cdList = res.Result;
+          this.cdList = res.Result
           this.selected.ClinicalFormId =
-            this.cdList[0].DateList[0].ClinicalFormId;
+            this.cdList[0].DateList[0].ClinicalFormId
           this.selected.ClinicalDataTrialSetId =
-            this.cdList[0].DateList[0].ClinicalDataTrialSetId;
-          this.selected.TrialId = this.subjectRowData.TrialId;
-          this.selected.SubjectId = this.subjectRowData.SubjectId;
-          this.isShow = true;
-          console.log(res);
-        });
+            this.cdList[0].DateList[0].ClinicalDataTrialSetId
+          this.selected.TrialId = this.subjectRowData.TrialId
+          this.selected.SubjectId = this.subjectRowData.SubjectId
+          this.isShow = true
+          console.log(res)
+        })
       }
     },
     handleView2(row) {
-      console.log(row);
-      this.rowData = { ...row };
-      this.openType = "look";
-      this.preview.visible = true;
+      console.log(row)
+      this.rowData = { ...row }
+      this.openType = 'look'
+      this.preview.visible = true
     },
     handleEdit2(row) {
-      this.rowData = { ...row };
-      this.openType = "edit";
-      this.preview.visible = true;
+      this.rowData = { ...row }
+      this.openType = 'edit'
+      this.preview.visible = true
     },
     handleDelete2(row) {
-      this.$confirm("确定删除该条临床数据记录吗？").then(() => {
-        this.listLoading = true;
+      this.$confirm('确定删除该条临床数据记录吗？').then(() => {
+        this.listLoading = true
         deleteClinicalForm({
           ClinicalFormId: row.ClinicalFormId,
         }).then((res) => {
-          this.$message.success("删除成功");
-          this.listLoading = false;
-          this.handleView(row);
-        });
-      });
+          this.$message.success('删除成功')
+          this.listLoading = false
+          this.handleView(row)
+        })
+      })
     },
     handleAdd2(row) {
-      this.rowData = { ...row };
-      this.clinicalUploadType = this.rowData.ClinicalUploadType;
-      this.ReadingClinicalDataId = this.rowData.ReadingClinicalDataId;
-      this.preview.visible = true;
-      this.preview.title = `录入临床数据(${this.subjectRowData.TrialCode}|${this.rowData.SubjectCode})`;
-      this.openType = "add";
+      this.rowData = { ...row }
+      this.clinicalUploadType = this.rowData.ClinicalUploadType
+      this.ReadingClinicalDataId = this.rowData.ReadingClinicalDataId
+      this.preview.visible = true
+      this.preview.title = `录入临床数据(${this.subjectRowData.TrialCode}|${this.rowData.SubjectCode})`
+      this.openType = 'add'
     },
     goVisit(row) {
       this.$router.push({
         path: `/trials/trials-panel/visit/crc-upload?trialId=${row.TrialId}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}`,
-      });
+      })
     },
     handleView(row, isOpen) {
-      this.rowData = { ...row };
-      this.formRow = { ...row };
-      this.clinicalUploadType = this.rowData.ClinicalUploadType;
-      this.listLoading = true;
+      this.rowData = { ...row }
+      this.formRow = { ...row }
+      this.clinicalUploadType = this.rowData.ClinicalUploadType
+      this.listLoading = true
       getClinicalQuestionFormList({
         TrialId: row.TrialId,
         SubjectId: row.SubjectId,
         ClinicalDataTrialSetId: row.ClinicalDataTrialSetId,
       }).then((res) => {
         if (!isOpen) {
-          this.preview2.visible = true;
-          this.preview2.title = `已上传临床数据列表(${this.TrialCode}|${this.rowData.SubjectCode})`;
+          this.preview2.visible = true
+          this.preview2.title = `已上传临床数据列表(${this.TrialCode}|${this.rowData.SubjectCode})`
         }
-        this.listLoading = false;
-        this.QuestionList = res.Result.QuestionList;
-        this.AnswerList = res.Result.AnswerList;
-      });
+        this.listLoading = false
+        this.QuestionList = res.Result.QuestionList
+        this.AnswerList = res.Result.AnswerList
+      })
     },
     getSpanArr(data) {
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
-          this.spanArr.push(1);
-          this.pos = 0;
+          this.spanArr.push(1)
+          this.pos = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].SubjectId === data[i - 1].SubjectId) {
-            this.spanArr[this.pos] += 1;
-            this.spanArr.push(0);
+            this.spanArr[this.pos] += 1
+            this.spanArr.push(0)
           } else {
-            this.spanArr.push(1);
-            this.pos = i;
+            this.spanArr.push(1)
+            this.pos = i
           }
         }
       }
@@ -1795,33 +1796,33 @@ export default {
     getSpanArr2(data) {
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
-          this.spanArr2.push(1);
-          this.pos2 = 0;
+          this.spanArr2.push(1)
+          this.pos2 = 0
         } else {
           // 判断当前元素与上一个元素是否相同
           if (data[i].SubjectId === data[i - 1].SubjectId) {
-            this.spanArr2[this.pos2] += 1;
-            this.spanArr2.push(0);
+            this.spanArr2[this.pos2] += 1
+            this.spanArr2.push(0)
           } else {
-            this.spanArr2.push(1);
-            this.pos2 = i;
+            this.spanArr2.push(1)
+            this.pos2 = i
           }
         }
       }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
-        const _row = this.spanArr[rowIndex];
-        const _col = _row > 0 ? 1 : 0;
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
         return {
           rowspan: _row,
           colspan: _col,
-        };
+        }
       }
     },
     handleUpload2(row, old) {
-      this.listLoading = true;
-      this.rowData = { ...row };
+      this.listLoading = true
+      this.rowData = { ...row }
       getCRCConfirmList({
         TrialId: this.trialId,
         IsPMConfirm: false,
@@ -1829,94 +1830,94 @@ export default {
         PageIndex: this.confirmPage.PageIndex,
         PageSize: this.confirmPage.PageSize,
       }).then((res) => {
-        this.spanArr2 = [];
-        this.pos2 = 0;
+        this.spanArr2 = []
+        this.pos2 = 0
         if (!old) {
-          this.configVisible = true;
+          this.configVisible = true
         }
-        this.confirmData = res.Result.CurrentPageData;
-        this.confirmPageTotal = res.Result.TotalCount;
-        this.getSpanArr2(this.confirmData);
-        this.listLoading = false;
-      });
+        this.confirmData = res.Result.CurrentPageData
+        this.confirmPageTotal = res.Result.TotalCount
+        this.getSpanArr2(this.confirmData)
+        this.listLoading = false
+      })
     },
     handleUpload(row) {
-      this.listLoading = true;
-      this.rowData = { ...row };
-      this.subjectRowData = { ...row };
+      this.listLoading = true
+      this.rowData = { ...row }
+      this.subjectRowData = { ...row }
       getCRCSubjectClinicalList({
         TrialId: this.trialId,
         PageIndex: this.clinicalPage.PageIndex,
         PageSize: this.clinicalPage.PageSize,
       }).then((res) => {
-        this.spanArr = [];
-        this.pos = 0;
-        this.configVisible = true;
-        this.clinicalData = res.Result.CurrentPageData;
-        this.clinicalPageTotal = res.Result.TotalCount;
-        this.getSpanArr(this.clinicalData);
-        this.listLoading = false;
-      });
-      this.getTrialCriterionList(row);
+        this.spanArr = []
+        this.pos = 0
+        this.configVisible = true
+        this.clinicalData = res.Result.CurrentPageData
+        this.clinicalPageTotal = res.Result.TotalCount
+        this.getSpanArr(this.clinicalData)
+        this.listLoading = false
+      })
+      this.getTrialCriterionList(row)
     },
     handleExport() {
       cRCVisitList_Export(this.searchData)
         .then((res) => {})
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 获取访视计划列表
     getList() {
-      this.loading = true;
-      this.searchData.TrialId = this.trialId;
+      this.loading = true
+      this.searchData.TrialId = this.trialId
       getCRCVisitList(this.searchData)
         .then((res) => {
-          this.loading = false;
-          this.list = res.Result.CurrentPageData;
-          this.total = res.Result.TotalCount;
-          this.otherInfo = res.OtherInfo;
-          console.log(this.otherInfo);
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.otherInfo = res.OtherInfo
+          console.log(this.otherInfo)
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 新建计划外的访视信息
     handleAdd() {
-      this.rowData = {};
-      this.edit_cfg.title = this.$t("trials:crcUpload:dialogTitle:new");
-      this.edit_cfg.visible = true;
+      this.rowData = {}
+      this.edit_cfg.title = this.$t('trials:crcUpload:dialogTitle:new')
+      this.edit_cfg.visible = true
     },
     // 编辑访视信息
     handleEdit(row) {
-      this.rowData = row;
-      this.edit_cfg.title = this.$t("trials:crcUpload:dialogTitle:edit");
-      this.edit_cfg.visible = true;
+      this.rowData = row
+      this.edit_cfg.title = this.$t('trials:crcUpload:dialogTitle:edit')
+      this.edit_cfg.visible = true
     },
     closeEditDialog() {
-      this.edit_cfg.visible = false;
+      this.edit_cfg.visible = false
     },
     // 上传Dicoms/非Dicoms文件
     CRChandleUpload(row) {
-      dicomStore.studyList = [];
-      this.activeName = "dicom";
-      this.rowData = { ...row };
-      this.$store.state.trials.checkTaskId = row.Id;
-      this.uploadVisible = true;
-      this.uploadVisible2 = false;
+      dicomStore.studyList = []
+      this.activeName = 'dicom'
+      this.rowData = { ...row }
+      this.$store.state.trials.checkTaskId = row.Id
+      this.uploadVisible = true
+      this.uploadVisible2 = false
     },
     CRChandleUpload2(row) {
-      dicomStore.studyList = [];
-      this.activeName = "dicom";
-      this.rowData = { ...row };
-      this.$store.state.trials.checkTaskId = row.Id;
-      this.uploadVisible = true;
-      this.uploadVisible2 = true;
+      dicomStore.studyList = []
+      this.activeName = 'dicom'
+      this.rowData = { ...row }
+      this.$store.state.trials.checkTaskId = row.Id
+      this.uploadVisible = true
+      this.uploadVisible2 = true
     },
     // 将影像提交给QC
     handleSubmit(row) {
-      this.rowData = { ...row };
+      this.rowData = { ...row }
       // if (row.IsBaseLine) {
       //   if (this.otherInfo.ClinicalInformationTransmissionEnum > 0) {
       //     const { ClinicalDataConfirmation } = const_.processSignature
@@ -1927,317 +1928,316 @@ export default {
       //   }
       // } else {
       // 校验是否可提交
-      this.verifyIsAllowSubmit();
+      this.verifyIsAllowSubmit()
       // }
     },
     verifyIsAllowSubmit() {
-      this.loading = true;
+      this.loading = true
       var param = {
         trialId: this.trialId,
         subjectVisitIds: [this.rowData.Id],
-      };
+      }
       verifyCRCRequestToQC(param)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            let text = this.$t("trials:crcUpload:message:submit");
+            let text = this.$t('trials:crcUpload:message:submit')
             if (this.rowData.IsHaveUploadFailed) {
-              text = `<div>${this.$t("trials:crcUpload:message:submit")}</div>`;
+              text = `<div>${this.$t('trials:crcUpload:message:submit')}</div>`
             }
             this.$confirm(text, {
               dangerouslyUseHTMLString: true,
-              type: "warning",
+              type: 'warning',
               distinguishCancelAndClose: true,
             })
               .then(() => {
                 if (this.rowData.IsBaseLine) {
                   if (this.otherInfo.ClinicalInformationTransmissionEnum > 0) {
-                    const { ClinicalDataConfirmation } =
-                      const_.processSignature;
-                    this.signCode = ClinicalDataConfirmation;
-                    this.signVisible = true;
+                    const { ClinicalDataConfirmation } = const_.processSignature
+                    this.signCode = ClinicalDataConfirmation
+                    this.signVisible = true
                   } else {
-                    this.submit();
+                    this.submit()
                   }
                 } else {
-                  this.checkNeedSignAndSubmit();
+                  this.checkNeedSignAndSubmit()
                 }
               })
-              .catch(() => {});
+              .catch(() => {})
           }
         })
         .catch((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.Result === 1) {
             this.$confirm(res.ErrorMessage, {
               showCancelButton: false,
               showConfirmButton: false,
-              type: "warning",
-            });
+              type: 'warning',
+            })
           } else if (res.Result === 0) {
             this.$confirm(res.ErrorMessage, {
               distinguishCancelAndClose: true,
-              type: "warning",
+              type: 'warning',
             })
               .then(() => {
-                this.checkNeedSignAndSubmit();
+                this.checkNeedSignAndSubmit()
               })
-              .catch(() => {});
+              .catch(() => {})
           }
-        });
+        })
     },
     checkNeedSignAndSubmit() {
       if (
         this.otherInfo.IsHaveFirstGiveMedicineDate &&
         (this.rowData.SubjectFirstGiveMedicineTime === null ||
-          this.rowData.SubjectFirstGiveMedicineTime === "") &&
+          this.rowData.SubjectFirstGiveMedicineTime === '') &&
         !this.rowData.IsBaseLine
       ) {
-        var item = Object.assign({}, this.rowData);
-        item.Code = this.rowData.SubjectCode;
-        item.Id = this.rowData.SubjectId;
-        this.SubjectInfo = item;
-        this.SubjectVisible = true;
+        var item = Object.assign({}, this.rowData)
+        item.Code = this.rowData.SubjectCode
+        item.Id = this.rowData.SubjectId
+        this.SubjectInfo = item
+        this.SubjectVisible = true
       } else {
         if (
           this.otherInfo.ClinicalInformationTransmissionEnum > 0 &&
           this.rowData.IsBaseLine
         ) {
-          const { ClinicalDataConfirmation } = const_.processSignature;
-          this.signCode = ClinicalDataConfirmation;
-          this.signVisible = true;
+          const { ClinicalDataConfirmation } = const_.processSignature
+          this.signCode = ClinicalDataConfirmation
+          this.signVisible = true
         } else {
-          this.submit();
+          this.submit()
         }
       }
     },
     submitFirstGiveMedicineTime(firstGiveMedicineTime) {
-      this.rowData.SubjectFirstGiveMedicineTime = firstGiveMedicineTime;
-      this.SubjectVisible = false;
-      this.checkNeedSignAndSubmit();
+      this.rowData.SubjectFirstGiveMedicineTime = firstGiveMedicineTime
+      this.SubjectVisible = false
+      this.checkNeedSignAndSubmit()
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.submit(signInfo);
+        this.submit(signInfo)
       } else {
-        this.signVisible = false;
+        this.signVisible = false
       }
     },
     submit(signInfo) {
-      this.loading = true;
+      this.loading = true
       var params = {
         data: { trialId: this.trialId, subjectVisitIds: [this.rowData.Id] },
-      };
+      }
       if (signInfo) {
-        params.signInfo = signInfo;
+        params.signInfo = signInfo
       }
       cRCRequestToQC(params)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
             if (signInfo) {
-              this.$refs["signForm"].btnLoading = false;
-              this.signVisible = false;
+              this.$refs['signForm'].btnLoading = false
+              this.signVisible = false
             }
-            this.getList();
+            this.getList()
             this.$message.success(
-              this.$t("trials:crcUpload:message:submittedSuccessfully")
-            );
+              this.$t('trials:crcUpload:message:submittedSuccessfully')
+            )
           }
         })
         .catch((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.Result === 3) {
-            this.getList();
-            this.signVisible = false;
+            this.getList()
+            this.signVisible = false
             this.$confirm(res.ErrorMessage, {
               showCancelButton: false,
               showConfirmButton: true,
-              type: "warning",
-            });
+              type: 'warning',
+            })
           } else {
             if (signInfo) {
-              this.$refs["signForm"].btnLoading = false;
+              this.$refs['signForm'].btnLoading = false
             }
           }
-        });
+        })
     },
     // 将影像批量提交给QC
     handleBulkSubmit() {
-      this.$confirm(this.$t("trials:crcUpload:message:bulkSubmit"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:crcUpload:message:bulkSubmit'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.loading = true;
+          this.loading = true
           var params = {
             data: { trialId: this.trialId, subjectVisitIds: this.selectArr },
-          };
+          }
           cRCRequestToQC(params)
             .then((res) => {
               if (res.IsSuccess) {
-                this.getList();
+                this.getList()
                 this.$message.success(
-                  this.$t("trials:crcUpload:message:submittedSuccessfully")
-                );
+                  this.$t('trials:crcUpload:message:submittedSuccessfully')
+                )
               }
             })
             .catch((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.Result === 3) {
                 this.$confirm(res.ErrorMessage, {
                   showCancelButton: false,
                   showConfirmButton: true,
-                  type: "warning",
-                });
+                  type: 'warning',
+                })
               }
-              this.getList();
-            });
+              this.getList()
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     // 获取某个访视下的检查信息
     handleOpenStudyDialog(row) {
-      this.studyVisible = true;
-      this.currentVisitId = row.Id;
-      this.rowData = { ...row };
+      this.studyVisible = true
+      this.currentVisitId = row.Id
+      this.rowData = { ...row }
     },
     // 关闭上传弹框
     closeUpload() {
-      this.uploadVisible = false;
-      this.$store.state.trials.checkTaskId = null;
+      this.uploadVisible = false
+      this.$store.state.trials.checkTaskId = null
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
     },
     // 打开历史质疑记录
     handleOpenHistoryChat(row) {
-      this.rowData = { ...row };
+      this.rowData = { ...row }
       this.chat_cfg.title = `${this.$t(
-        "trials:crcUpload:dialogTitle:qsRecord"
-      )} (${row.SubjectCode} ${row.VisitName})`;
-      this.chat_cfg.visible = true;
+        'trials:crcUpload:dialogTitle:qsRecord'
+      )} (${row.SubjectCode} ${row.VisitName})`
+      this.chat_cfg.visible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm(this.$t("trials:crcUpload:message:deleteVisit"), {
-        type: "warning",
+      this.$confirm(this.$t('trials:crcUpload:message:deleteVisit'), {
+        type: 'warning',
         distinguishCancelAndClose: true,
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         deleteSubjectVisit(this.trialId, row.Id)
           .then((res) => {
             if (res.IsSuccess) {
               // this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-              this.getList();
+              this.getList()
               this.$message.success(
-                this.$t("trials:crcUpload:message:deleteVisitSuccessfully")
-              );
+                this.$t('trials:crcUpload:message:deleteVisitSuccessfully')
+              )
             }
-            this.loading = false;
+            this.loading = false
           })
           .catch(() => {
-            this.loading = false;
-          });
-      });
+            this.loading = false
+          })
+      })
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault();
-      this.getList();
+      this.searchData = searchDataDefault()
+      this.getList()
     },
     closeSubjectVisible() {
-      this.SubjectVisible = false;
+      this.SubjectVisible = false
     },
     // 查询
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     // 获取site下拉框数据
     getSite() {
       getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+        this.siteOptions = res.Result
+      })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
       getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result;
-      });
+        this.visitPlanOptions = res.Result
+      })
     },
     // 保存关联信息
     saveRelationInfo() {
-      this.btnLoading = true;
+      this.btnLoading = true
       const param = {
         subjectVisitId: this.rowData.Id,
         subjectId: this.rowData.SubjectId,
         pdState: this.rowData.PDState,
         isEnrollmentConfirm: this.rowData.IsEnrollmentConfirm,
         subjectFirstGiveMedicineTime: this.rowData.SubjectFirstGiveMedicineTime,
-      };
+      }
       updateSubjectAndSVInfo(this.trialId, param)
         .then((res) => {
-          this.btnLoading = false;
-          this.$message.success(this.$t("common:message:savedSuccessfully"));
-          this.relationVisible = false;
-          this.getList();
+          this.btnLoading = false
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.relationVisible = false
+          this.getList()
         })
         .catch(() => {
-          this.btnLoading = false;
-        });
+          this.btnLoading = false
+        })
     },
     // 通过提交状态决定该行的 CheckBox 是否可以勾选
     handleSelectTable(row) {
       if (this.otherInfo.ClinicalInformationTransmissionEnum > 0) {
         return (
           row.SubmitState === 1 && row.IsBaseLine === false && row.PDState === 0
-        );
+        )
       } else {
-        return row.SubmitState === 1 && row.PDState === 1; // 待提交
+        return row.SubmitState === 1 && row.PDState === 1 // 待提交
       }
     },
     // 当选择项发生变化时会触发该事件
     handleSelectionChange(val) {
-      const arr = [];
+      const arr = []
       for (let index = 0; index < val.length; index++) {
-        arr.push(val[index].Id);
+        arr.push(val[index].Id)
       }
-      this.selectArr = arr;
+      this.selectArr = arr
     },
     beforeCloseUploadDig(done) {
-      this.$store.state.trials.checkTaskId = null;
+      this.$store.state.trials.checkTaskId = null
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-      done();
+      done()
     },
     beforeCloseStudyDig(done) {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-      done();
+      done()
     },
     setOpenWindow(window) {
       if (this.openWindow) {
-        this.openWindow.close();
+        this.openWindow.close()
       }
-      this.openWindow = window;
+      this.openWindow = window
     },
   },
-};
+}
 </script>
 <style lang="scss">
 .visit-list {
@@ -2283,4 +2283,12 @@ export default {
     font-size: 12px;
   }
 }
+.tip {
+  display: flex;
+  align-items: flex-start;
+  margin: 3px 0;
+  i {
+    margin: 3px 5px 0 0;
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
index 9a234dd3..4b8308c3 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
@@ -13,7 +13,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
         </div>
 
@@ -23,7 +23,7 @@
               <span style="font-weight:700;">{{ record.CreateUserName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
-            <div class="info-content" v-html="record.TalkContent" />
+            <div class="info-content" v-html="formattedText(record.TalkContent)" />
           </div>
           <!-- <img :src="record.headUrl"> -->
           <img v-if="record.UserTypeEnum*1 === 8" :src="adminAvatar" alt="Admin">
@@ -153,6 +153,9 @@ export default {
     close() {
       this.$emit('close')
     },
+    formattedText(text) {
+      return text.replace(/\n/g, '<br>')
+    },
     // 初始化聊天信息
     getMessageList() {
       var recordContent = []
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue b/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
index 3cd5b590..8857bb8e 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/manuals.vue
@@ -21,7 +21,7 @@
     </div>
     <div class="right-wrapper">
       <div class="right-content">
-        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}`" width="100%" height="100%" frameborder="0" />
+        <iframe v-if="selected.filePath" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${selected.filePath}?userName=${currentUser}&COMPANY=${COMPANY}`" width="100%" height="100%" frameborder="0" />
       </div>
     </div>
   </div>
@@ -44,7 +44,8 @@ export default {
       },
       fileList: [],
       loading: false,
-      currentUser: zzSessionStorage.getItem('userName')
+      currentUser: zzSessionStorage.getItem('userName'),
+      COMPANY:process.env.VUE_APP_COMPANY_NAME
     }
   },
   mounted() {
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 5fcafff5..274695a3 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -6,7 +6,7 @@
         style="position: absolute; right: 20px; top: 10px; z-index: 9"
       >
         <el-button type="text" @click="openManuals">{{
-          $t("trials:reading:button:handbooks")
+          $t('trials:reading:button:handbooks')
         }}</el-button>
       </div>
       <!-- 所有检查信息 -->
@@ -21,7 +21,7 @@
             <el-row>
               <el-col :span="12">
                 <!-- 检查信息 -->
-                <h3>{{ $t("trials:audit:title:dicoms") }}</h3>
+                <h3>{{ $t('trials:audit:title:dicoms') }}</h3>
               </el-col>
               <el-col :span="12">
                 <div
@@ -30,34 +30,50 @@
                 >
                   <!-- 访视窗口期 -->
                   <h4>
-                    {{ $t("trials:audit:tip:visitWindow") }}:
+                    {{ $t('trials:audit:tip:visitWindow') }}:
                     <span v-if="!!baseDate" style="font-weight: normal">
                       {{ `${upperLimit}~${lowerLimit}` }}
                     </span>
                     <!-- 访视基准日期或窗口未设置 -->
                     <span v-else>{{
-                      $t("trials:audit:tip:visitWindowNotSet")
+                      $t('trials:audit:tip:visitWindowNotSet')
                     }}</span>
                   </h4>
                 </div>
               </el-col>
             </el-row>
             <div style="text-align: right; position: relative">
-              <div
+              <!-- <div
                 class="uploadTip"
                 style="position: absolute; top: 0; left: 10px"
               >
                 {{ $store.state.trials.uploadTip }}
-              </div>
+              </div> -->
+              <el-tooltip
+                v-if="
+                  $store.state.trials.config.IsSupportQCDownloadImage &&
+                  !hasPermi(['role:spm'])
+                "
+                :content="$t('trials:download:tip:message')"
+                placement="top-end"
+                effect="light"
+              >
+                <i class="el-icon-warning-outline" style="font-size: 18px"></i>
+              </el-tooltip>
               <!-- 下载所有影像 -->
               <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage&&!hasPermi(['role:spm'])"
+                v-if="
+                  $store.state.trials.config.IsSupportQCDownloadImage &&
+                  !hasPermi(['role:spm'])
+                "
+                :loading="downloading"
+                :disabled="selectTableDicom.length <= 0"
                 size="small"
                 type="primary"
                 style="margin-left: 10px"
-                @click="downloadImage(true)"
+                @click="getCRCUploadedStudyInfo('dicom')"
               >
-                {{ $t("trials:audit:button:downLoadAllDiocms") }}
+                {{ $t('trials:audit:button:downLoadAllDiocms') }}
               </el-button>
               <!-- 预览所有影像 -->
               <el-button
@@ -66,7 +82,7 @@
                 style="margin-left: 10px"
                 @click="handleViewImages"
               >
-                {{ $t("trials:audit:button:previewAllDiocms") }}
+                {{ $t('trials:audit:button:previewAllDiocms') }}
               </el-button>
               <!-- 预览阅片影像 -->
               <el-button
@@ -75,10 +91,15 @@
                 style="margin-left: 10px"
                 @click="handleViewReadingImages"
               >
-                {{ $t("trials:audit:button:previewReadingDiocms") }}
+                {{ $t('trials:audit:button:previewReadingDiocms') }}
               </el-button>
             </div>
-            <el-table :data="studyList" :row-class-name="tableRowClassName">
+            <el-table
+              :data="studyList"
+              :row-class-name="tableRowClassName"
+              @selection-change="handleSelectionChangeDicom"
+            >
+              <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
               <el-table-column
                 prop="StudyCode"
@@ -142,8 +163,8 @@
 
                   <span>{{
                     scope.row.StudyTime
-                      ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
-                      : ""
+                      ? moment(scope.row.StudyTime).format('YYYY-MM-DD')
+                      : ''
                   }}</span>
                 </template>
               </el-table-column>
@@ -183,7 +204,7 @@
               </el-table-column>
             </el-table>
             <!-- 序列信息 -->
-            <h3>{{ $t("trials:audit:title:series") }}</h3>
+            <h3>{{ $t('trials:audit:title:series') }}</h3>
             <el-table :data="seriesList" :row-class-name="tableRowClassName">
               <!-- 序列号 -->
               <el-table-column
@@ -215,8 +236,8 @@
                 <template slot-scope="scope">
                   {{
                     scope.row.StudyTime
-                      ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
-                      : ""
+                      ? moment(scope.row.StudyTime).format('YYYY-MM-DD')
+                      : ''
                   }}
                 </template>
               </el-table-column>
@@ -279,7 +300,7 @@
             <el-row>
               <!-- 检查信息 -->
               <el-col :span="12"
-                ><h3>{{ $t("trials:audit:title:nonDicomsTitle") }}</h3></el-col
+                ><h3>{{ $t('trials:audit:title:nonDicomsTitle') }}</h3></el-col
               >
               <el-col :span="12">
                 <div
@@ -288,34 +309,50 @@
                 >
                   <!-- 访视窗口期 -->
                   <h4>
-                    {{ $t("trials:audit:tip:nonDicomsVisitWindow") }}:
+                    {{ $t('trials:audit:tip:nonDicomsVisitWindow') }}:
                     <span v-if="!!baseDate" style="font-weight: normal">
                       {{ `${upperLimit}~${lowerLimit}` }}
                     </span>
                     <!-- 访视基准日期或窗口未设置 -->
                     <span v-else>{{
-                      $t("trials:audit:tip:visitWindowNotSet")
+                      $t('trials:audit:tip:visitWindowNotSet')
                     }}</span>
                   </h4>
                 </div>
               </el-col>
             </el-row>
             <div style="text-align: right; position: relative">
-              <div
+              <!-- <div
                 class="uploadTip"
                 style="position: absolute; top: 0; left: 10px"
               >
                 {{ $store.state.trials.uploadTip }}
-              </div>
+              </div> -->
+              <el-tooltip
+                v-if="
+                  $store.state.trials.config.IsSupportQCDownloadImage &&
+                  !hasPermi(['role:spm'])
+                "
+                :content="$t('trials:download:tip:message')"
+                placement="top-end"
+                effect="light"
+              >
+                <i class="el-icon-warning-outline" style="font-size: 18px"></i>
+              </el-tooltip>
               <!-- 下载所有影像 -->
               <el-button
-                v-if="$store.state.trials.config.IsSupportQCDownloadImage&&!hasPermi(['role:spm'])"
+                v-if="
+                  $store.state.trials.config.IsSupportQCDownloadImage &&
+                  !hasPermi(['role:spm'])
+                "
+                :loading="downloading"
+                :disabled="selectTableNonedicom.length <= 0"
                 size="small"
                 type="primary"
                 style="margin-left: 10px"
-                @click="downloadImage(false)"
+                @click="getCRCUploadedStudyInfo('noneDicom')"
               >
-                {{ $t("trials:audit:button:downLoadAllNonDiocms") }}
+                {{ $t('trials:audit:button:downLoadAllNonDiocms') }}
               </el-button>
               <!-- 预览 -->
               <el-button
@@ -325,10 +362,14 @@
                 style="margin-left: 10px"
                 @click="handleViewAllNoneDicoms"
               >
-                {{ $t("trials:audit:tip:nonDicomsPreviewAll") }}
+                {{ $t('trials:audit:tip:nonDicomsPreviewAll') }}
               </el-button>
             </div>
-            <el-table :data="noneDicomStudyList">
+            <el-table
+              :data="noneDicomStudyList"
+              @selection-change="handleSelectionChangeNonedicom"
+            >
+              <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
               <el-table-column
                 prop="CodeView"
@@ -370,22 +411,51 @@
                         :label="$t('trials:audit:table:nonDicomsFileName')"
                         width="200"
                       />
+                      <el-table-column
+                        prop="FileSize"
+                        :label="$t('trials:audit:table:nonDicomsFileSize')"
+                        width="100"
+                      >
+                        <template slot-scope="scope">
+                          <span>{{
+                            scope.row.FileSize && scope.row.FileSize > 0
+                              ? `${(scope.row.FileSize / 1024 / 1024).toFixed(
+                                  2
+                                )}MB`
+                              : 0
+                          }}</span>
+                        </template>
+                      </el-table-column>
                       <el-table-column
                         :label="$t('common:action:action')"
                         width="120"
                       >
                         <template slot-scope="files">
                           <!-- 预览 -->
-                          <el-button
-                            type="text"
-                            :disabled="
-                              files.row.FileType &&
-                              files.row.FileType.indexOf('zip') >= 0
-                            "
-                            @click.native.prevent="previewFile(files.row)"
+                          <viewer
+                            :ref="files.row.FullFilePath"
+                            style="margin: 0 10px"
+                            :images="[
+                              `${OSSclientConfig.basePath}${files.row.FullFilePath}`,
+                            ]"
                           >
-                            {{ $t("trials:audit:button:nonDicomsPreview") }}
-                          </el-button>
+                            <el-button
+                              type="text"
+                              :disabled="
+                                files.row.FileType &&
+                                files.row.FileType.indexOf('zip') >= 0
+                              "
+                              @click.native.prevent="previewFile(files.row)"
+                            >
+                              {{ $t('trials:audit:button:nonDicomsPreview') }}
+                            </el-button>
+                            <img
+                              v-show="false"
+                              crossorigin="anonymous"
+                              :src="`${OSSclientConfig.basePath}${files.row.FullFilePath}`"
+                              alt="Image"
+                            />
+                          </viewer>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -418,7 +488,7 @@
                     style="color: #f44336; font-size: 16px"
                   />
                   <span>{{
-                    moment(scope.row.ImageDate).format("YYYY-MM-DD")
+                    moment(scope.row.ImageDate).format('YYYY-MM-DD')
                   }}</span>
                 </template>
               </el-table-column>
@@ -478,7 +548,7 @@
       <!-- select/input/textarea/radio -->
       <el-card shadow="hover" style="margin-top: 10px">
         <!-- 审核问题 -->
-        <h3>{{ $t("trials:audit:title:questions") }}</h3>
+        <h3>{{ $t('trials:audit:title:questions') }}</h3>
         <div v-if="qCQuestionAnswerList.length > 0" style="overflow-y: auto">
           <QuestionForm
             ref="questions"
@@ -491,7 +561,7 @@
           />
         </div>
         <!-- 暂无数据 -->
-        <h3 v-else>{{ $t("trials:audit:message:noData") }}</h3>
+        <h3 v-else>{{ $t('trials:audit:message:noData') }}</h3>
       </el-card>
 
       <!-- 发起质疑 -->
@@ -585,7 +655,7 @@
             type="primary"
             @click="qcVisible = false"
           >
-            {{ $t("common:button:cancel") }}
+            {{ $t('common:button:cancel') }}
           </el-button>
           <!-- 保存 -->
           <el-button
@@ -594,7 +664,7 @@
             :loading="btnLoading"
             @click="handleSaveQC"
           >
-            {{ $t("common:button:save") }}
+            {{ $t('common:button:save') }}
           </el-button>
         </div>
       </el-dialog>
@@ -647,7 +717,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd("IsClosed", scope.row.IsClosed) }}
+              {{ $fd('IsClosed', scope.row.IsClosed) }}
             </template>
           </el-table-column>
           <!-- 创建时间 -->
@@ -689,13 +759,13 @@
             <template slot-scope="scope">
               <span v-if="scope.row.ReuploadEnum === 0">--</span>
               <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{
-                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+                $fd('ReuploadEnum', scope.row.ReuploadEnum)
               }}</el-tag>
               <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{
-                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+                $fd('ReuploadEnum', scope.row.ReuploadEnum)
               }}</el-tag>
               <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{
-                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+                $fd('ReuploadEnum', scope.row.ReuploadEnum)
               }}</el-tag>
             </template>
           </el-table-column>
@@ -722,7 +792,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd("YesOrNo", scope.row.IsOverTime) }}
+              {{ $fd('YesOrNo', scope.row.IsOverTime) }}
             </template>
           </el-table-column>
           <!-- 关闭时间 -->
@@ -744,7 +814,7 @@
                 :disabled="scope.row.IsClosed || isAudit"
                 @click="handleReply(scope.row)"
               >
-                {{ $t("trials:qcQuality:action:reply") }}
+                {{ $t('trials:qcQuality:action:reply') }}
               </el-button>
               <!-- 关闭 -->
               <el-button
@@ -752,7 +822,7 @@
                 :disabled="scope.row.IsClosed || isAudit"
                 @click="handleCloseQC(scope.row)"
               >
-                {{ $t("trials:qcQuality:action:close") }}
+                {{ $t('trials:qcQuality:action:close') }}
               </el-button>
             </template>
           </el-table-column>
@@ -852,7 +922,7 @@
                   :key="bodyPart"
                   :label="bodyPart"
                   >{{
-                    $fd("Bodypart", bodyPart, "Code", BodyPart, "Name")
+                    $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                   }}</el-checkbox
                 >
               </el-checkbox-group>
@@ -888,7 +958,7 @@
             type="primary"
             @click="editStudyInfoVisible = false"
           >
-            {{ $t("common:button:cancel") }}
+            {{ $t('common:button:cancel') }}
           </el-button>
           <el-button
             :loading="btnLoading"
@@ -896,7 +966,7 @@
             type="primary"
             @click="handleUpdateStudyInfo"
           >
-            {{ $t("common:button:save") }}
+            {{ $t('common:button:save') }}
           </el-button>
         </div>
       </el-dialog>
@@ -912,10 +982,10 @@
       >
         <div slot="title">
           <span style="font-size: 18px">{{
-            $t("common:dialogTitle:sign")
+            $t('common:dialogTitle:sign')
           }}</span>
           <span style="font-size: 12px; margin-left: 5px">{{
-            `(${$t("common:label:sign")}${currentUser})`
+            `(${$t('common:label:sign')}${currentUser})`
           }}</span>
         </div>
         <SignForm
@@ -992,7 +1062,7 @@
                   :key="bodyPart"
                   :label="bodyPart"
                   >{{
-                    $fd("Bodypart", bodyPart, "Code", BodyPart, "Name")
+                    $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                   }}</el-checkbox
                 >
               </el-checkbox-group>
@@ -1021,7 +1091,7 @@
             type="primary"
             @click="editNoneDicomVisible = false"
           >
-            {{ $t("common:button:cancel") }}
+            {{ $t('common:button:cancel') }}
           </el-button>
           <el-button
             :loading="btnLoading"
@@ -1029,7 +1099,7 @@
             type="primary"
             @click="handleUpdateNoneDicomInfo"
           >
-            {{ $t("common:button:save") }}
+            {{ $t('common:button:save') }}
           </el-button>
         </div>
       </el-dialog>
@@ -1068,11 +1138,11 @@
               <el-radio-group v-model="closeQuestionForm.Type">
                 <!-- 问题已解决 -->
                 <el-radio :label="1">{{
-                  $t("trials:qcQuality:radio:reason1")
+                  $t('trials:qcQuality:radio:reason1')
                 }}</el-radio>
                 <!-- 问题无法解决强制关闭质疑 -->
                 <el-radio :label="2">{{
-                  $t("trials:qcQuality:radio:reason2")
+                  $t('trials:qcQuality:radio:reason2')
                 }}</el-radio>
                 <!--                &lt;!&ndash; 其他 &ndash;&gt;-->
                 <!--                <el-radio :label="3">{{ $t('trials:qcQuality:radio:reason3') }}</el-radio>-->
@@ -1101,7 +1171,7 @@
             type="primary"
             @click="closeQuestionVisible = false"
           >
-            {{ $t("common:button:cancel") }}
+            {{ $t('common:button:cancel') }}
           </el-button>
           <el-button
             :loading="closeBtnLoading"
@@ -1109,7 +1179,7 @@
             type="primary"
             @click="handleCloseQuestion"
           >
-            {{ $t("common:button:save") }}
+            {{ $t('common:button:save') }}
           </el-button>
         </div>
       </el-dialog>
@@ -1146,7 +1216,7 @@
         round
         @click="handleSave"
       >
-        {{ $t("trials:audit:button:save") }}
+        {{ $t('trials:audit:button:save') }}
       </el-button>
       <!-- 发质疑 -->
       <el-button
@@ -1156,12 +1226,12 @@
         round
         @click="handleQC"
       >
-        {{ $t("trials:audit:button:question") }}
+        {{ $t('trials:audit:button:question') }}
       </el-button>
       <!-- 历史质疑 -->
       <el-button size="small" type="primary" round @click="handleHistoryQC">
         {{
-          `${$t("trials:audit:button:historicalQuestions")}(${
+          `${$t('trials:audit:button:historicalQuestions')}(${
             relationInfo.TotalChallengeCount !== undefined
               ? relationInfo.TotalChallengeCount
               : 0
@@ -1181,7 +1251,7 @@
         round
         @click="handleQCState(8)"
       >
-        {{ $t("trials:audit:button:auditPassed") }}
+        {{ $t('trials:audit:button:auditPassed') }}
       </el-button>
       <!-- 审核终止 -->
       <!--      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleQCState(7)">-->
@@ -1222,20 +1292,22 @@ import {
   closeQCChallenge,
   updateModality,
   getQCChallengeDialogList,
-} from "@/api/trials";
-import { qCPassedOrFailed } from "@/api/trials/visit";
-import { getBasicDataSelects } from "@/api/dictionary/dictionary";
-import ChatForm from "./chatForm";
-import QuestionForm from "./questions";
-import moment from "moment";
-import ClinicalData from "./clinicalData";
-import SignForm from "@/views/trials/components/newSignForm";
-import { getToken } from "@/utils/auth";
-import const_ from "@/const/sign-code";
-import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
-import { downloadImage, resetFlag } from "@/utils/uploadZip.js";
+} from '@/api/trials'
+import { qCPassedOrFailed } from '@/api/trials/visit'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import ChatForm from './chatForm'
+import QuestionForm from './questions'
+import moment from 'moment'
+import ClinicalData from './clinicalData'
+import SignForm from '@/views/trials/components/newSignForm'
+import { getToken } from '@/utils/auth'
+import const_ from '@/const/sign-code'
+import uploadPetClinicalData from '@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue'
+import { downLoadFile } from '@/utils/stream.js'
+import { getCRCUploadedStudyInfo, downloadImageSuccess } from '@/api/load.js'
+import store from '@/store'
 export default {
-  name: "QualityAssurance",
+  name: 'QualityAssurance',
   components: {
     ChatForm,
     ClinicalData,
@@ -1247,7 +1319,7 @@ export default {
     data: {
       type: Object,
       default() {
-        return {};
+        return {}
       },
     },
     disabled: {
@@ -1261,7 +1333,7 @@ export default {
   },
   data() {
     return {
-      activeName: this.data.DicomStudyCount > 0 ? "dicom" : "none-dicom",
+      activeName: this.data.DicomStudyCount > 0 ? 'dicom' : 'none-dicom',
       questionForm: {},
       qCQuestionAnswerList: [],
       studyList: [],
@@ -1269,12 +1341,12 @@ export default {
       relationInfo: {},
       noneDicomStudyList: [],
       qcForm: {
-        subjectVisitId: "",
-        challengeType: "",
-        content: "",
-        actionContent: "",
-        deadlineTime: "",
-        qcContent: "",
+        subjectVisitId: '',
+        challengeType: '',
+        content: '',
+        actionContent: '',
+        deadlineTime: '',
+        qcContent: '',
       },
       qcVisible: false,
       chatVisible: false,
@@ -1285,57 +1357,57 @@ export default {
       historyLoading: false,
       editStudyInfoVisible: false,
       studyForm: {
-        StudyCode: "",
+        StudyCode: '',
         IsDicomData: true,
-        Modalities: "",
+        Modalities: '',
         BodyPartForEdit: [],
         SeriesCount: null,
-        StudyTime: "",
+        StudyTime: '',
       },
       currentQCRow: {},
       isAudit: false, // 审核过之后功能按钮禁用标识
-      qcType: "",
+      qcType: '',
       trialBodyPartTypes: [],
       trialModalitys: [],
       signVisible: false,
-      signCode: "",
+      signCode: '',
       auditState: null,
-      currentNoneDicomId: "",
+      currentNoneDicomId: '',
       editNoneDicomVisible: false,
       noneDicomForm: {
-        Id: "",
-        CodeView: "",
+        Id: '',
+        CodeView: '',
         BodyParts: [],
-        Modality: "",
-        ImageDate: "",
+        Modality: '',
+        ImageDate: '',
       },
       subjectClinicalData: {},
       moment,
       currentQCType: null,
-      currentUser: zzSessionStorage.getItem("userName"),
+      currentUser: zzSessionStorage.getItem('userName'),
       pickerOption: {
         disabledDate: (time) => {
-          return time.getTime() > Date.now();
+          return time.getTime() > Date.now()
         },
       },
       isHaveFirstGiveMedicineDate: false,
-      baseDate: "",
-      upperLimit: "", // 超期上限
-      lowerLimit: "", // 超期下限
+      baseDate: '',
+      upperLimit: '', // 超期上限
+      lowerLimit: '', // 超期下限
       closeQuestionForm: {
-        Id: "",
-        SubjectVisitId: "",
+        Id: '',
+        SubjectVisitId: '',
         Type: null,
-        Reason: "",
-        Remake: "",
+        Reason: '',
+        Remake: '',
       },
       closeBtnLoading: false,
       closeQuestionVisible: false,
-      trialId: "",
+      trialId: '',
       dictionaryList: {},
       currentSeriesIsReading: false,
       currentSeriesIsDeleted: false,
-      imgObj: { url: "", visible: false, loading: false },
+      imgObj: { url: '', visible: false, loading: false },
       open: null,
       existsManual: false,
 
@@ -1344,84 +1416,219 @@ export default {
       rowData: {},
       IsHaveStudyClinicalData: false,
       BodyPart: {},
-    };
+
+      // 下载相关
+      downloading: false,
+      selectTableDicom: [], // 选中的dicom数据
+      selectTableNonedicom: [], // 选中的非dicom数据
+      downloadId: null,
+    }
   },
   async mounted() {
-    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     if (this.disabled) {
-      this.isAudit = true;
-      this.currentQCType = this.qType;
+      this.isAudit = true
+      this.currentQCType = this.qType
     } else {
-      this.currentQCType = this.data.AuditState < 6 ? 1 : 2;
+      this.currentQCType = this.data.AuditState < 6 ? 1 : 2
     }
-    window.addEventListener("message", this.receiveMsg);
+    window.addEventListener('message', this.receiveMsg)
 
-    this.trialId = this.$route.query.trialId;
-    this.getQCInfo();
-    this.getDicData();
+    this.trialId = this.$route.query.trialId
+    this.getQCInfo()
+    this.getDicData()
     // this.handleViewImages()
     // this.handleViewAllNoneDicoms()
   },
   beforeDestroy() {
     if (this.open) {
-      this.open.close();
+      this.open.close()
     }
-    resetFlag();
+    store.dispatch('trials/setUnLock', false)
   },
   methods: {
-    // 打包下载
-    async downloadImage(IsDicom) {
+    // 选中dicom
+    handleSelectionChangeDicom(val) {
+      this.selectTableDicom = val
+    },
+    // 选中非dicom
+    handleSelectionChangeNonedicom(val) {
+      this.selectTableNonedicom = val
+    },
+    // 获取下载文件信息
+    async getCRCUploadedStudyInfo(type) {
+      if (this.downloading) return
       try {
-        await downloadImage(this.$route.query.trialId, this.data.Id, IsDicom);
+        let data = {
+          SubjectVisitId: this.data.Id,
+          NoneDicomStudyIdList: [],
+          DicomStudyIdList: [],
+        }
+        if (type === 'dicom') {
+          data.DicomStudyIdList = this.selectTableDicom.map(
+            (item) => item.StudyId
+          )
+        }
+        if (type === 'noneDicom') {
+          console.log(this.selectTableNonedicom)
+          data.NoneDicomStudyIdList = this.selectTableNonedicom.map(
+            (item) => item.Id
+          )
+        }
+        this.downloading = true
+        let res = await getCRCUploadedStudyInfo(data)
+        this.downloading = false
+        if (res.IsSuccess) {
+          this.downloadId = res.OtherInfo
+          this.downloadImage(res.Result, type)
+        }
       } catch (err) {
-        console.log(err);
+        this.downloading = false
+        console.log(err)
+      }
+    },
+    // 打包下载
+    async downloadImage(data, type) {
+      try {
+        let { files, name, fileType } = this.formatDownloadFile(data, type)
+        let res = null
+        if (fileType === 'list') {
+          res = await downLoadFile(files, name, 'zip')
+        } else {
+          res = await downLoadFile(files, name)
+        }
+        if (res && this.downloadId) {
+          this.downloadImageSuccess()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    // 格式化下载文件路径
+    formatDownloadFile(data, type) {
+      let files = [],
+        name = null
+      if (type === 'dicom') {
+        name = `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+          'IsDicom',
+          true
+        )}.zip`
+        let StudyList = data.StudyList
+        StudyList.forEach((study) => {
+          if (study.SeriesList.length > 0) {
+            study.SeriesList.forEach((series) => {
+              if (series.InstanceList.length > 0) {
+                series.InstanceList.forEach((instance) => {
+                  let fileName = instance.Path.split('/').pop()
+                  let obj = {
+                    name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+                      'IsDicom',
+                      true
+                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${
+                      series.Modality
+                    }/${fileName}`,
+                    url: this.OSSclientConfig.basePath + instance.Path,
+                  }
+                  files.push(obj)
+                })
+              }
+            })
+          }
+        })
+      }
+      if (type === 'noneDicom') {
+        name = `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+          'IsDicom',
+          false
+        )}.zip`
+        let NoneDicomStudyList = data.NoneDicomStudyList
+        // 单个zip包
+        if (
+          NoneDicomStudyList.length === 1 &&
+          NoneDicomStudyList[0].FileList.length === 1 &&
+          NoneDicomStudyList[0].FileList[0].FileType.includes('zip')
+        ) {
+          files =
+            this.OSSclientConfig.basePath +
+            NoneDicomStudyList[0].FileList[0].Path
+          return { files, name, fileType: 'one' }
+        }
+        // 多文件
+        NoneDicomStudyList.forEach((study) => {
+          if (study.FileList.length > 0) {
+            study.FileList.forEach((item) => {
+              let obj = {
+                name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+                  'IsDicom',
+                  true
+                )}/${study.StudyCode}_${study.ImageDate.split(' ')[0]}_${
+                  study.Modality
+                }/${item.FileName}`,
+                url: this.OSSclientConfig.basePath + item.Path,
+              }
+              files.push(obj)
+            })
+          }
+        })
+      }
+      return { files, name, fileType: 'list' }
+    },
+    // 影像下载成功确认
+    async downloadImageSuccess() {
+      try {
+        let params = {
+          TrialImageDownloadId: this.downloadId,
+        }
+        await downloadImageSuccess(params)
+      } catch (err) {
+        console.log(err)
       }
     },
     // 获取QC界面基本信息
     getQCInfo() {
-      this.loading = true;
+      this.loading = true
       getVisitQCInfo(this.data.Id, this.data.QCProcessEnum, this.currentQCType)
         .then((res) => {
-          this.existsManual = res.Result.ExistsManual;
-          this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList;
-          this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData;
-          this.studyList = res.Result.StudyList;
-          this.seriesList = res.Result.SeriesList;
-          this.noneDicomStudyList = res.Result.NoneDicomStudyList;
-          this.relationInfo = res.Result.RelationInfo;
+          this.existsManual = res.Result.ExistsManual
+          this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList
+          this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData
+          this.studyList = res.Result.StudyList
+          this.seriesList = res.Result.SeriesList
+          this.noneDicomStudyList = res.Result.NoneDicomStudyList
+          this.relationInfo = res.Result.RelationInfo
           this.trialBodyPartTypes = this.relationInfo.TrialBodyPartTypes
-            ? this.relationInfo.TrialBodyPartTypes.trim().split("|")
-            : [];
+            ? this.relationInfo.TrialBodyPartTypes.trim().split('|')
+            : []
           this.trialModalitys = this.relationInfo.TrialModalitys
-            ? this.relationInfo.TrialModalitys.trim().split("|")
-            : [];
-          this.subjectClinicalData = res.Result.SubjectClinicalData;
-          this.baseDate = res.Result.RelationInfo.SubjectFirstGiveMedicineTime;
+            ? this.relationInfo.TrialModalitys.trim().split('|')
+            : []
+          this.subjectClinicalData = res.Result.SubjectClinicalData
+          this.baseDate = res.Result.RelationInfo.SubjectFirstGiveMedicineTime
           if (this.baseDate) {
             const uDay =
               res.Result.RelationInfo.VisitDay * 1 +
-              res.Result.RelationInfo.VisitWindowLeft * 1;
-            this.upperLimit = moment(this.baseDate, "YYYY-MM-DD")
-              .add(uDay, "days")
-              .format("YYYY-MM-DD");
+              res.Result.RelationInfo.VisitWindowLeft * 1
+            this.upperLimit = moment(this.baseDate, 'YYYY-MM-DD')
+              .add(uDay, 'days')
+              .format('YYYY-MM-DD')
             const lDay =
               res.Result.RelationInfo.VisitDay * 1 +
-              res.Result.RelationInfo.VisitWindowRight * 1;
-            this.lowerLimit = moment(this.baseDate, "YYYY-MM-DD")
-              .add(lDay, "days")
-              .format("YYYY-MM-DD");
+              res.Result.RelationInfo.VisitWindowRight * 1
+            this.lowerLimit = moment(this.baseDate, 'YYYY-MM-DD')
+              .add(lDay, 'days')
+              .format('YYYY-MM-DD')
           }
           this.isHaveFirstGiveMedicineDate =
-            res.Result.RelationInfo.IsHaveFirstGiveMedicineDate;
-          this.loading = false;
+            res.Result.RelationInfo.IsHaveFirstGiveMedicineDate
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 刷新审核问题列表
     getCheckList() {
-      this.loading = true;
+      this.loading = true
       getQCQuestionAnswerList(
         this.trialId,
         this.data.Id,
@@ -1429,36 +1636,36 @@ export default {
         this.currentQCType
       )
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           res.Result.forEach((element, index) => {
             // this.qCQuestionAnswerList
-            this.$set(this.qCQuestionAnswerList[index], "Id", element.Id);
-          });
+            this.$set(this.qCQuestionAnswerList[index], 'Id', element.Id)
+          })
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 保存审核问题
     handleSave(isMessage) {
       return new Promise((resolve) => {
-        this.$refs["questions"]
+        this.$refs['questions']
           .submit()
           .then((res) => {
-            var answerList = [];
+            var answerList = []
             res.forEach((item) => {
               var index = this.qCQuestionAnswerList.findIndex(
                 (v) => v.TrialQCQuestionConfigureId === item.Id
-              );
+              )
               if (index > -1) {
                 answerList.push({
                   id: this.qCQuestionAnswerList[index].Id,
                   answer: item.answer,
                   trialQCQuestionConfigureId: item.Id,
-                });
+                })
               }
-            });
-            this.loading = true;
+            })
+            this.loading = true
             addOrUpdateQCQuestionAnswerList(
               this.trialId,
               this.data.Id,
@@ -1467,66 +1674,66 @@ export default {
               answerList
             )
               .then((res) => {
-                this.loading = false;
+                this.loading = false
                 if (res.IsSuccess) {
                   if (isMessage !== true) {
                     this.$message.success(
-                      this.$t("common:message:savedSuccessfully")
-                    );
+                      this.$t('common:message:savedSuccessfully')
+                    )
                   }
-                  this.getCheckList();
-                  resolve(true);
+                  this.getCheckList()
+                  resolve(true)
                 }
               })
               .catch(() => {
-                this.loading = false;
-                resolve(false);
-              });
+                this.loading = false
+                resolve(false)
+              })
           })
           .catch(() => {
-            this.loading = false;
-            resolve(false);
-          });
-      });
+            this.loading = false
+            resolve(false)
+          })
+      })
     },
     // 保存质疑
     handleSaveQC() {
-      this.$refs["qcForm"].validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
-        this.qcForm.subjectVisitId = this.data.Id;
-        var contents = [];
-        var types = [];
-        var actions = [];
+      this.$refs['qcForm'].validate((valid) => {
+        if (!valid) return
+        this.btnLoading = true
+        this.qcForm.subjectVisitId = this.data.Id
+        var contents = []
+        var types = []
+        var actions = []
         this.qcForm.qcContent.forEach((item) => {
           if (item.isSelect) {
-            types.push(`${item.keyName}`);
-            var str = `${item.keyName} <br>`;
+            types.push(`${item.keyName}`)
+            var str = `${item.keyName}<br>`
             if (item.keyValue) {
               // 问题总结
-              str = `${str}${this.$t("trials:audit:form:questionSummary")}：${
-                item.keyValue
-              }<br>`;
+              str = `${str}${this.$t(
+                'trials:audit:form:questionSummary'
+              )}：<br>${item.keyValue}<br>`
             }
             if (item.actionContent) {
               // 行动事项
-              actions.push(`${item.actionContent}`);
-              str = `${str}${this.$t("trials:audit:form:actionMatters")}：${
-                item.actionContent
-              }<br>`;
+              actions.push(`${item.actionContent}`)
+              str = `${str}${this.$t(
+                'trials:audit:form:actionMatters'
+              )}：<br><div style='margin-left:20px'>${item.actionContent}</div>`
             }
-            contents.push(str);
+            contents.push(str)
           }
-        });
+        })
         if (contents.length === 0) {
           // 质疑内容不能为空！
-          this.$alert(this.$t("trials:audit:message:qsContentIsNull"));
-          this.btnLoading = false;
-          return;
+          this.$alert(this.$t('trials:audit:message:qsContentIsNull'))
+          this.btnLoading = false
+          return
         } else {
-          this.qcForm.content = contents.join("|");
-          this.qcForm.challengeType = types.join("|");
-          this.qcForm.actionContent = actions.join("|");
+          this.qcForm.content = contents.join('|')
+          this.qcForm.challengeType = types.join('|')
+          this.qcForm.actionContent = actions.join('|')
         }
         var params = {
           challengeType: this.qcForm.challengeType,
@@ -1535,7 +1742,7 @@ export default {
           actionContent: this.qcForm.actionContent,
           reuploadEnum: 0,
           deadlineTime: this.qcForm.deadlineTime,
-        };
+        }
         addOrUpdateQCChallenge(
           this.trialId,
           this.data.QCProcessEnum,
@@ -1543,182 +1750,180 @@ export default {
           params
         )
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.qcVisible = false;
-              this.relationInfo.TotalChallengeCount++;
-              this.relationInfo.NotClosedChallengeCount++;
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.qcVisible = false
+              this.relationInfo.TotalChallengeCount++
+              this.relationInfo.NotClosedChallengeCount++
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     // 打开发起质疑弹窗
     handleQC() {
-      this.loading = true;
+      this.loading = true
       // 检验qc审核问题是否保存，否则不允许发质疑
       verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.renderQCForm();
+            this.renderQCForm()
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     handleQCVerify() {
-      this.loading = true;
+      this.loading = true
       return new Promise((resolve) => {
         verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType)
           .then((res) => {
-            this.loading = false;
+            this.loading = false
             if (res.IsSuccess) {
-              resolve(true);
+              resolve(true)
             } else {
-              resolve(false);
+              resolve(false)
             }
           })
           .catch(() => {
-            this.loading = false;
-            resolve(false);
-          });
-      });
+            this.loading = false
+            resolve(false)
+          })
+      })
     },
     // 渲染发质疑窗口
     renderQCForm() {
-      var contents = [];
-      const challengeType = this.dictionaryList["ChallengeType"];
+      var contents = []
+      const challengeType = this.dictionaryList['ChallengeType']
       challengeType.forEach((i) => {
-        contents.push({ keyName: i.Value, keyValue: "", isSelect: false });
-      });
-      var isHyperwindow = false;
+        contents.push({ keyName: i.Value, keyValue: '', isSelect: false })
+      })
+      var isHyperwindow = false
       if (this.isHaveFirstGiveMedicineDate && !!this.baseDate) {
-        isHyperwindow = this.isHyperwindow();
+        isHyperwindow = this.isHyperwindow()
       }
       if (isHyperwindow) {
         contents.push({
-          keyName: this.$t("trials:audit:message:qsOverWindow"),
-          keyValue: `${this.$t("trials:audit:message:qsOverWindow1")}：${
+          keyName: this.$t('trials:audit:message:qsOverWindow'),
+          keyValue: `${this.$t('trials:audit:message:qsOverWindow1')}：${
             this.upperLimit
           }~${this.lowerLimit}，${this.$t(
-            "trials:audit:message:qsOverWindow2"
+            'trials:audit:message:qsOverWindow2'
           )}：${moment(this.relationInfo.EarliestScanDate).format(
-            "YYYY-MM-DD"
+            'YYYY-MM-DD'
           )}~${moment(this.relationInfo.LatestScanDate).format(
-            "YYYY-MM-DD"
-          )},${this.$t("trials:audit:message:qsOverWindow3")}`,
+            'YYYY-MM-DD'
+          )},${this.$t('trials:audit:message:qsOverWindow3')}`,
           isSelect: false,
-          actionContent: this.$t("trials:audit:message:qsOverWindow4"),
-        });
+          actionContent: this.$t('trials:audit:message:qsOverWindow4'),
+        })
       }
-      this.qcForm.qcContent = contents;
-      const day = this.relationInfo.TrialChangeDefalutDays;
+      this.qcForm.qcContent = contents
+      const day = this.relationInfo.TrialChangeDefalutDays
       this.qcForm.deadlineTime = moment()
-        .add(day * 1, "days")
-        .format("YYYY-MM-DD HH:mm:ss");
-      this.qcVisible = true;
+        .add(day * 1, 'days')
+        .format('YYYY-MM-DD HH:mm:ss')
+      this.qcVisible = true
     },
     isHyperwindow() {
-      var isHyperwindow = false;
+      var isHyperwindow = false
       if (
         this.relationInfo.EarliestScanDate < this.upperLimit ||
         this.relationInfo.LatestScanDate > this.lowerLimit
       ) {
-        isHyperwindow = true;
+        isHyperwindow = true
       }
-      return isHyperwindow;
+      return isHyperwindow
     },
     // 获取字典数据
     getDicData() {
-      getBasicDataSelects(["ChallengeType"]).then((res) => {
-        this.dictionaryList = { ...res.Result };
-      });
+      getBasicDataSelects(['ChallengeType']).then((res) => {
+        this.dictionaryList = { ...res.Result }
+      })
     },
     // 打开历史质疑弹窗
     handleHistoryQC() {
-      this.historyVisible = true;
-      this.getHistoryInfo();
+      this.historyVisible = true
+      this.getHistoryInfo()
     },
     // 获取历史质疑记录
     getHistoryInfo() {
-      this.historyLoading = true;
+      this.historyLoading = true
       getHistoryChallengeList(
         this.data.Id,
         this.data.QCProcessEnum,
         this.currentQCType
       )
         .then((res) => {
-          this.historyList = res.Result;
-          this.historyLoading = false;
+          this.historyList = res.Result
+          this.historyLoading = false
         })
         .catch(() => {
-          this.historyLoading = false;
-        });
+          this.historyLoading = false
+        })
     },
 
     // 回复质疑
     handleReply(row) {
-      this.historyLoading = true;
+      this.historyLoading = true
       getQCChallengeDialogList(row.Id)
         .then((res) => {
-          this.historyLoading = false;
+          this.historyLoading = false
           if (res.IsSuccess) {
             if (res.Result.length > 0) {
-              Object.assign(row, res.Result[0]);
+              Object.assign(row, res.Result[0])
             }
-            this.currentQCRow = { ...row };
-            this.chatVisible = true;
+            this.currentQCRow = { ...row }
+            this.chatVisible = true
           }
         })
         .catch(() => {
-          this.historyLoading = false;
-        });
+          this.historyLoading = false
+        })
     },
     getDialogList() {
-      this.historyLoading = true;
+      this.historyLoading = true
       getQCChallengeDialogList(this.currentQCRow.Id)
         .then((res) => {
-          this.historyLoading = false;
+          this.historyLoading = false
           if (res.IsSuccess && res.Result.length > 0) {
             var i = this.historyList.findIndex(
               (item) => item.Id === this.currentQCRow.Id
-            );
+            )
             if (i > -1) {
               this.currentQCRow = Object.assign(
                 this.historyList[i],
                 res.Result[0]
-              );
+              )
             }
           }
         })
         .catch(() => {
-          this.historyLoading = false;
-        });
+          this.historyLoading = false
+        })
     },
     // 关闭质疑
     handleCloseQuestion() {
-      this.$refs["closeQuestionForm"].validate((valid) => {
-        if (!valid) return;
-        this.closeBtnLoading = true;
+      this.$refs['closeQuestionForm'].validate((valid) => {
+        if (!valid) return
+        this.closeBtnLoading = true
         if (this.closeQuestionForm.Type === 1) {
           // 问题已解决
           this.closeQuestionForm.Reason = this.$t(
-            "trials:qcQuality:message:problemSolved"
-          );
+            'trials:qcQuality:message:problemSolved'
+          )
         } else if (this.closeQuestionForm.Type === 2) {
           // 问题无法解决强制关闭质疑，已提醒中心下次注意
           this.closeQuestionForm.Reason = `${this.$t(
-            "trials:qcQuality:message:problemNotSolved"
-          )}<br/><br/>${this.$t("trials:consistencyCheck:label:closereason")}:${
+            'trials:qcQuality:message:problemNotSolved'
+          )}<br/><br/>${this.$t('trials:consistencyCheck:label:closereason')}:${
             this.closeQuestionForm.Remake
-          }`;
+          }`
         }
         var params = {
           TrialId: this.data.TrialId,
@@ -1726,61 +1931,61 @@ export default {
           SubjectVisitId: this.data.Id,
           CloseEnum: this.closeQuestionForm.Type,
           CloseReason: this.closeQuestionForm.Reason,
-        };
+        }
         closeQCChallenge(params)
           .then((res) => {
-            this.closeBtnLoading = false;
+            this.closeBtnLoading = false
             if (res.IsSuccess) {
-              this.getHistoryInfo();
+              this.getHistoryInfo()
               this.$message.success(
-                this.$t("trials:qcQuality:message:closedSuccessfully")
-              );
-              this.closeQuestionVisible = false;
-              this.relationInfo.NotClosedChallengeCount--;
+                this.$t('trials:qcQuality:message:closedSuccessfully')
+              )
+              this.closeQuestionVisible = false
+              this.relationInfo.NotClosedChallengeCount--
             }
           })
           .catch(() => {
-            this.closeBtnLoading = false;
-          });
-      });
+            this.closeBtnLoading = false
+          })
+      })
     },
     // 打开关闭质疑框并初始化
     handleCloseQC(row) {
-      this.closeQuestionForm = Object.assign(this.closeQuestionForm, row);
-      this.closeQuestionForm.CurrentQCType = this.currentQCType;
-      this.closeQuestionForm.AuditState = this.data.AuditState;
-      this.closeQuestionForm.TrialQCProcess = this.data.QCProcessEnum;
-      this.closeQuestionForm.Type = null;
-      this.closeQuestionForm.Reason = "";
-      this.closeQuestionForm.Remake = "";
-      this.closeQuestionVisible = true;
+      this.closeQuestionForm = Object.assign(this.closeQuestionForm, row)
+      this.closeQuestionForm.CurrentQCType = this.currentQCType
+      this.closeQuestionForm.AuditState = this.data.AuditState
+      this.closeQuestionForm.TrialQCProcess = this.data.QCProcessEnum
+      this.closeQuestionForm.Type = null
+      this.closeQuestionForm.Reason = ''
+      this.closeQuestionForm.Remake = ''
+      this.closeQuestionVisible = true
     },
     // 打开质疑记录弹窗
     handleQCInfo(row) {
-      this.currentQCRow = { ...row };
-      this.chatVisible = true;
+      this.currentQCRow = { ...row }
+      this.chatVisible = true
     },
     changeReadingStatus(callback, row) {
-      let statusStr = "";
+      let statusStr = ''
       if (callback) {
-        statusStr = this.$t("trials:audit:label:setSeriesReading");
-        row.IsReading = false;
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        row.IsReading = false
       } else {
-        statusStr = this.$t("trials:audit:label:setSeriesNotReading");
-        row.IsReading = true;
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        row.IsReading = true
       }
-      var message = this.$t("trials:audit:message:changeSeriesStatus").replace(
-        "xxx",
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace(
+        'xxx',
         statusStr
-      );
-      message = message.replace("yyy", this.$fd("YesOrNo", !row.IsReading));
+      )
+      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsReading))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
-        type: "warning",
+        type: 'warning',
       })
         .then(() => {
-          const state = row.IsReading ? 1 : 2;
-          this.loading = true;
+          const state = row.IsReading ? 1 : 2
+          this.loading = true
           setSeriesStatus(
             this.trialId,
             this.data.Id,
@@ -1789,41 +1994,41 @@ export default {
             state
           )
             .then((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.IsSuccess) {
                 this.$message.success(
-                  this.$t("common:message:savedSuccessfully")
-                );
-                this.getStudyInfo();
+                  this.$t('common:message:savedSuccessfully')
+                )
+                this.getStudyInfo()
               }
             })
             .catch(() => {
-              this.loading = false;
-            });
+              this.loading = false
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeDeleteStatus(callback, row) {
-      let statusStr = "";
+      let statusStr = ''
       if (callback) {
-        statusStr = this.$t("trials:audit:label:setSeriesDeleted");
-        row.IsDeleted = false;
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        row.IsDeleted = false
       } else {
-        statusStr = this.$t("trials:audit:label:setSeriesNotDelete");
-        row.IsDeleted = true;
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        row.IsDeleted = true
       }
-      var message = this.$t("trials:audit:message:changeSeriesStatus").replace(
-        "xxx",
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace(
+        'xxx',
         statusStr
-      );
-      message = message.replace("yyy", this.$fd("YesOrNo", !row.IsDeleted));
+      )
+      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsDeleted))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
-        type: "warning",
+        type: 'warning',
       })
         .then(() => {
-          const state = row.IsDeleted ? 5 : 4;
-          this.loading = true;
+          const state = row.IsDeleted ? 5 : 4
+          this.loading = true
           setSeriesStatus(
             this.trialId,
             this.data.Id,
@@ -1832,146 +2037,146 @@ export default {
             state
           )
             .then((res) => {
-              this.loading = false;
+              this.loading = false
               if (res.IsSuccess) {
                 this.$message.success(
-                  this.$t("common:message:savedSuccessfully")
-                );
-                this.getStudyInfo();
+                  this.$t('common:message:savedSuccessfully')
+                )
+                this.getStudyInfo()
               }
             })
             .catch(() => {
-              this.loading = false;
-            });
+              this.loading = false
+            })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     receiveMsg(event) {
-      if (event.data.type === "refreshSeriesList") {
-        this.getStudyInfo();
+      if (event.data.type === 'refreshSeriesList') {
+        this.getStudyInfo()
       }
     },
     // 刷新检查新
     getStudyInfo() {
-      this.loading = true;
+      this.loading = true
       getVisitQCStudyAndSeriesList(this.data.Id)
         .then((res) => {
-          this.loading = false;
-          this.studyList = res.Result.StudyList;
-          this.seriesList = res.Result.SeriesList;
+          this.loading = false
+          this.studyList = res.Result.StudyList
+          this.seriesList = res.Result.SeriesList
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 设置qc通过/不通过
     async handleQCState(auditState) {
       if (auditState === 7) {
-        this.signCode = this.getSignCode(auditState);
-        this.signVisible = true;
-        this.auditState = auditState;
-        return;
+        this.signCode = this.getSignCode(auditState)
+        this.signVisible = true
+        this.auditState = auditState
+        return
       }
       if (auditState === 8) {
-        var isgo = true;
-        var isgoList = [];
+        var isgo = true
+        var isgoList = []
         this.studyList.forEach((v) => {
           if (!v.BodyPartForEdit) {
-            isgo = false;
-            isgoList.push(v.StudyCode);
+            isgo = false
+            isgoList.push(v.StudyCode)
           }
-        });
+        })
         if (!isgo) {
           // `请补充检查${isgoList.toString()}的检查部位！`
           this.$confirm(
-            this.$t("trials:qcQuality:title:title1").replace(
-              "xxx",
-              isgoList.join("、 ")
+            this.$t('trials:qcQuality:title:title1').replace(
+              'xxx',
+              isgoList.join('、 ')
             ),
-            "",
+            '',
             {
               showCancelButton: false,
             }
-          );
-          return;
+          )
+          return
         }
       }
-      this.loading = true;
-      var isVerify = await this.handleSave(true);
+      this.loading = true
+      var isVerify = await this.handleSave(true)
       if (!isVerify) {
-        return;
+        return
       }
       // 验证是否关闭所有质疑
       verifyCanQCPassedOrFailed(this.trialId, this.data.Id)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.signCode = this.getSignCode(auditState);
-            this.signVisible = true;
-            this.auditState = auditState;
+            this.signCode = this.getSignCode(auditState)
+            this.signVisible = true
+            this.auditState = auditState
           }
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     getSignCode(auditState) {
       if (this.relationInfo.TrialQCProcessEnum === 1 && auditState === 8) {
         // 单审通过
-        const { QCSingleReviewPassed } = const_.processSignature;
-        return QCSingleReviewPassed;
+        const { QCSingleReviewPassed } = const_.processSignature
+        return QCSingleReviewPassed
       } else if (
         this.relationInfo.TrialQCProcessEnum === 1 &&
         auditState === 7
       ) {
         // 单审不通过
-        const { QCSingleReviewFailed } = const_.processSignature;
-        return QCSingleReviewFailed;
+        const { QCSingleReviewFailed } = const_.processSignature
+        return QCSingleReviewFailed
       } else if (
         this.relationInfo.TrialQCProcessEnum === 2 &&
         auditState === 8 &&
         this.currentQCType === 1
       ) {
         // 初审通过
-        const { PreliminaryReviewOfQCPassed } = const_.processSignature;
-        return PreliminaryReviewOfQCPassed;
+        const { PreliminaryReviewOfQCPassed } = const_.processSignature
+        return PreliminaryReviewOfQCPassed
       } else if (
         this.relationInfo.TrialQCProcessEnum === 2 &&
         auditState === 7 &&
         this.currentQCType === 1
       ) {
         // 初审不通过
-        const { PreliminaryReviewOfQCFailed } = const_.processSignature;
-        return PreliminaryReviewOfQCFailed;
+        const { PreliminaryReviewOfQCFailed } = const_.processSignature
+        return PreliminaryReviewOfQCFailed
       } else if (
         this.relationInfo.TrialQCProcessEnum === 2 &&
         auditState === 8 &&
         this.currentQCType === 2
       ) {
         // 复审通过
-        const { SecondaryReviewOfQCPassed } = const_.processSignature;
-        return SecondaryReviewOfQCPassed;
+        const { SecondaryReviewOfQCPassed } = const_.processSignature
+        return SecondaryReviewOfQCPassed
       } else if (
         this.relationInfo.TrialQCProcessEnum === 2 &&
         auditState === 7 &&
         this.currentQCType === 2
       ) {
         // 复审不通过
-        const { SecondaryReviewOfQCFailed } = const_.processSignature;
-        return SecondaryReviewOfQCFailed;
+        const { SecondaryReviewOfQCFailed } = const_.processSignature
+        return SecondaryReviewOfQCFailed
       }
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.setQCStatus(signInfo);
+        this.setQCStatus(signInfo)
       } else {
-        this.signVisible = false;
+        this.signVisible = false
       }
     },
     // 设置qc审核状态
     async setQCStatus(signInfo) {
-      this.loading = true;
+      this.loading = true
       var params = {
         data: {
           TrialId: this.trialId,
@@ -1979,98 +2184,100 @@ export default {
           AuditState: this.auditState,
         },
         signInfo: signInfo,
-      };
+      }
       qCPassedOrFailed(params)
         .then((res) => {
-          this.loading = false;
+          this.loading = false
           if (res.IsSuccess) {
-            this.$refs["signForm"].btnLoading = false;
-            this.signVisible = false;
-            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             // this.getQCInfo()
-            this.isAudit = true;
-            this.$forceUpdate();
+            this.isAudit = true
+            this.$forceUpdate()
             getNextIQCQuality({
               trialId: this.trialId,
               SubjectId: this.data.SubjectId,
             }).then((res) => {
               if (res.Result && res.Result.VisitId) {
                 this.$confirm(
-                  this.$t("trials:qcQuality:title:title2", "", {
+                  this.$t('trials:qcQuality:title:title2', '', {
                     showCancelButton: false,
                   })
-                ).then(() => {
-                  collectNextIQCQuality({
-                    trialId: this.trialId,
-                    SubjectId: this.data.SubjectId,
-                  }).then((res) => {
-                    this.$emit("getList");
-                    this.$emit("nextTask", res.Result.VisitId);
-                  });
-                }).catch(()=>{
-                  this.$emit("getList")
-                })
+                )
+                  .then(() => {
+                    collectNextIQCQuality({
+                      trialId: this.trialId,
+                      SubjectId: this.data.SubjectId,
+                    }).then((res) => {
+                      this.$emit('getList')
+                      this.$emit('nextTask', res.Result.VisitId)
+                    })
+                  })
+                  .catch(() => {
+                    this.$emit('getList')
+                  })
               } else {
                 // 没有后续质控任务
-                this.$emit("getList");
-                this.$confirm(this.$t("trials:qcQuality:title:closeQCDialog"))
+                this.$emit('getList')
+                this.$confirm(this.$t('trials:qcQuality:title:closeQCDialog'))
                   .then(() => {
-                    this.$emit("close");
+                    this.$emit('close')
                   })
-                  .catch(() => {});
+                  .catch(() => {})
               }
-            });
+            })
           }
         })
         .catch(() => {
-          this.loading = false;
-          this.$refs["signForm"].btnLoading = false;
-        });
+          this.loading = false
+          this.$refs['signForm'].btnLoading = false
+        })
     },
     getNextQCInfo() {
       // '是否确认进入下一个质控任务？'
-      var message = this.$t("trials:qcQuality:title:title2");
+      var message = this.$t('trials:qcQuality:title:title2')
 
       this.$confirm(message, {
-        type: "warning",
+        type: 'warning',
         distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.loading = true;
-          this.$emit("nextTask");
+          this.loading = true
+          this.$emit('nextTask')
         })
         .catch((action) => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return "delete-row";
+        return 'delete-row'
       } else {
-        return "";
+        return ''
       }
     },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true;
-      this.studyForm = { ...row };
-      var bodyPart = [];
-      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split("|");
-      } else if (this.studyForm.BodyPartForEdit !== "") {
-        bodyPart.push(this.studyForm.BodyPartForEdit);
+      this.editStudyInfoVisible = true
+      this.studyForm = { ...row }
+      var bodyPart = []
+      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split('|')
+      } else if (this.studyForm.BodyPartForEdit !== '') {
+        bodyPart.push(this.studyForm.BodyPartForEdit)
       }
-      this.$set(this.studyForm, "Modality", row.ModalityForEdit);
+      this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
       // this.studyForm.Modality = row.ModalityForEdit
-      this.studyForm.BodyPartForEdit = bodyPart;
+      this.studyForm.BodyPartForEdit = bodyPart
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs["studyForm"].validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
+      this.$refs['studyForm'].validate((valid) => {
+        if (!valid) return
+        this.btnLoading = true
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
         // this.studyForm.Modality = this.studyForm.Modalities
         var params = {
           id: this.studyForm.StudyId,
@@ -2078,146 +2285,143 @@ export default {
           type: 1,
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
-        };
+        }
         updateModality(this.data.TrialId, params)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getStudyInfo();
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.editStudyInfoVisible = false;
+              this.getStudyInfo()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.editStudyInfoVisible = false
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     // 设置重传时刷新历史质疑列表及影响指控列表
     refreshList() {
       // 如果是复审时候设置重传，需要将当前审核状态设置为初审，且刷新页面数据并关闭历史质疑和质疑记录窗口
       if (this.currentQCType === 2) {
-        this.currentQCType = 1;
+        this.currentQCType = 1
         // this.getQCInfo()
-        this.getHistoryInfo();
+        this.getHistoryInfo()
       } else {
         // 如果是初审时候设置重传，不影响
-        this.getHistoryInfo();
+        this.getHistoryInfo()
       }
-      this.$emit("getList");
+      this.$emit('getList')
     },
 
     // 打开非Dicom信息编辑框
     handleEditNoneDicomInfo(row) {
-      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row };
-      this.noneDicomForm.CodeView = CodeView;
-      this.noneDicomForm.Id = Id;
-      this.noneDicomForm.BodyPart = BodyPart;
-      this.noneDicomForm.Modality = Modality;
-      this.noneDicomForm.ImageDate = ImageDate;
-      this.noneDicomForm.BodyParts = BodyPart.split(", ");
-      this.editNoneDicomVisible = true;
+      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row }
+      this.noneDicomForm.CodeView = CodeView
+      this.noneDicomForm.Id = Id
+      this.noneDicomForm.BodyPart = BodyPart
+      this.noneDicomForm.Modality = Modality
+      this.noneDicomForm.ImageDate = ImageDate
+      this.noneDicomForm.BodyParts = BodyPart.split(', ')
+      this.editNoneDicomVisible = true
     },
     // 更新非Dicom部位/拍片类型信息
     handleUpdateNoneDicomInfo() {
       this.$refs.noneDicomForm.validate((valid) => {
-        if (!valid) return;
-        this.btnLoading = true;
-        this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(", ");
-        this.noneDicomForm.TrialId = this.trialId;
-        this.noneDicomForm.TrialSiteId = this.data.TrialSiteId;
-        this.noneDicomForm.SubjectId = this.data.SubjectId;
-        this.noneDicomForm.SubjectVisitId = this.data.Id;
+        if (!valid) return
+        this.btnLoading = true
+        this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(', ')
+        this.noneDicomForm.TrialId = this.trialId
+        this.noneDicomForm.TrialSiteId = this.data.TrialSiteId
+        this.noneDicomForm.SubjectId = this.data.SubjectId
+        this.noneDicomForm.SubjectVisitId = this.data.Id
         addOrUpdateNoneDicomStudy(this.noneDicomForm)
           .then((res) => {
-            this.btnLoading = false;
+            this.btnLoading = false
             if (res.IsSuccess) {
-              this.getNoneDicomList();
-              this.$message.success(
-                this.$t("common:message:savedSuccessfully")
-              );
-              this.editNoneDicomVisible = false;
+              this.getNoneDicomList()
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.editNoneDicomVisible = false
             }
           })
           .catch(() => {
-            this.btnLoading = false;
-          });
-      });
+            this.btnLoading = false
+          })
+      })
     },
     // 获取非Dicom检查信息
     getNoneDicomList() {
-      this.loading = true;
+      this.loading = true
       getNoneDicomStudyList(this.data.Id)
         .then((res) => {
-          this.noneDicomStudyList = res.Result;
-          this.loading = false;
+          this.noneDicomStudyList = res.Result
+          this.loading = false
         })
         .catch(() => {
-          this.loading = false;
-        });
+          this.loading = false
+        })
     },
     // 预览文件
     previewFile(row) {
       // window.open(row.FullFilePath, '_blank')
-      this.imgObj.url = row.FullFilePath;
-      this.imgObj.loading = true;
-      this.imgObj.visible = true;
+      // this.imgObj.url = row.FullFilePath
+      // this.imgObj.loading = true
+      // this.imgObj.visible = true
+      this.$refs[row.FullFilePath].$viewer.show()
     },
     // 预览所有影像
     handleViewImages() {
       if (this.open) {
-        this.open.close();
+        this.open.close()
       }
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${
           this.data.VisitName
         }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${
           this.isAudit ? 0 : 1
         }&TokenKey=${token}`,
-      });
-      this.open = window.open(routeData.href, "_blank");
+      })
+      this.open = window.open(routeData.href, '_blank')
     },
     // 预览阅片影像
     handleViewReadingImages() {
       if (this.open) {
-        this.open.close();
+        this.open.close()
       }
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isReading=1&TokenKey=${token}`,
-      });
-      this.open = window.open(routeData.href, "_blank");
+      })
+      this.open = window.open(routeData.href, '_blank')
     },
     // 预览临床数据
     handlePreviewClinicalData(row) {
-      this.rowData = row;
-      this.petVisible = true;
+      this.rowData = row
+      this.petVisible = true
     },
     // 预览某个检查
     handlePreviewStudy(row) {
       if (this.open) {
-        this.open.close();
+        this.open.close()
       }
-      var token = getToken();
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${
           this.data.Id
         }&studyId=${row.StudyId}&showDelete=${
           this.isAudit ? 0 : 1
         }&TokenKey=${token}&type=Study`,
-      });
-      this.open = window.open(routeData.href, "_blank");
+      })
+      this.open = window.open(routeData.href, '_blank')
     },
     // 预览某个序列
     handlePreviewInstance(row) {
       try {
         if (this.open) {
-          this.open.close();
+          this.open.close()
         }
-        var token = getToken();
+        var token = getToken()
         const routeData = this.$router.resolve({
           path: `/showdicom?trialId=${this.trialId}&studyId=${
             row.StudyId
@@ -2228,58 +2432,58 @@ export default {
           }&subjectVisitId=${
             this.data.Id
           }&type=Series&TokenKey=${token}&description=${row.Description}`,
-        });
-        this.open = window.open(routeData.href, "_blank");
+        })
+        this.open = window.open(routeData.href, '_blank')
       } catch (e) {
-        console.log(e);
+        console.log(e)
       }
     },
     // 预览所有检查下非Dicom文件
     handleViewAllNoneDicoms() {
       if (this.open) {
-        this.open.close();
+        this.open.close()
       }
       // this.previewAllNoneDicomVisible = true
-      let trialId = this.$route.query.trialId;
-      var token = getToken();
+      let trialId = this.$route.query.trialId
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
-      });
-      this.open = window.open(routeData.href, "_blank");
+      })
+      this.open = window.open(routeData.href, '_blank')
     },
     // 预览单个检查下非Dicom文件
     handlePreviewNoneDicomFiles(row) {
       if (this.open) {
-        this.open.close();
+        this.open.close()
       }
-      let trialId = this.$route.query.trialId;
-      var token = getToken();
+      let trialId = this.$route.query.trialId
+      var token = getToken()
       const routeData = this.$router.resolve({
         path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}`,
-      });
-      this.open = window.open(routeData.href, "_blank");
+      })
+      this.open = window.open(routeData.href, '_blank')
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return "";
-      var separator = ",";
-      if (bodyPart.indexOf("|") > -1) {
-        separator = "|";
-      } else if (bodyPart.indexOf(",") > -1) {
-        separator = ",";
-      } else if (bodyPart.indexOf("，") > -1) {
-        separator = "，";
+      if (!bodyPart) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
       }
-      var arr = bodyPart.split(separator);
+      var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
-        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart, "Name");
-      });
-      return newArr.join(" | ");
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      return newArr.join(' | ')
     },
     openManuals() {
-      this.$emit("openManuals");
+      this.$emit('openManuals')
     },
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 .qa-wrapper {
diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js
index e96be49a..bf2c94fd 100644
--- a/static/pdfjs/web/viewer.js
+++ b/static/pdfjs/web/viewer.js
@@ -12338,7 +12338,7 @@ class PDFPageView {
       cover.className = "cover";
       var obj = {}
       console.log('href', window.location.href)
-      if (~window.location.href.indexOf('/SignDocument/')) {
+      if (~window.location.href.indexOf('/System')) {
         var str = window.location.search.substr(1)
         console.log('str', str)
         str = str.split('?')[1]
@@ -12378,20 +12378,20 @@ class PDFPageView {
           c.style.fontSize = '24px'
           c.style.fontWeight = '900'
           c.style.color = "rgba(0, 191, 255, 0.1)";
+          c.style.whiteSpace = 'nowrap'
           // c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印";
-          console.log(window.VUE_APP_COMPANY_NAME)
-          c.innerText = `${window.VUE_APP_COMPANY_NAME }_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
           cover.appendChild(c);
         }
       }
       if (this.annotationLayer?.div) {
         div.insertBefore(textLayerDiv, this.annotationLayer.div);
-        if (~window.location.href.indexOf('/SignDocument/')) {
+        if (~window.location.href.indexOf('/System')) {
           div.appendChild(cover);
         }
       } else {
         div.appendChild(textLayerDiv);
-        if (~window.location.href.indexOf('/SignDocument/')) {
+        if (~window.location.href.indexOf('/System')) {
           div.appendChild(cover);
         }
       }
diff --git a/vue.config.js b/vue.config.js
index 21dac50b..90d68cdd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -16,7 +16,7 @@ const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title ||
 // eslint-disable-next-line no-undef
 module.exports = {
   // lintOnSave: false,
-  transpileDependencies: ['@cornerstonejs', 'minio'],
+  transpileDependencies: ['@cornerstonejs', 'minio', '@aws-sdk', '@smithy'],
   publicPath: process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
   // publicPath: '/',
   outputDir: 'dist',
@@ -64,6 +64,7 @@ module.exports = {
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
         // target: 'http://123.56.94.154:30668',
         target: 'http://106.14.89.110:30000',
+		  //target: 'http://localhost:3305',  // 后端测试环境
         // target: 'http://47.117.164.182:7010', // uat
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,