From a6cb83153ab435b2ecfed474b9246484e78c0763 Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Tue, 4 Apr 2023 14:02:12 +0800
Subject: [PATCH] peter

---
 src/components/360View/afterPart/index.vue    |    1 -
 .../360View/commonForm/deveopmentFIle.vue     |   16 +-
 .../360View/commonForm/eyesVision.vue         |   24 +-
 .../360View/commonForm/optometryForm.vue      |   27 +-
 src/components/360View/dataInfo.vue           |    2 +-
 src/components/360View/forePart/index.vue     |    1 -
 src/components/360View/img-reccrd.vue         |    9 +-
 src/components/360View/index1.vue             |    5 +-
 .../medicalRecord/callMedical/index.vue       |    9 +-
 .../medicalRecord/outPatientRecord/index.vue  |   36 +-
 src/components/360View/special/index.vue      |   29 +-
 .../360View/specialExamine/index.vue          |    1 -
 src/page-subspecialty/router/index.js         |    8 +-
 .../optometryManagement/cornea/HIS-add.vue    |    6 +-
 .../optometryManagement/cornea/index.vue      |  164 +-
 .../cornea/patient-add-or-update.vue          |   12 +-
 .../optometryManagement/dioptric/HIS-add.vue  |   31 +-
 .../optometryManagement/seeDoctor/index.vue   |   32 +-
 .../seeDoctor/ok-lens-rgp/add-or-update.vue   |  223 +++
 .../ok-lens-rgp/arrival-notice-or-update.vue  |  131 ++
 .../seeDoctor/ok-lens-rgp/index.vue           |  430 ++++
 .../seeDoctor/ok-lens-rgp/left-right-eye.vue  |  241 +++
 .../removeLens-returnGoods-or-update.vue      |  269 +++
 .../optometryManagement/seeDoctor/review.vue  |   17 +-
 .../views/pages/pacs/drawer.vue               |  175 ++
 .../views/pages/pacs/img-record.vue           | 1735 +++++++++++++++++
 .../views/pages/pacs/index.vue                |   48 +
 .../views/pages/pacs/show-file.vue            |  284 +++
 .../views/pages/pacsManage/index.vue          |   34 +-
 29 files changed, 3707 insertions(+), 293 deletions(-)
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/add-or-update.vue
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/arrival-notice-or-update.vue
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
 create mode 100644 src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
 create mode 100644 src/page-subspecialty/views/pages/pacs/drawer.vue
 create mode 100644 src/page-subspecialty/views/pages/pacs/img-record.vue
 create mode 100644 src/page-subspecialty/views/pages/pacs/index.vue
 create mode 100644 src/page-subspecialty/views/pages/pacs/show-file.vue

diff --git a/src/components/360View/afterPart/index.vue b/src/components/360View/afterPart/index.vue
index 107d186..533d093 100644
--- a/src/components/360View/afterPart/index.vue
+++ b/src/components/360View/afterPart/index.vue
@@ -523,7 +523,6 @@ export default {
       }
       const { data: res } = await this.$http.post(url, params)
       if (res.code === 0) {
-        this.$message.success('保存成功')
         await this.getforeList()
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue
index e1dfe03..143df75 100644
--- a/src/components/360View/commonForm/deveopmentFIle.vue
+++ b/src/components/360View/commonForm/deveopmentFIle.vue
@@ -547,18 +547,22 @@ export default {
           type: ''
         }]
       this.tableData = this.originTableData
+      this.getPatientData()
     },
     async getPatientData() {
       const { data: res } = await this.$http.get(
-          '/patient/view/getPatientData',
-          {
-            params: {
-              patientId: this.patientId
-            }
+        '/patient/view/getPatientData',
+        {
+          params: {
+            patientId: this.patientId
           }
+        }
       )
       if (res.code === 0) {
-        this.dataForm = res.data
+        const data = res.data
+        this.headData[1].patientName = data.patientName
+        this.headData[1].sex = data.patientSex
+        this.headData[1].birthday = data.patientBirthday
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index 0983ea8..58b5cd3 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -200,7 +200,7 @@
                         <input type="checkbox" :checked="item.isSelect">
                         <div>{{ item.name }}</div>
                       </div>
-                  </div>
+                    </div>
                   </div>
                   <div style="display: flex">
                     <p style="width: 140px;">调节功能异常：</p>
@@ -529,7 +529,7 @@ export default {
   created() {
   },
   mounted() {
-  this.originTableData = JSON.parse(JSON.stringify(this.tableData))
+    this.originTableData = JSON.parse(JSON.stringify(this.tableData))
     this.getPatientData()
   },
   methods: {
@@ -540,24 +540,22 @@ export default {
     },
     reSet() {
       this.dataForm = {
-        number: '',
-        name: '',
-        sex: '',
-        age: '',
-        file: '',
-        fileNUm: ''
+        patientId: '',
+        patientName: '',
+        patientSex: '',
+        patientAge: ''
       }
       this.tableData = this.originTableData
       this.getPatientData()
     },
     async getPatientData() {
       const { data: res } = await this.$http.get(
-          '/patient/view/getPatientData',
-          {
-            params: {
-              patientId: this.patientId
-            }
+        '/patient/view/getPatientData',
+        {
+          params: {
+            patientId: this.patientId
           }
+        }
       )
       if (res.code === 0) {
         this.dataForm = res.data
diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue
index edfa663..8d7717e 100644
--- a/src/components/360View/commonForm/optometryForm.vue
+++ b/src/components/360View/commonForm/optometryForm.vue
@@ -506,8 +506,6 @@ export default {
   mounted() {
     this.originTableData = JSON.parse(JSON.stringify(this.tableData))
     this.getPatientData()
-
-    console.log(window.localStorage.getItem('shili'))
     const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : []
     if (shili.length) {
       this.tableData[0].od = shili[0].odVan
@@ -519,24 +517,25 @@ export default {
       this.dataForm = this.formContent.a
       this.tableData = this.formContent.b
       this.getPatientData()
-      const shili = JSON.parse(window.localStorage.getItem('shili'))
-      if (shili.length) {
-        this.tableData[0].od = shili[0].odVan
-        this.tableData[0].os = shili[0].osVan
-      }
     },
     reSet() {
       this.dataForm = {
-        number: '',
-        name: '',
-        sex: '',
-        age: '',
+        patientId: '',
+        patientName: '',
+        patientSex: '',
+        patientAge: '',
         file: '',
         fileNUm: ''
       }
       this.tableData = this.originTableData
+      this.getPatientData()
     },
     async getPatientData() {
+      const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : []
+      if (shili.length) {
+        this.tableData[0].od = shili[0].odVan
+        this.tableData[0].os = shili[0].osVan
+      }
       const { data: res } = await this.$http.get(
         '/patient/view/getPatientData',
         {
@@ -546,7 +545,11 @@ export default {
         }
       )
       if (res.code === 0) {
-        this.dataForm = res.data
+        const data = res.data
+        this.dataForm.patientId = data.patientId
+        this.dataForm.patientName = data.patientName
+        this.dataForm.patientSex = data.patientSex
+        this.dataForm.patientAge = data.patientAge
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue
index a14edfd..e00ca89 100644
--- a/src/components/360View/dataInfo.vue
+++ b/src/components/360View/dataInfo.vue
@@ -131,7 +131,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="130">
+        <el-table-column label="操作" align="center" width="138">
           <template slot-scope="scope">
             <span
               class="cell-cursor"
diff --git a/src/components/360View/forePart/index.vue b/src/components/360View/forePart/index.vue
index 989dc96..70143d4 100644
--- a/src/components/360View/forePart/index.vue
+++ b/src/components/360View/forePart/index.vue
@@ -700,7 +700,6 @@ export default {
       }
       const { data: res } = await this.$http.post(url, params)
       if (res.code === 0) {
-        this.$message.success('保存成功')
         await this.getforeList()
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/img-reccrd.vue b/src/components/360View/img-reccrd.vue
index aac716e..8d39257 100644
--- a/src/components/360View/img-reccrd.vue
+++ b/src/components/360View/img-reccrd.vue
@@ -466,9 +466,7 @@ export default {
       this.examineType = type
       const { data: res } = await this.$http.get('/patient/pac30/getPatientTree', { params: {
         treeType: type,
-        // patientId: this.patientInfo.patientId
-        patientId: '2553716'
-        // patientId: '25490'
+        patientId: this.patientInfo.patientId
       }
       })
       if (res.code === 0) {
@@ -476,9 +474,7 @@ export default {
         for (let i = 0; i < data.length; i++) {
           const temp = data[i].children
           for (let j = 0; j < temp.length; j++) {
-            if (type === 1) {
-              // temp[j].name = temp[j].examineItem || ''
-            } else {
+            if (type === 2) {
               temp[j].examTime = temp[j].examTime ? temp[j].examTime.substring(0, 11) : ''
             }
           }
@@ -495,7 +491,6 @@ export default {
               this.examItemCode = data[0].id
             }
             for (let j = 0; j < temp.length; j++) {
-              // this.allExamine.push(`${temp[j].examNo}||${temp[j].risNo}`)
               if (this.examineType === 1) {
                 temp[j].examDate = cur.id
               }
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index f9cc931..7fc7586 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -363,10 +363,7 @@ export default {
     // 360浏览器
     handlePacs() {
       const { href } = this.$router.resolve({
-        name: 'pacs'
-        // query: {
-        //   id: 1
-        // }
+        name: 'pacsManage'
       })
       window.open(href, '_blank')
     },
diff --git a/src/components/360View/medicalRecord/callMedical/index.vue b/src/components/360View/medicalRecord/callMedical/index.vue
index 14b003a..90d9de3 100644
--- a/src/components/360View/medicalRecord/callMedical/index.vue
+++ b/src/components/360View/medicalRecord/callMedical/index.vue
@@ -5,9 +5,9 @@
         <div class="content-left-top">
           <div v-for="(item, index) in formList" :key="index" class="formBox" :class="[index === curIndex ? 'active' : '']" @click="handleForm(index, item)">
             <div>
-            <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.createTime }}</p>
-            <p>{{ item.name }}</p>
-          </div>
+              <p :class="[index === curIndex ? 'activeFont' : 'curFont']">{{ item.createTime }}</p>
+              <p>{{ item.name }}</p>
+            </div>
             <i style="margin-top: 28px;color: rgb(199,5,5)" class="el-icon-delete" v-if="index === curIndex && !onlyRead" @click="deleteForm(item.id)"></i>
           </div>
           <img v-if="!formList" src="@/assets/img/nodata.png" alt="" class="nodata">
@@ -101,7 +101,6 @@ export default {
       }
       const { data: res } = await this.$http.post('/case/save', params)
       if (res.code === 0) {
-        this.$message.success('保存成功')
         this.getFormList()
       } else {
         this.$message.error(res.msg)
@@ -135,6 +134,8 @@ export default {
           if (this.id === '') {
             this.handleForm(0, first)
           }
+        } else {
+          this.addRecord('门急诊电子病历')
         }
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue
index 4855dc4..7f5d829 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/index.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue
@@ -126,22 +126,22 @@ export default {
   methods: {
     // 保存表单
     handleSaveTable() {
-      // this.saveTableData('1', '病史采集')
-      // this.$refs.foreParts.saveFore()
-      // this.$refs.afterParts.saveAfter()
-      // this.$refs.examines.saveExamine()
-      // this.saveTableData('5', '诊断处置')
-      if (this.comonFormActive === '1') {
-        this.saveTableData('1', '病史采集')
-      } else if (this.comonFormActive === '2') {
-        this.$refs.foreParts.saveFore()
-      } else if (this.comonFormActive === '3') {
-        this.$refs.afterParts.saveAfter()
-      } else if (this.comonFormActive === '4') {
-        this.$refs.examines.saveExamine()
-      } else if (this.comonFormActive === '5') {
-        this.saveTableData('5', '诊断处置')
-      }
+      this.saveTableData('1', '病史采集')
+      this.$refs.foreParts.saveFore()
+      this.$refs.afterParts.saveAfter()
+      this.$refs.examines.saveExamine()
+      this.saveTableData('5', '诊断处置')
+      // if (this.comonFormActive === '1') {
+      //   this.saveTableData('1', '病史采集')
+      // } else if (this.comonFormActive === '2') {
+      //   this.$refs.foreParts.saveFore()
+      // } else if (this.comonFormActive === '3') {
+      //   this.$refs.afterParts.saveAfter()
+      // } else if (this.comonFormActive === '4') {
+      //   this.$refs.examines.saveExamine()
+      // } else if (this.comonFormActive === '5') {
+      //   this.saveTableData('5', '诊断处置')
+      // }
     },
     // 保存模板
     handleTemplate() {
@@ -214,7 +214,9 @@ export default {
 
       const { data: res } = await this.$http.post(url, params)
       if (res.code === 0) {
-        this.$message.success('保存成功')
+        if (flag === '1') {
+          this.$message.success('保存成功')
+        }
         this.getOutPatientList(flag)
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue
index 19669c7..25998c2 100644
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@@ -29,9 +29,6 @@
             <el-button type="text" size="small" @click.native.stop="handleRecord(scope.row)">
               所有报告
             </el-button>
-<!--            <el-button type="text" size="small" @click.native.prevent="handleData(scope.row)">-->
-<!--              提取数据-->
-<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -124,6 +121,7 @@ export default {
 
   },
   mounted() {
+
     this.getPatientData()
     this.getSpecialItem()
   },
@@ -184,17 +182,32 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    // 提取数据
+    // 点击行展示提取数据
     handleData(item) {
-      console.log(187,item)
       this.examNo = item.examNo
       this.examineItem = item.examineItem
       this.getItemData()
     },
-    // 查看报告
-    handleRecord() {
-      this.isActive = true
+    handleRecord(item) {
+      console.log(item)
+      const patientInfo = {
+        examDate: item.examTime ? item.examTime.substring(0, 11) : '',
+        itemCode: item.examineItem,
+        examNo: item.examNo,
+        patientId: this.patientId
+      }
+      const { href } = this.$router.resolve({
+        name: 'pacs',
+        query: {
+          info: this.$Base64.encode(JSON.stringify(patientInfo))
+        }
+      })
+      window.open(href, '_blank')
     },
+    // 查看报告
+    // handleRecord() {
+    //   this.isActive = true
+    // },
     // 关闭360弹框
     closePacs() {
       this.isActive = false
diff --git a/src/components/360View/specialExamine/index.vue b/src/components/360View/specialExamine/index.vue
index ffb80ae..5356906 100644
--- a/src/components/360View/specialExamine/index.vue
+++ b/src/components/360View/specialExamine/index.vue
@@ -249,7 +249,6 @@ export default {
       }
       const { data: res } = await this.$http.post(url, params)
       if (res.code === 0) {
-        this.$message.success('保存成功')
         await this.getOutPatientList()
       } else {
         this.$message.error(res.msg)
diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js
index 4997c25..2a56a62 100644
--- a/src/page-subspecialty/router/index.js
+++ b/src/page-subspecialty/router/index.js
@@ -36,8 +36,14 @@ export const pageRoutes = [
     meta: { title: '登录' }
   },
   {
-    path: '/pacs',
+    path: '/pacsManage',
     component: () => import('@/page-subspecialty/views/pages/pacsManage/index'),
+    name: 'pacsManage',
+    meta: { title: 'pacs浏览器', isTab: true }
+  },
+  {
+    path: '/pacs',
+    component: () => import('@/page-subspecialty/views/pages/pacs/index'),
     name: 'pacs',
     meta: { title: 'pacs浏览器', isTab: true }
   }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
index 08c457a..f19e6ca 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/HIS-add.vue
@@ -80,16 +80,16 @@ export default {
         this.tableText = '请查询所需数据'
         this.$refs.dataFormHis.resetFields() // 重置表单
         this.tableData = []
-        this.findHandle(1)
       })
     },
     // His查询按钮
     async findHandle(flag) {
       this.loading = true
-      if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
+      if (!this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
+        this.loading = false
         return this.$message.error('搜索内容不能为空')
       }
-      const { data: res } = await this.$http.get('/pat/Manage/getHisPatientList', {
+      const { data: res } = await this.$http.get('/patient/getHisPatient', {
         params: this.dataFormHis
       })
       if (res.code === 0) {
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
index 99665d5..340cee6 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
@@ -3,18 +3,15 @@
     <template>
       <div v-if="!detailViewVisible">
         <div class="patient-info-head">
-          <el-form :inline="true" :model="dataForm" class="demo-form-inline" @keyup.enter.native="search()">
+          <el-form :inline="true" :model="dataForm" class="demo-form-inline" @keyup.enter.native="getDataListInitial()">
             <el-form-item label="登记号:">
-              <el-input v-model="dataForm.patId" size="small" clearable placeholder="登记号" @clear="search()" />
-            </el-form-item>
-            <el-form-item label="就诊号:">
-              <el-input v-model="dataForm.patId" size="small" clearable placeholder="就诊号" @clear="search()" />
+              <el-input v-model="dataForm.patientId" size="small" clearable placeholder="登记号" @clear="getDataListInitial()" />
             </el-form-item>
             <el-form-item label="患者姓名:">
-              <el-input v-model="dataForm.patName" placeholder="患者姓名" size="small" clearable @clear="search()" />
+              <el-input v-model="dataForm.patientName" placeholder="患者姓名" size="small" clearable @clear="getDataListInitial()" />
             </el-form-item>
             <el-form-item label="身份证:">
-              <el-input v-model="dataForm.patIdNumber" size="small" clearable placeholder="身份证" @clear="search()" />
+              <el-input v-model="dataForm.patientIdNumber" size="small" clearable placeholder="身份证" @clear="getDataListInitial()" />
             </el-form-item>
             <el-form-item prop="dateRange" label="就诊时间" class="form-item-date">
               <el-date-picker
@@ -29,18 +26,18 @@
               />
             </el-form-item>
             <el-form-item style="flex:1">
-              <el-button type="primary" icon="el-icon-search" size="small" @click="search()">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="getDataListInitial()">查询</el-button>
             </el-form-item>
           </el-form>
         </div>
         <div class="patient-info-content">
-          <head-template head-left="患者列表">
-            <el-button size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>
-            <el-button type="primary" size="small" @click="HISHandle">
-              <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />
-              <span style="padding-left:5px;vertical-align: middle;">HIS引入</span>
-            </el-button>
-          </head-template>
+<!--          <head-template head-left="患者列表">-->
+<!--            <el-button size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>-->
+<!--            <el-button type="primary" size="small" @click="HISHandle">-->
+<!--              <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />-->
+<!--              <span style="padding-left:5px;vertical-align: middle;">HIS引入</span>-->
+<!--            </el-button>-->
+<!--          </head-template>-->
           <el-table
             ref="multipleTable"
             :data="dataList"
@@ -65,49 +62,26 @@
                   class="operation-details"
                   @click="browseClick(scope.row)"
                 >OK镜</span>
-                <!--                <el-dropdown trigger="click" @command="handleCommandDropdowm(scope.row.patIdNumber,scope.row,$event)">-->
-                <!--                  <i class="el-icon-more" />-->
-                <!--                  <el-dropdown-menu slot="dropdown">-->
-                <!--                    <el-dropdown-item command="编辑">编辑</el-dropdown-item>-->
-                <!--                    <el-dropdown-item command="修改身份证">修改身份证</el-dropdown-item>-->
-                <!--                    <el-dropdown-item v-if="$hasPermission('patientManagement:delete')" command="删除">删除</el-dropdown-item>-->
-                <!--                  </el-dropdown-menu>-->
-                <!--                </el-dropdown>-->
               </template>
             </el-table-column>
           </el-table>
           <el-pagination background layout="total,prev, pager, next" :total="total" :current-page.sync="page" @current-change="pageCurrentChangeHandle" />
         </div>
       </div>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :patient-type-list="patientTypeList" @refreshDataList="search" />
-      <!-- 修改身份证 -->
-<!--      <edit-patid v-if="editPatidVisible" ref="editPatidRef" @editPatidVisible="editPatidVisible=false" @refreshDataList="search" />-->
-      <!-- HIS引入弹框 -->
-      <his-add v-if="HisAddVisible" ref="HisAddRef" />
-      <!-- 加入分组弹框 -->
-<!--      <add-group v-if="addGroupVisible" ref="addGroupRef" @cancelClick="cancelClick" />-->
-      <!-- 详情页 -->
-<!--      <detail-view v-if="detailViewVisible" :id="detailId" ref="viewRef" :patient-id-number="patientIdNumber" is-search="" @detailViewVisible="detailViewVisible=false" />-->
     </template>
-    <!--    <router-view v-else />-->
   </div>
 </template>
 <script>
 import checked from '@/mixins/checked'
-import checkedFooter from '@/components/checked-footer'
 import headTemplate from '@/components/head'
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './patient-add-or-update'
-// import editPatid from './editPatid'
 import hisAdd from './HIS-add'
-// import detailView from '@/components/360View' // 360试图
 export default {
   components: {
     headTemplate,
     AddOrUpdate,
-    hisAdd,
-    checkedFooter
+    hisAdd
   },
   mixins: [checked, mixinViewModule],
   data() {
@@ -116,27 +90,16 @@ export default {
         getDataListURL: '/patient/page',
         getDataListIsPage: true
       },
-      cheackAllFooter: false,
       nextVisitTime: [],
-      isShowPatient: true,
       detailViewVisible: false,
       HisAddVisible: false,
-      editPatidVisible: false,
       dataForm: {
-        patId: '',
-        patName: '',
-        doctorName: '',
+        patientId: '',
+        patientName: '',
         beginDate: '',
         endDate: '',
-        slBeginDate: '',
-        slEndDate: '',
-        diagNoseName: '',
-        patIdNumber: ''
-      },
-      deleteParams: {
-        drgsName: window.localStorage.getItem('identity')
+        patientIdNumber: ''
       },
-      doctorNameList: [],
       patientTypeList: [],
       currentTableList: [],
       addGroupVisible: false,
@@ -144,16 +107,7 @@ export default {
       detailId: ''
     }
   },
-  watch: {
-    $route(val) {
-      // 如果两级以上就隐藏父级
-      this.isShowPatient = !(val.matched.length > 2)
-    }
-  },
   created() {
-    this.isShowPatient = !(this.$route.matched.length > 2)
-    // this.getDoctorName()
-    // this.gettPatType()
   },
   methods: {
     // 浏览
@@ -170,70 +124,9 @@ export default {
     },
     // 日期改变时
     dateChange(e) {
-      if (this.dataForm.drgsName === '青光眼') {
-        this.dataForm.beginDate = e ? e[0] : ''
-        this.dataForm.endDate = e ? e[1] : ''
-      } else {
-        this.dataForm.slBeginDate = e ? e[0] : ''
-        this.dataForm.slEndDate = e ? e[1] : ''
-      }
-
-      this.search()
-    },
-    // 告知书跳转
-    noticeClick(patIdNumber, scopeRow) {
-      this.$router.push({
-        path: '/seeDoctor',
-        query: {
-          info: this.$Base64.encode(JSON.stringify({
-            patientIdNumber: scopeRow.patIdNumber,
-            patId: scopeRow.patId
-          }))
-        }
-      })
-    },
-    // 获取管理师
-    async getDoctorName() {
-      const { data: res } = await this.$http.get('/pat/Manage/selectDoctorName', {
-        params: {
-          drgsName: window.localStorage.getItem('identity')
-        }
-      })
-      if (res.code === 0) {
-        this.doctorNameList = res.data
-      } else {
-        this.$message.error(res.msg)
-      }
-    },
-    // // 获取患者类型
-    // async gettPatType() {
-    //   const { data: res } = await this.$http.get('/pat/Manage/selectPatType', {
-    //     params: {
-    //       drgsName: window.localStorage.getItem('identity')
-    //     }
-    //   })
-    //   if (res.code === 0) {
-    //     this.patientTypeList = res.data
-    //   } else {
-    //     this.$message.error(res.msg)
-    //   }
-    // },
-    // 点击菜单触发事件回调
-    handleCommandDropdowm(patIdNumber, scopeRow, e) {
-      if (e === '编辑') {
-        this.addOrUpdateHandle(patIdNumber, scopeRow, '修改患者')
-      } else if (e === '修改身份证') {
-        this.editPatidVisible = true
-        this.$nextTick(() => {
-          this.$refs.editPatidRef.dataForm.newIdNumber = patIdNumber
-          this.$refs.editPatidRef.dataForm.oldIdNumber = patIdNumber
-          this.$refs.editPatidRef.init()
-        })
-      } else if (e === '告知书') {
-        this.noticeClick(patIdNumber, scopeRow, e)
-      } else if (e === '删除') {
-        this.deleteHandle(patIdNumber, 'patIdNumber')
-      }
+      this.dataForm.beginDate = e ? e[0] : ''
+      this.dataForm.endDate = e ? e[1] : ''
+      this.getDataListInitial()
     },
     // His引入
     HISHandle() {
@@ -241,26 +134,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.HisAddRef.init()
       })
-    },
-    // 加入分组
-    addGroupHandle() {
-      this.addGroupVisible = true
-      this.$nextTick(() => {
-        const patientIdNumberList = []
-        this.currentTableList.forEach(item => {
-          patientIdNumberList.push(item.patIdNumber)
-        })
-        this.$refs.addGroupRef.dataForm.patientIdNumberList = patientIdNumberList
-        this.$refs.addGroupRef.init()
-      })
-    },
-    // 取消table勾选
-    cancelClick() {
-      this.cheackAllFooter = false
-      this.cheackReverseFooter = false
-      this.$refs.multipleTable.clearSelection()
     }
-
   }
 }
 </script>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue
index 966800e..4c89d06 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/patient-add-or-update.vue
@@ -7,10 +7,10 @@
   >
     <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
       <el-form-item label="登记号:" label-width="120px" prop="patId" class="formItemOne">
-        <el-input v-model="dataForm.patId" placeholder="请输入病历号" />
+        <el-input v-model="dataForm.patientId" placeholder="请输入病历号" />
       </el-form-item>
       <el-form-item label="患者姓名:" label-width="120px" prop="patName">
-        <el-input v-model="dataForm.patName" placeholder="请输入姓名" />
+        <el-input v-model="dataForm.patientName" placeholder="请输入姓名" />
       </el-form-item>
       <el-form-item v-if="!dataForm.id" label="身份证号:" label-width="120px" prop="patIdNumber">
         <el-input v-model="dataForm.patIdNumber" placeholder="请输入身份证号 " />
@@ -38,9 +38,9 @@
           <el-radio-button label="2">月</el-radio-button>
         </el-radio-group>
       </el-form-item> -->
-      <el-form-item v-if="dataForm.drgsName == '青光眼'" label="备注:" label-width="90px" prop="remarks">
-        <el-input v-model="dataForm.remarks" type="textarea" />
-      </el-form-item>
+<!--      <el-form-item v-if="dataForm.drgsName == '青光眼'" label="备注:" label-width="90px" prop="remarks">-->
+<!--        <el-input v-model="dataForm.remarks" type="textarea" />-->
+<!--      </el-form-item>-->
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -63,6 +63,7 @@ export default {
     return {
       visible: false,
       dataForm: {
+        platform: 1,
         patId: '',
         patName: '',
         patIdNumber: '',
@@ -72,7 +73,6 @@ export default {
         revisitCycles: '1', // 周期数
         revisitCyclesUnit: '3', // 周期单位 1年2月3日4周
         remarks: '',
-        drgsName: window.localStorage.getItem('identity')
       }
     }
   },
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
index 3d4200b..86ea8bc 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
@@ -111,21 +111,22 @@ export default {
       }
     },
     // 点击引入按钮
-    async introduceHandle(item) {
-      console.log(item)
-      const { data: res } = await this.$http.get('/patient/doLeadIn', {
-        params: {
-          patientId: item.patientId,
-          platform: this.isSearch
-        }
-      })
-      if (res.code === 0) {
-        this.$message.success('引入成功!')
-        this.$parent.getDataListInitial()
-      } else {
-        this.tableText = res.msg
-        this.$message.error(res.msg)
-      }
+    async introduceHandle(scopwRow) {
+      this.$parent.addOrUpdateHandle('', scopwRow, 'HIS引入')
+      // console.log(item)
+      // const { data: res } = await this.$http.get('/patient/doLeadIn', {
+      //   params: {
+      //     patientId: item.patientId,
+      //     platform: this.isSearch
+      //   }
+      // })
+      // if (res.code === 0) {
+      //   this.$message.success('引入成功!')
+      //   this.$parent.getDataListInitial()
+      // } else {
+      //   this.tableText = res.msg
+      //   this.$message.error(res.msg)
+      // }
     }
   }
 }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
index 4be4e94..7c136d7 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
@@ -11,8 +11,8 @@
         <span style="vertical-align: text-bottom">{{ patientInfoObj.patientId }}</span>
       </p>
       <p class="head-b">
-        <img v-if="patientInfoObj.patientIdNumber" :src="require('@/assets/img/id.png')" alt="" style="margin-right: 6px;vertical-align: middle">
-        <span class="mr16" style="vertical-align: middle">{{ patientInfoObj.patientIdNumber }}</span>
+        <img v-if="patientInfoObj.patientId" :src="require('@/assets/img/id.png')" alt="" style="margin-right: 6px;vertical-align: middle">
+        <span class="mr16" style="vertical-align: middle">{{ patientInfoObj.patientId }}</span>
         <img v-if="patientInfoObj.patientPhone" :src="require('@/assets/img/phone.png')" alt="" style="margin-right: 6px;vertical-align: middle">
         <span class="mr16" style="vertical-align: middle">{{ patientInfoObj.patientPhone }}</span>
         <img v-if="patientInfoObj.patientAddress" :src="require('@/assets/img/position.png')" alt="" style="margin-right: 6px;vertical-align: middle">
@@ -22,20 +22,27 @@
     <div class="see-docto-right">
       <el-tabs v-model="activeName" type="card" @tab-click="TabClick">
         <el-tab-pane label="告知书" name="noticeBook">
-          <notice-book :patient-id-number="patientIdNumber" />
+          <notice-book :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="首诊单" name="firstVisit">
-          <first-visit :crf-id="patientInfoObj.crfId" :patient-id-number="patientIdNumber" :patient-id="patientId" />
+          <first-visit :crf-id="patientInfoObj.crfId" :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="OK镜" name="okLens">
-          <ok-lens ref="OKLens" :patient-id="patientId" :doctor-list="doctorList" />
+          <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="okLens" />
+<!--          <ok-lens ref="OKLens" :patient-id="patientId" :doctor-list="doctorList" />-->
         </el-tab-pane>
         <el-tab-pane label="复查情况" name="review">
-          <review :patient-id-number="patientIdNumber" :patient-id="patientId" />
+          <review :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="历史档案" name="history">
           <history-file :patientId="patientId" />
         </el-tab-pane>
+        <el-tab-pane label="RGP" name="RGP">
+          <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="RGP" />
+        </el-tab-pane>
+        <el-tab-pane label="离焦软镜" name="离焦软镜">
+          <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="LJRJ" />
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -46,9 +53,12 @@ import okLens from './ok-lens/index.vue' // ok镜
 import noticeBook from './notice-book.vue' // 告知书
 import review from './review.vue' // 复查情况
 import historyFile from './historyRecord.vue' // 历史档案
+import okLensRgp from './ok-lens-rgp/index.vue' // ok镜
+
 export default {
   components: {
     firstVisit,
+    okLensRgp,
     okLens,
     noticeBook,
     review,
@@ -61,7 +71,7 @@ export default {
       doctorList: [],
       patientInfoObj: {},
       activeName: 'noticeBook',
-      patientIdNumber: '',
+      patientId: '',
       patientId: '',
       pageParams: {}
     }
@@ -86,7 +96,7 @@ export default {
       },
       {
         name: '身份证号',
-        info: val.patientIdNumber
+        info: val.patientId
       },
       {
         name: '手机号',
@@ -106,7 +116,7 @@ export default {
   },
   created() {
     this.pageParams = JSON.parse(this.$Base64.decode(this.$route.query.info))
-    this.patientIdNumber = this.pageParams.patientIdNumber
+    this.patientId = this.pageParams.patientId
     this.patientId = this.pageParams.patientId
     this.getPatientInfo()
     this.getDoctorList()
@@ -141,8 +151,8 @@ export default {
     },
     // 告知书
     TabClick(tab, event) {
-      if (tab.name === 'okLens') {
-        this.$refs.OKLens.init()
+      if (tab.name === 'okLensRgp') {
+        this.$refs.okLensRgp.init()
       }
     }
   }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/add-or-update.vue
new file mode 100644
index 0000000..f170b67
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/add-or-update.vue
@@ -0,0 +1,223 @@
+<template>
+  <el-dialog
+    class="oklens-add-order"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    :width="dataForm.title==='新增' || dataForm.title === '换片' || dataForm.title === '补录' || dataForm.title === '借片' ? '60%' : '30%'"
+    :title="dataForm.title"
+  >
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
+      <el-form-item :label="dataForm.title === '借片' ? '借片日期' : '订片日期'" label-width="90px" prop="dpDate">
+        <el-date-picker v-model="dataForm.dpDate" type="date" placeholder="请选择订片日期" value-format="yyyy-MM-dd" />
+      </el-form-item>
+      <el-form-item :label="dataForm.title === '借片' ? '借片医生':'订片医生'" label-width="90px" prop="dpDoctorId">
+        <el-select v-model="dataForm.dpDoctorId" placeholder="请选择订片医生" clearable>
+          <el-option v-for="(item,index) in doctorList " :key="index" :value="item.doctorId" :label="item.doctorName" />
+        </el-select>
+      </el-form-item>
+      <div v-if="dataForm.title==='新增' || dataForm.title === '换片' || dataForm.title === '补录' || dataForm.title === '借片' || dataForm.title === '离焦软镜'" class="eyeType">
+        <div class="rightEye">
+          <p class="rightEye-text">右眼</p>
+          <left-right-eye ref="rightEyeRef" :brand-list="brandList" eye-type="OD" :title="dataForm.title" :patient-id-number="patientIdNumber" :tab-title="tabTitle" />
+        </div>
+        <div class="leftEye">
+          <p class="leftEye-text">左眼</p>
+          <left-right-eye ref="leftEyeRef" :brand-list="brandList" eye-type="OS" :title="dataForm.title" :patient-id-number="patientIdNumber" :tab-title="tabTitle" />
+        </div>
+      </div>
+      <left-right-eye v-if="dataForm.title==='编辑' || dataForm.title==='编辑补录' || dataForm.title==='编辑借片' || dataForm.title==='编辑离焦软镜'" ref="editLeftRightEye" :brand-list="brandList" :title="dataForm.title" :tab-title="tabTitle" />
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import leftRightEye from './left-right-eye.vue'
+export default {
+  components: {
+    leftRightEye
+  },
+  props: {
+    brandList: {
+      type: Array,
+      default: () => []
+    },
+    patientIdNumber: {
+      type: String,
+      default: ''
+    },
+    doctorList: {
+      type: Array,
+      default: () => []
+    },
+    tabTitle: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        dpDoctorId: '',
+        dpDate: '',
+        patientIdNumber: this.patientIdNumber,
+        drgsName: window.localStorage.getItem('identity')
+      },
+      ISCRTForm: false
+    }
+  },
+  computed: {
+    dataRule() {
+      return {
+        dpDoctorId: [
+          { required: true, message: '请选择订片医生', trigger: 'change' }
+        ],
+        dpDate: [
+          { required: true, message: '请选择订片日期', trigger: 'change' }
+        ]
+
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    init() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.dataForm.resetFields() // 重置表单
+        if (this.dataForm.title === '新增' || this.dataForm.title === '借片' || this.dataForm.title === '换片' || this.dataForm.title === '补录') {
+          this.$refs.rightEyeRef.leftRightInit()
+          this.$refs.leftEyeRef.leftRightInit()
+        } else if (this.dataForm.title === '编辑' || this.dataForm.title === '编辑补录') {
+          this.$refs.editLeftRightEye.leftRightInit()
+        }
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+      this.dataForm.dpDoctorId = ''
+      this.dataForm.dpDate = ''
+    },
+    // 获取信息
+    getInfo() {
+      this.$http.get(`/dp/getDpInfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.ISCRTForm = res.data.flag
+        this.$refs.editLeftRightEye.ISCRTForm = this.ISCRTForm
+        const eyeData = JSON.parse(JSON.stringify(res.data))
+        delete eyeData.dpDate
+        delete eyeData.dpDoctorId
+        delete eyeData.dpDoctorName
+        this.$refs.editLeftRightEye.dataForm = { ...eyeData }
+        this.$refs.editLeftRightEye.getBrandColorList('', res.data.brandId, '编辑')
+      }).catch(() => {})
+    },
+
+    // 表单提交 320321188808123330    18888888888
+    dataFormSubmitHandle: debounce(function() {
+      this.$refs.dataForm.validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.title === '新增' || this.dataForm.title === '借片' || this.dataForm.title === '换片' || this.dataForm.title === '补录') {
+          let flag = 0
+          this.$refs.rightEyeRef.validateFun()
+          if (this.$refs.rightEyeRef.validateFlag) {
+            flag++
+            this.dpFun({ ...this.dataForm, ...this.$refs.rightEyeRef.dataForm })
+          }
+
+          this.$refs.leftEyeRef.validateFun()
+          if (this.$refs.leftEyeRef.validateFlag) {
+            flag++
+            this.dpFun({ ...this.dataForm, ...this.$refs.leftEyeRef.dataForm })
+          }
+          flag === 0 ? this.$message.error('请填写右眼或左眼完整信息') : ''
+        } else if (this.dataForm.title === '编辑' || this.dataForm.title === '编辑补录' || this.dataForm.title === '编辑借片' || this.dataForm.title === '编辑离焦软镜') {
+          this.$refs.editLeftRightEye.validateFun()
+          this.dpFun({ ...this.dataForm, ...this.$refs.editLeftRightEye.dataForm })
+        }
+      })
+    }, 1000, { leading: true, trailing: false }),
+    // 订片接口封装
+    dpFun(data) {
+      const url = this.dataForm.title === '新增' || this.dataForm.title === '编辑' || this.dataForm.title === '编辑补录' || this.dataForm.title === '编辑借片' || this.dataForm.title === '编辑离焦软镜' ? '/dp' : (this.dataForm.title === '换片' ? '/dp/replace' : (this.dataForm.title === '补录' ? '/dp/addRecord' : (this.dataForm.title === '借片' ? '/dp/borrow' : '')))
+      this.$http[!this.dataForm.id ? 'post' : 'put'](url, data).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.visible = false
+            this.$emit('refreshDataList')
+          }
+        })
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.oklens-add-order {
+  .eyeType {
+    margin-left:90px;
+    display: flex;
+    .rightEye {
+      margin-right: 16px;
+    }
+    .rightEye,.leftEye {
+      width: 50%;
+      border-radius: 6px;
+      background: #FAFAFA;
+      padding: 0 20px;
+    }
+    .rightEye-text,.leftEye-text {
+      font-size: 16px;
+      height: 50px;
+      line-height: 50px;
+      font-weight: 700;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+      margin-bottom: 20px;
+    }
+  }
+}
+</style>
+<style lang="scss">
+.oklens-add-order {
+  .el-dialog__header {
+    margin-bottom:12px
+  }
+    .el-dialog__body {
+        padding-right: 30px;
+    }
+    .formItemOne .el-form-item__content {
+      display: flex;
+    }
+    .el-date-editor.el-input, .el-date-editor.el-input__inner{
+      width: 100%;
+    }
+    .el-select {
+      display: block;
+    }
+    .el-input-number {
+      display: block;
+      width: 100%;
+    }
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/arrival-notice-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/arrival-notice-or-update.vue
new file mode 100644
index 0000000..0533323
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/arrival-notice-or-update.vue
@@ -0,0 +1,131 @@
+<template>
+  <el-dialog
+    class="oklens-add-order"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="30%"
+    :title="dataForm.title"
+    append-to-body
+    @close="closeDialog"
+  >
+    <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
+      <el-form-item :label="(dataForm.title=='更改通知' ? '通知' : dataForm.title) + '日期:'" label-width="90px" prop="shareDate">
+        <el-date-picker v-model="dataForm.shareDate" value-format="yyyy-MM-dd" type="date" :placeholder="'请选择' + (dataForm.title=='更改通知' ? '通知' : dataForm.title )+ '日期'" />
+      </el-form-item>
+      <template v-if="dataForm.title=='到货'">
+        <el-form-item label="出厂编号:" label-width="90px" prop="factoryNumber">
+          <el-input v-model="dataForm.factoryNumber" placeholder="核对并填写出厂编号" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备 注:" label-width="90px" prop="remark">
+        <el-input v-model="dataForm.remark" type="textarea" placeholder="备注信息" />
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  props: {
+    brandList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        dpId: '',
+        shareDate: '',
+        factoryNumber: '',
+        remark: ''
+      },
+      params: {}
+    }
+  },
+  computed: {
+    dataRule() {
+      return {
+        shareDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        factoryNumber: [
+          { required: true, message: '请选择出厂编号', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs.dataForm.resetFields() // 重置表单
+        console.log(this.dataForm)
+        if (this.dataForm.title === '更改通知') {
+          this.dataForm.id = this.params.noticeId
+          this.dataForm.remark = this.params.noticeRemark
+          this.dataForm.shareDate = this.params.noticeDate
+        } else if (this.dataForm.title === '通知') {
+          this.dataForm.shareDate = this.$moment().format('YYYY-MM-DD')
+        }
+      })
+    },
+    // 表单提交 320321188808123330    18888888888
+    dataFormSubmitHandle: debounce(function() {
+      this.$refs.dataForm.validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        const url = this.dataForm.title === '到货' ? '/dp/arrival' : (this.dataForm.title === '通知' ? '/dp/notice' : this.dataForm.title === '更改通知' ? '/dp/updateNotice' : '')
+        this.$http[!this.params.noticeId ? 'post' : 'put'](url, this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('getDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { leading: true, trailing: false }),
+    // 关闭弹框
+    closeDialog() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style lang="scss">
+.oklens-add-order {
+  .el-dialog__header {
+    margin-bottom:12px
+  }
+    .el-dialog__body {
+        padding-right: 30px;
+    }
+    .formItemOne .el-form-item__content {
+      display: flex;
+    }
+    .el-date-editor.el-input, .el-date-editor.el-input__inner{
+      width: 100%;
+    }
+    .el-select {
+      display: block;
+    }
+    .el-input-number {
+      display: block;
+      width: 100%;
+    }
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
new file mode 100644
index 0000000..1ce4992
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/index.vue
@@ -0,0 +1,430 @@
+<template>
+  <div class="okLens">
+    <!-- ok镜头部 -->
+    <head-template head-left="订片记录">
+      <el-button v-if="tabTitle !== 'LJRJ'" size="small" @click="addOrUpdateHandle('','','借片')">
+        <svg-icon icon-class="icon-jiebei" /><span class="repair-title">借片</span>
+      </el-button>
+      <el-button v-if="tabTitle !== 'LJRJ'" size="small" @click="addOrUpdateHandle('','','补录')">
+        <svg-icon icon-class="icon-repair" /><span class="repair-title">补录</span>
+      </el-button>
+      <el-button size="small" @click="addOrUpdateHandle('','','换片')">
+        <svg-icon icon-class="icon-change-film" /><span class="change-title">换片</span>
+      </el-button>
+      <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增')">新增</el-button>
+    </head-template>
+
+    <!-- ok镜内容 -->
+    <!-- 1:定片未到货，2:到货未通知，3:通知未取镜，4:取镜/离焦软镜，5:放弃取镜，6:换片 7:补录，8:借片，100:退货 -->
+    <el-table ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%" :height="`calc(100vh - 217px)`" :row-class-name="getRowClass">
+      <el-table-column type="expand">
+        <template v-if="scope.row.status!=7 || scope.row.status!=8" slot-scope="scope">
+          <el-steps space="80%" :active="scope.row.status==3 ? 3 : scope.row.status" :finish-status="scope.row.status==4 ? 'success' : ( scope.row.status== 5 || scope.row.status== 100 ? 'error' : ( scope.row.status== 6 ? 'wait' : 'finish' ))">
+            <el-step v-for="(item,index) in scope.row.logVOList" :key="index" :title="item.name">
+              <template slot="description">
+                <div class="step-desc">
+                  <p class="description-name">{{ item.status==1 && !scope.row.oldDpId ? '订片': (item.status==2 ? '到货' : (item.status==3 ? '通知' : (item.status==4 ? '取镜' :(item.status==5 ? '放弃' : (item.status==6 ? '换片' : (item.status==100 ? '退货' : (item.status==1&& scope.row.oldDpId ? '换片':''))))))) }}</p>
+                  <p class="description-date"> {{ item.shareDate ? $options.filters.dateFilterTwo( item.shareDate) : '' }}</p>
+                  <p v-show="item.status==2 || item.status==6">出厂编号：{{ item.factoryNumber ? item.factoryNumber : '-' }}</p>
+                  <p v-show="item.status==1 && scope.row.oldDpId ">原订片编号：{{ scope.row.oldDpId ? scope.row.oldDpId.substr(9) : '' }}</p>
+                  <p v-show="item.status==6">新订片编号：{{ scope.row.newDpId ? scope.row.newDpId.substr(9) : '' }}</p>
+                  <div class="description-content">
+                    <template v-if="item.status==1">
+                      <span v-show="scope.row.eyeType">眼别：{{ scope.row.eyeType }}</span>
+                      <span v-show="scope.row.brand">品牌：{{ scope.row.brand }}</span>
+                      <span v-show="scope.row.curvity && (scope.row.flag=='0'||scope.row.flag=='2')">曲率：{{ scope.row.curvity }}</span>
+                      <span v-show="scope.row.degrees && (scope.row.flag=='0'||scope.row.flag=='2')">度数：{{ scope.row.degrees }}</span>
+                      <span v-show="scope.row.degrees && scope.row.flag=='2'">AZT：{{ scope.row.azt }}</span>
+                      <span v-show="scope.row.bc && (scope.row.flag=='1' ||scope.row.flag=='2')">BC：{{ scope.row.bc }}</span>
+                      <span v-show="scope.row.rzd && scope.row.flag=='1'">RZD：{{ scope.row.rzd }}</span>
+                      <span v-show="scope.row.lza && scope.row.flag=='1'">LZA：{{ scope.row.lza }}</span>
+                      <span v-show="scope.row.diameter">直径：{{ scope.row.diameter }}</span>
+                    </template>
+                    <template v-else>
+                      <p v-show="item.status==4 && item.id && scope.row.status==4" class="take-mirror" @click="removeLensReturnGoodsClick(scope.row.id,...scope.row,'取镜记录')">取镜记录</p>
+                    </template>
+                    <p v-show="item.operateDoctorName">订片医生：{{ item.dpDoctorName }}</p>
+                    <p v-show="item.operateDoctorName">操作者：{{ item.operateDoctorName }}</p>
+                    <p>备注：{{ item.remark ? item.remark : '-' }}</p>
+                  </div>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </template>
+      </el-table-column>
+      <el-table-column prop="id" label="订片编号" :width=" tabTitle !== 'LJRJ' ? 100 : ''">
+        <template slot-scope="scope">
+          {{ scope.row.id ? scope.row.id.substr(9): '- ' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="dpDate" label="订片日期" :width=" tabTitle !== 'LJRJ' ? 100 : ''">
+        <template slot-scope="scope">
+          {{ scope.row.dpDate ? $options.filters.dateFilterTwo( scope.row.dpDate): '- ' }}
+        </template>
+      </el-table-column>
+      <el-table-column v-if="tabTitle !=='LJRJ'" prop="content" :label="tabTitle==='okLens' ? '内容(眼别 品牌 曲率 度数 直径)' : '内容(眼别 品牌 基弧 度数 直径)'" width="240">
+        <template slot-scope="scope">
+          <div class="table-colum-content">
+            <span v-show="scope.row.eyeType"><b :style="{'color':scope.row.eyeType==='OD' ? 'green': '#1E79FF'}">眼别：{{ scope.row.eyeType }}</b></span>
+            <span v-show="scope.row.brand">品牌：{{ scope.row.brand }}</span>
+            <!-- flag 0 第一种国产品牌  flag 1 进口品牌    flag 0 第二种国产品牌 -->
+            <!-- 根据不同的flag显示不同的内容 -->
+            <span v-show="scope.row.curvity && (scope.row.flag=='0'||scope.row.flag=='2') && tabTitle==='okLens'">曲率：{{ scope.row.curvity }}</span>
+            <span v-show="scope.row.baseArc && (scope.row.flag=='0'||scope.row.flag=='2') && tabTitle==='RGP'">基弧：{{ scope.row.baseArc }}</span>
+            <span v-show="scope.row.degrees && (scope.row.flag=='0'||scope.row.flag=='2')">度数：{{ scope.row.degrees }}</span>
+            <span v-show="scope.row.degrees && scope.row.flag=='2'">AZT：{{ scope.row.azt }}</span>
+            <span v-show="scope.row.bc && (scope.row.flag=='1' ||scope.row.flag=='2')">BC：{{ scope.row.bc }}</span>
+            <span v-show="scope.row.rzd && scope.row.flag=='1'">RZD：{{ scope.row.rzd }}</span>
+            <span v-show="scope.row.lza && scope.row.flag=='1'">LZA：{{ scope.row.lza }}</span>
+            <span v-show="scope.row.diameter">直径：{{ scope.row.diameter }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="tabTitle ==='LJRJ'" prop="content" label="内容(眼别 品牌 度数)" width="300">
+        <template slot-scope="scope">
+          <div class="table-colum-content">
+            <span v-show="scope.row.eyeType"><b :style="{'color':scope.row.eyeType==='OD' ? 'green': '#1E79FF'}">眼别：{{ scope.row.eyeType }}</b></span>
+            <span v-show="scope.row.brand">品牌：{{ scope.row.brand }}</span>
+            <span v-show="scope.row.degrees">度数：{{ scope.row.degrees }}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="remark" label="备注">
+        <template slot-scope="scope">
+          {{ scope.row.remark ? scope.row.remark : '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="dpDoctorName" label="订片医生" />
+      <template v-if="tabTitle !=='LJRJ'">
+        <el-table-column prop="arrivalDate" label="到货日期">
+          <template slot-scope="scope">
+            {{ scope.row.arrivalDate ? $options.filters.dateFilterTwo( scope.row.arrivalDate): '- ' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="noticeDate" label="通知日期">
+          <template slot-scope="scope">
+            {{ scope.row.noticeDate ? $options.filters.dateFilterTwo( scope.row.noticeDate): '- ' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="takeAwayDate" label="取镜日期">
+          <template slot-scope="scope">
+            {{ scope.row.takeAwayDate ? $options.filters.dateFilterTwo( scope.row.takeAwayDate): '- ' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="returnDate" label="归还日期">
+          <template slot-scope="scope">
+            {{ scope.row.returnDate ? $options.filters.dateFilterTwo( scope.row.returnDate): '- ' }}
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column label="状态">
+        <!-- 1:定片未到货，2:到货未通知，3:通知未取镜，4:放弃取镜，5:放弃取镜，6:换片，7:补录，100:退货 -->
+        <template slot-scope="scope">
+          <div v-show="scope.row.status == 1">
+            <span class="circle-status not-start" />
+            <span>未到货</span>
+          </div>
+          <div v-show="scope.row.status == 2">
+            <span class="circle-status not-start" />
+            <span>未通知</span>
+          </div>
+          <div v-show="scope.row.status == 3">
+            <template v-if="new Date(scope.row.noticeDate).setDate(new Date(scope.row.noticeDate).getDate() + 30) < new Date()">
+              <span class="circle-status not-start" />
+              <span>通知30天未取镜</span>
+            </template>
+            <template v-else>
+              <span class="circle-status not-start" />
+              <span>未取镜</span>
+            </template>
+          </div>
+          <div v-show="scope.row.status == 4">
+            <span class="circle-status goed" />
+            <span>已取镜</span>
+          </div>
+          <div v-show="scope.row.status == 5">
+            <span class="circle-status goed" />
+            <span>已放弃</span>
+          </div>
+          <div v-show="scope.row.status == 6">
+            <span class="circle-status patch" />
+            <span>换片</span>
+          </div>
+          <div v-show="scope.row.status == 7">
+            <span class="circle-status patch" />
+            <span>补录</span>
+          </div>
+          <div v-show="scope.row.status == 8">
+            <span class="circle-status blue" />
+            <span>借片</span>
+          </div>
+          <div v-show="scope.row.status == 100">
+            <span class="circle-status give-up" />
+            <span>已退货</span>
+          </div>
+        </template>
+      </el-table-column>
+      <!-- 1:未到货，2未通知，3:未取镜，4:取镜，5:已放弃，6:换片，7:补录，8:借片，100:退货 -->
+      <el-table-column prop="operation" label="操作" width="150">
+        <template slot-scope="scope">
+          <div v-show="scope.row.status!=6 && scope.row.status!=7 && scope.row.status!=8 && scope.row.status!=100 && tabTitle !== 'LJRJ'">
+            <span v-show="scope.row.status==1" class="operation-details" @click="arrivalNotiveClick(scope.row.id,...scope.row,'到货')">到货</span>
+            <span v-show="scope.row.status==2" class="operation-details" @click="arrivalNotiveClick(scope.row.id,...scope.row,'通知')">通知</span>
+            <span v-show="scope.row.status==3" class="operation-details" @click="arrivalNotiveClick(scope.row.id,...scope.row,'更改通知')">更改通知</span>
+            <span v-show="scope.row.status==3 || scope.row.status==5" class="operation-details" @click="removeLensReturnGoodsClick(scope.row.id,...scope.row,'取镜')">取镜</span>
+            <span v-show="scope.row.status==4" class="operation-details" @click="removeLensReturnGoodsClick(scope.row.id,...scope.row,'取镜记录')">取镜记录</span>
+            <span v-show="scope.row.status==1 || scope.row.status==2 || scope.row.status==4 || scope.row.status==5" class="operation-details" @click="removeLensReturnGoodsClick(scope.row.id,...scope.row,'退货')">退货</span>
+            <el-dropdown trigger="click" @command="handleCommandDropdowm(scope.row.id,...scope.row,$event)">
+              <i class="el-icon-more" />
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-show="scope.row.status==3" command="退货">退货</el-dropdown-item>
+                <el-dropdown-item command="编辑">编辑</el-dropdown-item>
+                <el-dropdown-item v-if="$hasPermission('patientManagement:delete')" command="删除">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+          <div v-show="scope.row.status==6 || scope.row.status==7 || scope.row.status==8 || scope.row.status==100 || tabTitle =='LJRJ'">
+            <span v-show="scope.row.status==7 || scope.row.status==8 || tabTitle =='LJRJ'" class="operation-details" @click="addOrUpdateHandle(scope.row.id,...scope.row,`编辑${scope.row.status===7 ? '补录' : (scope.row.status==8 ? '借片' : (tabTitle =='LJRJ' ? '离焦软镜' :''))}`)">编辑</span>
+            <template v-if="$hasPermission('patientManagement:delete')">
+              <span v-show="scope.row.status==6 || scope.row.status==7 || scope.row.status==8 || scope.row.status==100 || tabTitle =='LJRJ'" class="operation-details" @click="deleteHandle(scope.row.id)">删除</span>
+            </template>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 弹窗 新增/编辑/换片/补录/借片 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" :doctor-list="doctorList" :brand-list="brandList" :patient-id="patientId" :tab-title="tabTitle" @refreshDataList="getDataList()" />
+    <!-- 弹窗 到货/通知 -->
+    <arrival-notice-or-update v-if="arrivalNoticeVisible" ref="arrivalNoticeOrUpdate" :patient-id="patientId" @refreshDataList="getDataList" @getDataList="getDataList()" @closeDialog="arrivalNoticeVisible=false" />
+    <!-- 弹窗 取镜/退货 -->
+    <removeLens-returnGoods-or-update v-if="removeLensReturnGoodsVisible" ref="removeLensReturnGoodsOrUpdate" :patient-id="patientId" :father-factory-number="factoryNumber" @getDataList="getDataList()" @closeDialog="removeLensReturnGoodsVisible=false" />
+  </div>
+</template>
+<script>
+import headTemplate from '@/components/head'
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './add-or-update.vue'
+import arrivalNoticeOrUpdate from './arrival-notice-or-update'
+import removeLensReturnGoodsOrUpdate from './removeLens-returnGoods-or-update'
+export default {
+  components: {
+    headTemplate,
+    AddOrUpdate,
+    arrivalNoticeOrUpdate,
+    removeLensReturnGoodsOrUpdate
+  },
+  mixins: [mixinViewModule],
+  props: {
+    patientId: {
+      type: String,
+      default: ''
+    },
+    doctorList: {
+      type: Array,
+      default: () => []
+    },
+    tabTitle: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      tableHeight: '',
+      brandList: [],
+      arrivalNoticeVisible: false,
+      removeLensReturnGoodsVisible: false,
+      mixinViewModuleOptions: {
+        getDataListURL: '/dp/getOKList',
+        deleteURL: '/dp'
+      },
+      dataForm: {
+        patientId: this.patientId,
+        isInvisible: this.tabTitle === 'okLens' ? 0 : (this.tabTitle === 'RGP' ? 1 : 2) // 0是ok镜 1是RGP隐形眼镜 2是离焦软镜
+      },
+      factoryNumber: ''
+    }
+  },
+  created() {
+    this.getBrandList()
+  },
+  methods: {
+    init() {
+      // this.$nextTick(() => {
+      //   console.log(this.$('.el-table').offset().top)
+      //   console.log(this.$(document).height())
+      //   this.tableHeight = this.$(document).height() - this.$('.el-table').offset().top - 36
+      //   console.log(this.tableHeight)
+      // })
+    },
+    // rowStyle({ row, rowIndex }) {
+    //   console.log(row)
+    //   const stylejson = {}
+    //   if (row.eyeType === 'OD') {
+    //     stylejson.color = 'green'
+    //   } else if (row.eyeType === 'OS') {
+    //     stylejson.color = '#1E79FF'
+    //   }
+    //   return stylejson
+    // },
+    // 获取品牌列表
+    async getBrandList() {
+      const { data: res } = await this.$http.get('dp/getBrandList', {
+        params: {
+          isInvisible: this.tabTitle === 'okLens' ? 0 : (this.tabTitle === 'RGP' ? 1 : 2) // 0是ok镜 1是RGP隐形眼镜 2是离焦软镜
+        }
+      })
+      this.brandList = res.data
+    },
+    // 设置展开图标是否显示
+    getRowClass({ row, rowIndex }) {
+      if (row.status === 7 || row.status === 8) {
+        return 'row-expand-cover'
+      } else {
+        return ''
+      }
+    },
+    // 点击菜单触发事件回调
+    handleCommandDropdowm(id, scopeRow, e) {
+      console.log(id, scopeRow, e)
+      if (e === '编辑') {
+        this.addOrUpdateHandle(id, scopeRow, e)
+      } else if (e === '退货') {
+        this.removeLensReturnGoodsClick(id, scopeRow, e)
+      } else if (e === '删除') {
+        this.deleteHandle(id)
+      }
+    },
+    // 到货-通知
+    arrivalNotiveClick(dpId, params, title) {
+      this.arrivalNoticeVisible = true
+      this.$nextTick(() => {
+        this.$refs.arrivalNoticeOrUpdate.dataForm.dpId = dpId
+        this.$refs.arrivalNoticeOrUpdate.dataForm.title = title
+        this.$refs.arrivalNoticeOrUpdate.params = params
+        this.$refs.arrivalNoticeOrUpdate.init()
+      })
+    },
+    // 取镜-退货-取镜记录
+    removeLensReturnGoodsClick(dpId, params, title) {
+      this.removeLensReturnGoodsVisible = true
+      this.factoryNumber = params.factoryNumber
+      this.$nextTick(() => {
+        this.$refs.removeLensReturnGoodsOrUpdate.dataForm.dpId = dpId
+        this.$refs.removeLensReturnGoodsOrUpdate.dataForm.title = title
+        this.$refs.removeLensReturnGoodsOrUpdate.init()
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.okLens {
+  .description-content,.table-colum-content {
+    span {
+      display: inline-block;
+      padding-right: 8px;
+    }
+  }
+  .take-mirror {
+    color:#1890ff;
+    cursor: pointer;
+  }
+  .repair-title,
+  .change-title {
+    display: inline-block;
+    vertical-align: middle;
+    padding-left: 6px;
+  }
+  .circle-status {
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    margin-right: 5px;
+    display: inline-block;
+  }
+  .not-start {
+    background-color: #1890ff;
+  }
+  .not-started {
+    background-color: #FAAD14
+;
+  }
+  .goed {
+    background: #52c41a;
+  }
+  .give-up {
+    background-color: #FF4D4F;
+  }
+  .blue {
+    background: #14b1fa;
+  }
+  .patch {
+    background-color: #bfbfbf;
+  }
+  .step-desc {
+    .content {
+      color: #b8b8b8;
+    }
+  }
+  .operation-details {
+    cursor: pointer;
+    color:#1890ff;
+    padding-right: 8px;
+  }
+}
+</style>
+<style lang="scss">
+.okLens {
+  .el-table::before {
+    height: 0;
+  }
+  .el-timeline-item__node--normal {
+    border: 3px solid #1890ff;
+  }
+  .row-expand-cover .el-table__expand-column .el-icon{
+    visibility:hidden;
+  }
+  .el-step.is-center .el-step__line {
+    left: 55%;
+    right: -45%;
+  }
+  .el-step__icon-inner {
+    display: none;
+  }
+  .el-step__icon.is-text {
+    border: none;
+    width: 8px;
+    height: 8px;
+  }
+  // 完成
+  .el-step__head.is-finish .el-step__icon.is-text {
+    background: #409eff;
+  }
+  // 错误
+  .el-step__head.is-error .el-step__icon.is-text {
+    background: #F56C6C;
+  }
+   .el-step__head.is-success .el-step__icon.is-text {
+    background: #67C23A;
+  }
+  .el-step__head.is-wait .el-step__icon.is-text {
+    background: #b8b8b8;
+  }
+  .el-step__head.is-process,.el-step__title.is-process {
+    color: #b8b8b8;
+  }
+  .el-step__description.is-process {
+    color: #b8b8b8;
+  }
+  .el-step__head.is-process .el-step__icon.is-text {
+    background: #b8b8b8;
+  }
+  .el-steps--horizontal {
+    .el-step.is-horizontal:last-child {
+      flex-basis: 30% !important;
+    }
+  }
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
new file mode 100644
index 0000000..f6bce23
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
@@ -0,0 +1,241 @@
+<template>
+  <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
+    <el-form-item v-if="title.includes('编辑')" label="眼 别:" label-width="90px" prop="eyeType">
+      <el-select v-model="dataForm.eyeType" placeholder="请选择眼别" clearable>
+        <el-option label="右眼" value="OD" />
+        <el-option label="左眼" value="OS" />
+      </el-select>
+    </el-form-item>
+    <el-form-item v-if="title=='换片'" label="目标镜片:" label-width="90px" prop="oldDpId">
+      <el-select v-model="dataForm.oldDpId" placeholder="请选择目标镜片" clearable>
+        <el-option v-for="(item,index) in replaceList " :key="index" :value="item.id" :label="`${item.dpDate}-${item.brand}-${item.colour}`" />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="品 牌:" :label-width="title=='新增' ? '60px' : '90px'" prop="brandId">
+      <el-select v-model="dataForm.brandId" placeholder="请选择品牌" clearable>
+        <el-option v-for="(item,index) in brandList " :key="index" :value="item.id" :label="item.brand" @click.native="selectOptionBrandHandle(item)" />
+      </el-select>
+    </el-form-item>
+    <template v-if="ISCRTForm=='0' || ISCRTForm=='2'">
+      <el-form-item v-if="tabTitle==='okLens' && tabTitle !== 'LJRJ'" label="曲 率:" :label-width="title=='新增' ? '60px' : '90px'" prop="curvity">
+        <el-input v-model="dataForm.curvity" placeholder="请填写曲率" />
+      </el-form-item>
+      <el-form-item v-if="tabTitle==='RGP' && tabTitle !== 'LJRJ'" label="基弧:" :label-width="title=='新增' ? '60px' : '90px'" prop="baseArc">
+        <el-input v-model="dataForm.baseArc" placeholder="请填写基弧" />
+      </el-form-item>
+      <el-form-item label="度 数:" :label-width="title=='新增' ? '60px' : '90px'" prop="degrees">
+        <el-input v-model="dataForm.degrees" placeholder="请填写度数" />
+      </el-form-item>
+    </template>
+    <template>
+      <el-form-item v-if=" ISCRTForm=='2'" label="AZT:" :label-width="title=='新增' ? '60px' : '90px'" prop="azt">
+        <el-input v-model="dataForm.azt" placeholder="请填写度数" />
+      </el-form-item>
+      <el-form-item v-if="ISCRTForm =='1' || ISCRTForm =='2'" label="BC:" :label-width="title=='新增' ? '60px' : '90px'" prop="bc">
+        <el-input v-model="dataForm.bc" placeholder="请填写BC" />
+      </el-form-item>
+    </template>
+    <template v-if="ISCRTForm =='1'">
+      <el-form-item label="RZD:" :label-width="title=='新增' ? '60px' : '90px'" prop="rzd">
+        <el-input v-model="dataForm.rzd" placeholder="请填写RZD" />
+      </el-form-item>
+      <el-form-item label="LZA:" :label-width="title=='新增' ? '60px' : '90px'" prop="lza">
+        <el-input v-model="dataForm.lza" placeholder="请填写LZA" />
+      </el-form-item>
+    </template>
+    <el-form-item v-if="tabTitle !== 'LJRJ'" label="直 径:" :label-width="title=='新增' ? '60px' : '90px'" prop="diameter">
+      <el-input v-model="dataForm.diameter" placeholder="请填写直径" />
+    </el-form-item>
+    <el-form-item v-if="tabTitle !== 'LJRJ'" label="颜 色:" :label-width="title=='新增' ? '60px' : '90px'" prop="colourId">
+      <el-select v-model="dataForm.colourId" placeholder="请选择颜色" clearable @change="colorChange">
+        <el-option v-for="item in brandCOlorList.data" :key="item.id" :label="item.colour" :value="item.id" @click.native="selectOptionColorHandle(item)" />
+      </el-select>
+    </el-form-item>
+    <el-form-item v-if="title.includes('借片')" label="归还日期:" :label-width="title=='新增' ? '60px' : '90px'" prop="returnDate">
+      <el-date-picker v-model="dataForm.returnDate" type="date" placeholder="请选择归还日期" value-format="yyyy-MM-dd" />
+    </el-form-item>
+    <el-form-item label="备 注:" :label-width="title=='新增' ? '60px' : '90px'" prop="remark">
+      <el-input v-model="dataForm.remark" type="textarea" placeholder="备注信息" />
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  props: {
+    brandList: {
+      type: Array,
+      default: () => []
+    },
+    eyeType: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    patientIdNumber: {
+      type: String,
+      default: ''
+    },
+    tabTitle: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      brandCOlorList: {},
+      replaceList: [],
+      dataForm: {
+        eyeType: '',
+        oldDpId: '',
+        brandId: '',
+        curvity: '',
+        baseArc: '',
+        degrees: '',
+        azt: '',
+        bc: '',
+        rzd: '',
+        lza: '',
+        diameter: '',
+        colourId: '',
+        returnDate: '',
+        remark: '',
+        status: ''
+      },
+      ISCRTForm: '0',
+      validateFlag: false
+    }
+  },
+  computed: {
+    dataRule() {
+      return {
+        oldDpId: [
+          { required: true, message: '请选择目标镜片', trigger: 'change' }
+        ],
+        eyeType: [
+          { required: true, message: '请选择眼别', trigger: 'change' }
+        ],
+        brandId: [
+          { required: true, message: '请选择品牌', trigger: 'change' }
+        ],
+        curvity: [
+          { required: true, message: '请选择屈率', trigger: 'blur' }
+        ],
+        baseArc: [
+          { required: true, message: '请选择基弧', trigger: 'blur' }
+        ],
+        degrees: [
+          { required: true, message: '请选择度数', trigger: 'change' }
+        ],
+        azt: [
+          { required: true, message: '请选择AZT', trigger: 'change' }
+        ],
+        bc: [
+          { required: true, message: '请选择BC', trigger: 'blur' }
+        ],
+        rzd: [
+          { required: true, message: '请选择RZD', trigger: 'change' }
+        ],
+        lza: [
+          { required: true, message: '请选择LZA', trigger: 'blur' }
+        ],
+        diameter: [
+          { required: true, message: '请选择直径', trigger: 'blur' }
+        ],
+        colourId: [
+          { required: true, message: '请选择颜色', trigger: 'change' }
+        ]
+
+      }
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    // 获取可以换片的定片记录
+    async getReplaceList() {
+      const { data: res } = await this.$http.get('/dp/getReplaceList', {
+        params: {
+          patientIdNumber: this.patientIdNumber,
+          drgsName: window.localStorage.getItem('identity'),
+          eyeType: this.dataForm.eyeType,
+          isInvisible: this.tabTitle === 'okLens' ? 0 : (this.tabTitle === 'RGP' ? 1 : 2) // 0是ok镜 1是RGP隐形眼镜 2是离焦软镜
+        }
+      })
+      this.replaceList = res.data
+    },
+    leftRightInit() {
+      this.$nextTick(() => {
+        this.ISCRTForm = '0'
+        this.$refs.dataForm.resetFields() // 重置表单
+        console.log(this.eyeType)
+        this.dataForm.eyeType = this.title === '新增' || this.title === '借片' || this.title === '换片' || this.title === '补录' ? this.eyeType : ''
+        this.dataForm.status = this.tabTitle === 'LJRJ' ? 4 : ''
+        if (this.title === '换片') {
+          // 获取可以换片的定片记录
+          this.getReplaceList()
+        }
+      })
+      this.dataForm.oldDpId = ''
+    },
+    colorChange(e) {
+      console.log(e)
+      console.log(this.brandCOlorList)
+    },
+    // 选择品牌变化
+    selectOptionBrandHandle(item) {
+      console.log('选择品牌变化', item)
+      this.ISCRTForm = item.flag
+      this.dataForm.brand = item.brand
+      this.getBrandColorList(item, item.id)
+    },
+    // 选择颜色变化
+    selectOptionColorHandle(item) {
+      console.log(item)
+      this.dataForm.colour = item.colour
+    },
+    // 获取颜色
+    async getBrandColorList(item, brandId, title) {
+      const { data: res } = await this.$http.get('/dp/getBrandColourList', {
+        params: {
+          brandId: brandId
+        }
+      })
+      this.brandCOlorList = res.data
+      console.log(res.data)
+      if (title !== '编辑') {
+        this.dataForm.colourId = this.dataForm.eyeType === 'OD' ? res.data.odDefault.id : res.data.osDefault.id
+      }
+    },
+    // 校验
+    validateFun() {
+      const dataForm = this.dataForm
+      // 进口品牌是否填写完整 flag=1
+      const ImportCRTFlag1 = dataForm.bc || dataForm.lza || dataForm.rzd || dataForm.brandId || dataForm.colourId || dataForm.diameter
+      // 国产品牌是否填写完整 flag=0
+      const chinaFlag0 = dataForm.brandId || dataForm.colourId || dataForm.curvity || dataForm.degrees || dataForm.diameter
+      // 国产品牌 flag=2
+      const chinaFlag2 = dataForm.brandId || dataForm.colourId || dataForm.curvity || dataForm.degrees || dataForm.diameter || dataForm.atz
+      // 如果是进口品牌并且填写完整 flag=1 || 如果是第一种类型的国产品牌填写完整 flag=0 || 如果是第二种类型的国产品牌填写完整 flag=2
+      if ((this.ISCRTForm === '1' && ImportCRTFlag1) || (this.ISCRTForm === '0' && chinaFlag0) || (this.ISCRTForm === '2' && chinaFlag2)) {
+        this.$refs.dataForm.validate((valid) => {
+          if (!valid) {
+            this.validateFlag = false
+            return false
+          } else {
+            this.validateFlag = true
+          }
+        })
+      }
+      // 如果是进口品牌没有填写完整 flag=1 || 如果是第一种类型的国产品牌填写完整 flag=0 || 如果是第二种类型的国产品牌填写完整 flag=2
+      else if ((this.ISCRTForm === '1' && !ImportCRTFlag1) || (this.ISCRTForm === '0' && !chinaFlag0) || (this.ISCRTForm === '2' && !chinaFlag2)) {
+        this.validateFlag = false
+      }
+    }
+  }
+}
+</script>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
new file mode 100644
index 0000000..80b2ebb
--- /dev/null
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/removeLens-returnGoods-or-update.vue
@@ -0,0 +1,269 @@
+<template>
+  <el-dialog
+    class="oklens-removeLens-returnGoods"
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    width="30%"
+    :title="dataForm.title"
+    append-to-body
+    @close="closeDialog"
+  >
+    <div class="info">
+      <div class="orderDate">
+        <span class="info-left">订片日期：</span>
+        <span class="info-right">{{ dataForm.dpDate }}</span>
+      </div>
+      <div class="orderInfo">
+        <span class="info-left">订片信息：</span>
+        <div class="info-right">
+          <p>品牌：{{ dataForm.brand }}</p>
+          <p>眼别：{{ dataForm.eyeType }}</p>
+          <p v-show="dataForm.curvity">曲率：{{ dataForm.curvity }}</p>
+          <p v-show="dataForm.degrees">度数：{{ dataForm.degrees }}</p>
+          <p v-show="dataForm.azt">AZT：{{ dataForm.azt }}</p>
+          <p v-show="dataForm.bc">BC：{{ dataForm.bc }}</p>
+          <p v-show="dataForm.rzd">RZD：{{ dataForm.rzd }}</p>
+          <p v-show="dataForm.lza">LZA：{{ dataForm.lza }}</p>
+          <p v-show="dataForm.diameter">直径：{{ dataForm.diameter }}</p>
+          <p>颜色：{{ dataForm.colour }}</p>
+        </div>
+      </div>
+      <template v-if="dataForm.title=='取镜记录'">
+        <div class="removeLensDate">
+          <span class="info-left">取镜日期：</span>
+          <span class="info-right">{{ dataForm.takeAwayDate }}</span>
+        </div>
+        <div class="factoryNumber">
+          <span class="info-left">出厂编号：</span>
+          <span class="info-right">{{ dataForm.factoryNumber }}</span>
+        </div>
+        <div class="remarks">
+          <span class="info-left">备注：</span>
+          <div class="info-right">{{ dataForm.remark }}</div>
+        </div>
+        <div class="sign">
+          <span class="info-left">取镜签字：</span>
+          <img style="width: 80px;height: 40px;" :src="dataForm.signFile">
+        </div>
+      </template>
+    </div>
+    <template v-if="dataForm.title !='取镜记录'">
+      <el-form ref="dataForm" :model="dataForm" :rules="dataRule">
+        <template v-if="dataForm.title=='取镜'">
+          <el-form-item label="操作:" label-width="90px" prop="operation">
+            <el-radio-group v-model="dataForm.status">
+              <el-radio label="4">取镜</el-radio>
+              <el-radio label="5">放弃</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </template>
+        <el-form-item :label="dataForm.title + '日期:'" label-width="90px" prop="shareDate">
+          <el-date-picker v-model="dataForm.shareDate" type="date" :placeholder="'请选择' + dataForm.title + '日期'" value-format="yyyy-MM-dd" />
+        </el-form-item>
+        <el-form-item label="出厂编号:" label-width="90px">
+          <el-input v-model="dataForm.factoryNumber" placeholder="核对并填写出厂编号" />
+        </el-form-item>
+        <el-form-item label="备 注:" label-width="90px" prop="remark">
+          <el-input v-model="dataForm.remark" type="textarea" placeholder="备注信息" />
+        </el-form-item>
+      </el-form>
+    </template>
+    <template v-if="dataForm.title=='取镜'">
+      <div class="signFile">
+        <span class="info-left">取镜签名：</span>
+        <div class="signFile-right" @click="signClick">
+          <el-button v-if="lensFlag" type="primary" icon="el-icon-edit" size="small">签名</el-button>
+          <span v-else class="sign-img">
+            <img style="width: 80px;height: 40px;" :src="lensSign">
+          </span>
+          <span />
+        </div>
+      </div>
+    </template>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  props: {
+    brandList: {
+      type: Array,
+      default: () => []
+    },
+    fatherFactoryNumber: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      dataForm: {
+        status: '4',
+        shareDate: '',
+        factoryNumber: '',
+        signFile: '',
+        remark: ''
+      },
+      ISCRTForm: false
+    }
+  },
+  computed: {
+    dataRule() {
+      // var validataFactoryNumber = (rule, value, callback) => {
+      //   if (value !== this.dataForm.factoryNumbered) {
+      //     return callback(new Error('您输入的出厂编号不匹配'))
+      //   }
+      //   callback()
+      // }
+      return {
+        shareDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ]
+        // factoryNumber: [
+        //   { required: true, validator: validataFactoryNumber, trigger: 'blur' }
+        // ]
+      }
+    },
+    lensFlag: {
+      get() {
+        return this.$store.getters.lensFlag
+      },
+      set(val) {}
+    },
+    lensSign: {
+      get() {
+        return this.$store.getters.lensSign
+      },
+      set(val) {
+      }
+    }
+  },
+  methods: {
+    init() {
+      this.visible = true
+      if (this.dataForm.title !== '取镜记录') {
+        this.$nextTick(() => {
+          this.$store.commit('lensSign', '')
+          this.$store.commit('lensFlag', true)
+          this.$refs.dataForm.resetFields() // 重置表单
+        })
+      }
+      this.getTaskAwayLogHandle()
+    },
+    // 获取取镜记录
+    async getTaskAwayLogHandle() {
+      const { data: res } = await this.$http.get('/dp/getTaskAwayLog', {
+        params: {
+          dpId: this.dataForm.dpId
+        }
+      })
+      this.dataForm = {
+        ...this.dataForm,
+        ...res.data
+      }
+      res.data.factoryNumber ? '' : this.dataForm.factoryNumber = this.fatherFactoryNumber
+      if (this.dataForm.title === '退货') {
+        this.dataForm.remark = ''
+      }
+    },
+    signClick() {
+      // this.$parent.$parent.$parent.$parent.beginSign(2)
+      this.$store.commit('beginSign', 5)
+    },
+    // 表单提交 320321188808123330    18888888888
+    dataFormSubmitHandle: debounce(function() {
+      this.dataForm.signFile = this.$store.getters.lensSign
+      if (this.dataForm.title !== '取镜记录') {
+        this.$refs.dataForm.validate((valid) => {
+          if (!valid) {
+            return false
+          }
+          // if (this.dataForm.title === '取镜' && !this.dataForm.signFile) {
+          //   this.$message.error('请填写签名')
+          //   return false
+          // }
+          // 取镜/退货
+          this.$http.post(this.dataForm.title === '取镜' ? '/dp/takeAway' : '/dp/returnDp', this.dataForm).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('getDataList')
+              }
+            })
+          }).catch(() => {})
+        })
+      } else {
+        this.visible = false
+      }
+    }, 1000, { leading: true, trailing: false }),
+    // 关闭弹框
+    closeDialog() {
+      this.$emit('closeDialog')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.oklens-removeLens-returnGoods {
+  .sign-img {
+    width: 78px;
+    height: 36px;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .info {
+    margin-left: 16px;
+    margin-bottom: 16px;
+    font-size: 14px;
+    line-height: 32px;
+  }
+  .orderInfo,.removeLensDate,.factoryNumber,.remarks,.signFile {
+    display: flex;
+    line-height: 32px;
+    align-items: center;
+  }
+  .info-left {
+    display: inline-block;
+    width: 80px;
+    text-align: right;
+    padding-right: 6px;
+  }
+}
+</style>
+<style lang="scss">
+.oklens-removeLens-returnGoods {
+  .el-dialog__header {
+    margin-bottom:12px
+  }
+    .el-dialog__body {
+        padding-right: 30px;
+    }
+    .formItemOne .el-form-item__content {
+      display: flex;
+    }
+    .el-date-editor.el-input, .el-date-editor.el-input__inner{
+      width: 100%;
+    }
+    .el-select {
+      display: block;
+    }
+    .el-input-number {
+      display: block;
+      width: 100%;
+    }
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
index 27a5676..fc54822 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
@@ -141,14 +141,10 @@
 <script>
 export default {
   props: {
-    patientIdNumber: {
-      type: String,
-      default: ''
-    },
     patientId: {
       type: String,
       default: ''
-    }
+    },
   },
   data() {
     return {
@@ -167,8 +163,7 @@ export default {
         glassInfo: '',
         doctorAdvice: '',
         doctorName: '',
-        patientIdNumber: this.patientIdNumber,
-        patientId: this.patientId
+        patientId: this.patientId,
       },
       reviewList: []
     }
@@ -219,15 +214,15 @@ export default {
       })
     },
     getVisitForHis() {
-      this.$http.get('/return/visit/save', { params: { patientIdNumber: this.patientIdNumber, patientId: this.patientId, returnVisitDate: this.returnDate }}).then(({ data: res }) => {
+      this.$http.get('/return/visit/save', { params: { patientId: this.patientId, patientId: this.patientId, returnVisitDate: this.returnDate }}).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         if (res.data) {
           this.$nextTick(() => {
             this.dataForm = { ...res.data }
-            this.dataForm.patientIdNumber = this.patientIdNumber
             this.dataForm.patientId = this.patientId
+            // this.dataForm.patientId = this.patientId
           })
         } else {
           this.$nextTick(() => {
@@ -246,8 +241,8 @@ export default {
       this.$nextTick(() => {
         this.dataForm = { ...row }
         this.dataForm.id = row.id
-        this.dataForm.patientIdNumber = this.patientIdNumber
         this.dataForm.patientId = this.patientId
+        // this.dataForm.patientId = this.patientId
       })
     },
     // 保存
@@ -291,7 +286,7 @@ export default {
     },
     // 复查
     getReviewList() {
-      this.$http.get('/return/visit/getList', { params: { patientIdNumber: this.patientIdNumber }}).then(({ data: res }) => {
+      this.$http.get('/return/visit/getList', { params: { patientId: this.patientId }}).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/page-subspecialty/views/pages/pacs/drawer.vue b/src/page-subspecialty/views/pages/pacs/drawer.vue
new file mode 100644
index 0000000..0cb66c4
--- /dev/null
+++ b/src/page-subspecialty/views/pages/pacs/drawer.vue
@@ -0,0 +1,175 @@
+<template>
+  <div class="drawer">
+    <div :class="maskClass" @click="closeByMask" />
+    <div :class="mainClass" :style="mainStyle" class="main">
+      <div class="drawer-body">
+        <shrink ref="shrinkTwo" :arrowType="2" @changeType="selectType" @display="closeByButton"/>
+        <slot/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import shrink from '@/components/360View/shrink'
+
+export default {
+  components: { shrink },
+  props: {
+    // 是否打开
+    display: {
+      type: Boolean
+    },
+
+    // 标题
+    title: {
+      type: String,
+      default: '标题'
+    },
+
+    // 是否显示关闭按钮
+    closable: {
+      type: Boolean,
+      default: true
+    },
+
+    // 是否显示遮罩
+    mask: {
+      type: Boolean,
+      default: true
+    },
+
+    // 是否点击遮罩关闭
+    maskClosable: {
+      type: Boolean,
+      default: true
+    },
+
+    // 宽度(支持百分比)
+    width: {
+      type: String,
+      default: '400px'
+    },
+
+    // 是否在父级元素中打开
+    inner: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    maskClass: function() {
+      return {
+        'mask-show': (this.mask && this.display),
+        'mask-hide': !(this.mask && this.display),
+        'inner': this.inner
+      }
+    },
+    mainClass: function() {
+      return {
+        'main-show': this.display,
+        'main-hide': !this.display,
+        'inner': this.inner
+      }
+    },
+    mainStyle: function() {
+      return {
+        width: this.width,
+        right: this.display ? '0' : `-${this.width}`,
+        borderLeft: this.mask ? 'none' : '1px solid #eee'
+      }
+    }
+  },
+  mounted() {
+    if (this.inner) {
+      const box = this.$el.parentNode
+      box.style.position = 'relative'
+    }
+  },
+  methods: {
+    closeByMask() {
+      this.maskClosable && this.$emit('update:display', false)
+    },
+    closeByButton() {
+      this.$emit('update:display', false)
+      document.getElementsByClassName('drawer')[0].style.display = 'none'
+    },
+    // 点击shark上模块展示对应模块
+    selectType(type) {
+      this.$parent.dataType = type
+    },
+    selectShrink() {
+      this.$refs.shrinkTwo.active = 'imgOne'
+    },
+    init() {
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.drawer {
+  width: auto;
+  height: 100%;
+  /* 遮罩 */
+  .mask-show {
+    //position: fixed;
+    //top: 0;
+    //left: 0;
+    //width: 100%;
+    //height: 100%;
+    //z-index: 999;
+    //background-color: rgba(0,0,0,.5);
+    //opacity: 1;
+    //transition: opacity .5s;
+  }
+  .mask-hide {
+    opacity: 0;
+    transition: opacity .5s;
+  }
+
+  /* 滑块 */
+  .main {
+    position: fixed;
+    z-index: 999;
+    top: 60px;
+    height: calc(100% - 70px);
+    background: #fff;
+    transition: all 0.5s;
+  }
+  .main-show {
+    opacity: 1;
+  }
+  .main-hide {
+    opacity: 0;
+  }
+
+  /* 某个元素内部显示 */
+  .inner {
+    position: absolute;
+  }
+
+  /* 其他样式 */
+  .drawer-head {
+    display: flex;
+    justify-content: space-between;
+    height: 45px;
+    line-height: 45px;
+    padding: 0 15px;
+    font-size: 14px;
+    font-weight: bold;
+    border-bottom: 1px solid #eee;
+    .close-btn {
+      display: inline-block;
+      cursor: pointer;
+      height: 100%;
+      padding-left: 20px;
+    }
+  }
+  .drawer-body {
+    display: flex;
+    height: 100%;
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/src/page-subspecialty/views/pages/pacs/img-record.vue b/src/page-subspecialty/views/pages/pacs/img-record.vue
new file mode 100644
index 0000000..31fc940
--- /dev/null
+++ b/src/page-subspecialty/views/pages/pacs/img-record.vue
@@ -0,0 +1,1735 @@
+<template>
+  <el-container class="layout">
+    <el-aside width="400">
+      <el-row class="leftBox">
+        <el-col class="leftBtn">
+          <img v-if="!packFlag" class="expansion" :src="require('@/assets/img/expansion.png')" alt="" @click="packFlag = true">
+          <img v-if="proFlag" class="proTree" :src="require('@/assets/img/selPro.png')" alt="">
+          <img v-else class="proTree" :src="require('@/assets/img/pro.png')" alt="" @click="selProList">
+          <img v-if="proFlag" class="timeTree" :src="require('@/assets/img/time.png')" alt="" @click="selTimeList">
+          <img v-else class="timeTree" :src="require('@/assets/img/selTime.png')" alt="">
+          <div style="width: 100%;height: 32px;position: absolute;bottom: 0;left: 0;background-color: #141414" />
+        </el-col>
+        <el-col v-show="packFlag" class="leftPro">
+          <div style="position: relative">
+            <img class="tipTop" :src="require('@/assets/img/tipTop.png')" alt="">
+            <p class="topInfo">
+              <span class="mr5">{{ patientInfo.patientName }}</span>
+              <span class="mr5">{{ patientInfo.patientSex }}</span>
+              <span v-if="patientInfo.patientAge != undefined">{{ patientInfo.patientAge }}岁</span>
+            </p>
+            <el-popover ref="infoPopover" class="popBox" trigger="hover" popper-class="record-popverClass">
+              <div class="tagContent">
+                <div v-for="(tag, index) in patientTagList" :key="index">
+                  <el-tag :key="tag.id" closable :title="tag.tagName" class="tags" @close.prevent="() => deletePatientTag(tag)">
+                    {{ tag.tagName.length > 15 ? tag.tagName.substring(0,15) + '...' : tag.tagName }}
+                  </el-tag>
+                </div>
+                <el-tag class="addTag" @click="showDrawer(1)">
+                  <i class="el-icon-plus" /> 添加患者标签
+                </el-tag>
+              </div>
+            </el-popover>
+            <img v-popover:infoPopover class="tipLabel" :src="require('@/assets/img/info-label.png')" alt="">
+            <img class="tipPack" :src="require('@/assets/img/pack.png')" alt="" @click="packFlag = false">
+            <img class="back" :src="require('@/assets/img/back.png')" alt="" @click="packFlag = false">
+          </div>
+          <div class="projectBtn">
+            <div class="selectBtn">
+              <span class="ml12" @click="selectAllExamine">全选</span>
+              <span class="ml16" @click="selectUnChecked">反选</span>
+            </div>
+            <div>
+              <img class="noteBox" :src="require('@/assets/img/button-preview.png')" alt="" @click="handlePreview()">
+            </div>
+          </div>
+          <div class="treeSide">
+            <el-tree
+              ref="examineTree"
+              class="examTree"
+              highlight-current
+              :data="treeData"
+              :props="treeProps"
+              :auto-expand-parent="true"
+              :default-expand-all="true"
+              :expand-on-click-node="false"
+              show-checkbox
+              @node-click="onSelect"
+              @check="onChange"
+            >
+              <span slot-scope="{ node, data }" class="custom-tree-node">
+                <span style="display: inline-block;width: 100%;">
+                  {{ data.text }}
+                </span>
+                <el-popover
+                  ref="examPopover"
+                  trigger="hover"
+                  popper-class="record-popverClass"
+                >
+                  <div class="tagContent">
+                    <el-tag v-for="(_item,_index) in examineTagList" :key="_index" :title="_item.tagName" closable @close.prevent="() => deleteExamineTag(_item)">
+                      {{ _item.tagName.length > 15 ? _item.tagName.substring(0,15) + '...' : _item.tagName }}
+                    </el-tag>
+                    <el-tag class="addTag" @click="showDrawer(2, data)">
+                      <i class="el-icon-plus" /> 添加检查项标签
+                    </el-tag>
+                  </div>
+                  <span slot="reference">
+                    <img v-if="data.examNo && data.tag == '1'" class="labelImg" :src="require('@/assets/img/icon-labelSel.png')" alt="" @mouseenter="queryExamineTags(data)">
+                    <img v-if="data.examNo && data.tag == '0'" class="labelImg disSel" :src="require('@/assets/img/icon-label.png')" alt="" @mouseenter="examineTagList = []">
+                  </span>
+                </el-popover>
+              </span>
+            </el-tree>
+          </div>
+          <div class="leftBottom">
+            <span class="copyRight">版权所有：南京慧目信息技术有限公司</span>
+          </div>
+        </el-col>
+      </el-row>
+    </el-aside>
+    <el-container>
+      <el-container :style="{ background: '#000000', margin: 0, minHeight: '280px' }">
+        <div class="contentBox">
+          <div id="drag-solt" class="contentLeft">
+            <div class="fileContent">
+              <el-button-group class="eyeBox">
+                <el-button v-for="(item,index) in eyeList" :key="index" class="eyeSel" size="small" :class="{eyeActive:index === eyeIndex}" @click="selectEye(item,index)">
+                  {{ item.name }}
+                </el-button>
+              </el-button-group>
+              <el-button-group class="eyeBox">
+                <el-button v-for="(item,index) in fileList" :key="index" class="eyeSel" size="small" :class="{eyeActive:index === fileIndex}" @click="selectFileType(item,index)">
+                  {{ item.name }}
+                </el-button>
+              </el-button-group>
+              <draggable class="scrollContain" v-model="dragList" :options="dragOptions" @end="fileDragEnd">
+                <div class="fileBox" ref="file" v-for="(item,index) in dragList" :key="index" @click="handleClickFile(item,index)" :class="{fileActive:index === dragIndex}">
+                  <div style="width: 100%;height: 100%" v-if="item.instanceList && item.instanceList.length">
+                    <img v-if="item.instanceList[0].imageType == 'JPG' || item.instanceList[0].imageType == 'PNG'" class="fileImg" :src="item.instanceList[0].imageId" alt="">
+                    <div v-show="item.instanceList[0].imageType == 'DCM'" :ref="'fileSolt' + index" class="fileImg" style="padding-left: 3px"/>
+                    <div v-show="item.instanceList[0].imageType == 'PDF'" :ref="'pdfSolt' + index" class="fileImg" style="padding-left: 3px">
+                      <div class="pdf-thumbnail">
+                        <img class="fileImg" :src="require('@/assets/img/PDF.png')" alt="">
+                      </div>
+                    </div>
+                    <p class="imgName" :title="item.seriesDescription + item.laterality">
+                      {{ item.seriesDescription }}
+                      <span class="" v-if="item.laterality">({{ item.laterality }})</span>
+                    </p>
+                    <p class="imgName">{{  item.time }}</p>
+                  </div>
+                </div>
+              </draggable>
+            </div>
+          </div>
+          <div class="contentRight">
+            <!-- 工具按钮 -->
+            <div class="content_top">
+              <div class="toolBox">
+                <div class="layBox">
+                  <el-popover trigger="hover" popper-class="layPopver">
+                    <div class="layShow">
+                      <div class="tool-layout">
+                        <div style="margin-bottom: 2px">
+                          <img class="layImg" :src="require('@/assets/img/layout-1.png')" alt="" @click="handleLayout(1)">
+                          <img class="layImg" :src="require('@/assets/img/layout-2.png')" alt="" @click="handleLayout(2)">
+                          <img class="layImg" :src="require('@/assets/img/layout-3.png')" alt="" @click="handleLayout(3)">
+                        </div>
+                        <div style="margin-bottom: 2px">
+                          <img class="layImg" :src="require('@/assets/img/layout-4.png')" alt="" @click="handleLayout(4)">
+                          <img class="layImg" :src="require('@/assets/img/layout-5.png')" alt="" @click="handleLayout(5)">
+                          <img class="layImg" :src="require('@/assets/img/layout-6.png')" alt="" @click="handleLayout(6)">
+                        </div>
+                        <div style="margin-bottom: 2px">
+                          <img class="layImg" :src="require('@/assets/img/layout-7.png')" alt="" @click="handleLayout(7)">
+                          <img class="layImg" :src="require('@/assets/img/layout-8.png')" alt="" @click="handleLayout(8)">
+                          <img class="layImg" :src="require('@/assets/img/layout-9.png')" alt="" @click="handleLayout(9)">
+                          <img class="layImg" :src="require('@/assets/img/layout-10.png')" alt="" @click="handleLayout(10)">
+                        </div>
+                        <div>
+                          <img class="layImg" :src="require('@/assets/img/layout-11.png')" alt="" @click="handleLayout(11)">
+                          <img class="layImg" :src="require('@/assets/img/layout-12.png')" alt="" @click="handleLayout(12)">
+                          <img class="layImg" :src="require('@/assets/img/layout-13.png')" alt="" @click="handleLayout(13)">
+                        </div>
+                      </div>
+                    </div>
+                    <span slot="reference" class="tool">
+                      <img :src="require('@/assets/img/tool-layout.png')" alt="">
+                      <span style="margin-left: 2px">布局</span>
+                    </span>
+                  </el-popover>
+                </div>
+                <div class="tool" @click="toolWwwl">
+                  <div>
+                    <img :src="require('@/assets/img/tool-windos.png')" alt="">
+                    <span style="margin-left: 2px">窗宽\窗位</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolInvert">
+                  <div>
+                    <img :src="require('@/assets/img/tool-negative.png')" alt="">
+                    <span style="margin-left: 2px">负片</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolZoom">
+                  <div>
+                    <img :src="require('@/assets/img/tool-scale.png')" alt="">
+                    <span style="margin-left: 2px">缩放</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolMove">
+                  <div>
+                    <img :src="require('@/assets/img/tool-translate.png')" alt="">
+                    <span style="margin-left: 2px">移动</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolMagnify">
+                  <div>
+                    <img :src="require('@/assets/img/tool-zoom.png')" alt="">
+                    <span style="margin-left: 2px">放大</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolNote">
+                  <div>
+                    <img class="subscript" :src="require('@/assets/img/tool-subscript.png')" alt="">
+                    <span style="margin-left: 2px">角注</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolReset">
+                  <div>
+                    <img :src="require('@/assets/img/tool-reflesh.png')" alt="">
+                    <span style="margin-left: 2px">重载</span>
+                  </div>
+                </div>
+                <div class="tool" @click="toolFullScreen">
+                  <div>
+                    <img :src="require('@/assets/img/tool-expand.png')" alt="">
+                    <span style="margin-left: 2px">全屏</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div id="full-screen-solt" class="showBox">
+              <div v-for="(item,index) in layOutList" :key="index" :class="[item.className]">
+                <div v-for="(row) in item.secondClass" :id="row.sign" :key="row.sign" :class="[row.classA,row.classB]" :data-slot="row.sign" @click.stop="handleSelectFile(row)">
+                  <div v-for="(col) in row.thirdClass" :id="col.sign" :key="col.sign" :class="[col.classA,col.classB]" :data-slot="col.sign" @click.stop="handleSelectFile(col)" />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-container>
+    </el-container>
+    <drawer title="添加标签" :display.sync="tagFlag" :inner="true" width="500px" :mask="true">
+      <el-tree
+        ref="tree"
+        class="tagTree"
+        :data="tagTreeList"
+        :props="defaultProps"
+        show-checkbox
+        check-strictly
+        :default-expanded-keys="expandKeys"
+        node-key="id"
+        :expand-on-click-node="false"
+      >
+        <span slot-scope="{ node, data }" class="custom-tree-node">
+          <span class="treeLabel" :title="node.label">{{ node.label.length > 15 ? node.label.substring(0,15) + '...' : node.label }}</span>
+          <span style="display: inline-block;margin-left: 30px;vertical-align: bottom">
+            <el-button
+              type="text"
+              size="mini"
+              @click="() => append(data)"
+            >
+              增加
+            </el-button>
+            <el-button
+              style="margin-right: 10px"
+              type="text"
+              size="mini"
+              @click="() => editTag(data)"
+            >
+              编辑
+            </el-button>
+            <el-popover
+              ref="delTagPopover"
+              placement="top"
+              width="160"
+              popper-class="record-popverClass"
+            >
+              <p style="margin-bottom: 10px">确认删除该条标签么?</p>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="handleDelTag(data.id)">确定</el-button>
+              </div>
+              <span slot="reference">
+                <el-button v-if="!node.disabled" type="text" size="mini">删除</el-button>
+              </span>
+            </el-popover>
+          </span>
+        </span>
+      </el-tree>
+      <div
+        :style="{
+          position: 'absolute',
+          right: 0,
+          bottom: '50px',
+          width: '100%',
+          borderTop: '1px solid #333333',
+          padding: '10px 16px',
+          background: '#1F2329',
+          textAlign: 'right',
+          zIndex: 1,
+        }"
+      >
+        <el-button size="small" :style="{ marginRight: '8px',background: '#000000',color: '#ffffff',border: '1px solid #434343'}" @click="tagFlag = false">
+          取消
+        </el-button>
+        <el-button size="small" type="primary" @click="addPatientTag">
+          保存
+        </el-button>
+      </div>
+    </drawer>
+    <!--      新增子菜单对话框-->
+    <el-dialog
+      class="addNote"
+      :modal="false"
+      :title="subTitle"
+      cancel-text="取消"
+      ok-text="确定"
+      :visible="addSubmenuFlag"
+      width="30%"
+      @close="addSubmenuFlag = false"
+      @ok="handleAddTag"
+    >
+      <template slot="footer" style="background: #0c1016;">
+        <el-button key="back" class="cancelNote" @click="addSubmenuFlag = false">
+          取消
+        </el-button>
+        <el-button key="submit" type="primary" :loading="loading" @click="handleAddTag">
+          确定
+        </el-button>
+      </template>
+      <el-input v-model="tagName" class="info" placeholder="请输入子菜单名称" />
+    </el-dialog>
+  </el-container>
+</template>
+<script>
+import vm from 'vue'
+import showFile from './show-file'
+import pdf from 'vue-pdf'
+import drawer from './drawer'
+import draggable from 'vuedraggable'
+import _ from 'lodash'
+
+export default {
+  components: {
+    showFile,
+    drawer,
+    pdf,
+    draggable
+  },
+  props: {
+    patientInfo: {
+      type: Object,
+      default: () => {}
+    },
+    examInfo: {
+      type: Object,
+      default: () => {}
+    },
+  },
+  data() {
+    return {
+      searchChild: 1, //  1:搜索点击父节点，2:点击子节点
+      checkAll: false,
+      packFlag: true,
+      proFlag: true,
+      loading: false,
+      examineType: 2, // 项目树
+      treeProps: {
+        children: 'children',
+        label: 'text'
+      },
+      risNo: '',
+      examNo: '',
+      examItemCode: '',
+      fileInstance: {},
+      dragOptions: {
+        animation: 120,
+        scroll: true,
+        sort: false,
+        group: {
+          pull: 'clone',
+          put: true
+        }
+      },
+      dragList: [], // 缩略图列表
+      examNoList: [],
+      dragIndex: '', // 缩略图索引
+      examItemList: [], // 已选的检查项
+      treeData: [], // 项目树
+      eyeType: '', // 眼别类型
+      fileType: '', // 文件类型
+      dragFlag: false, // 缩略图是否展示
+      eyeList: [
+        {
+          name: '全部',
+          id: 1
+        },
+        {
+          name: 'OD',
+          id: 2
+        },
+        {
+          name: 'OS',
+          id: 3
+        }
+      ], // 眼别筛选项
+      fileList: [
+        {
+          name: '全部',
+          id: 1
+        },
+        {
+          name: '影像',
+          id: 2
+        },
+        {
+          name: '报告',
+          id: 3
+        }
+      ], // 文件类型筛选项
+      eyeIndex: 0, // 眼别索引
+      fileIndex: 0, // 文件索引
+      tagFlag: false, // 标签弹框
+      patientTagList: [], // 患者标签列表
+      examineTagList: [], // 项目标签列表
+      tagTreeList: [], // 标签列表
+      tagType: 1, // 标签类型1患者 2项目
+      expandKeys: [], // 默认展开标签节点
+      pid: 0, // 标签父级id
+      tagId: '', // 标签id
+      tagName: '', // 标签名称
+      addSubmenuFlag: false,
+      subTitle: '新增子级菜单',
+      defaultProps: {
+        children: 'children',
+        label: 'tagName'
+      },
+      layOutList: [] // 布局列表
+    }
+  },
+  mounted() {
+    // this.queryPatientTag()
+    this.examNo = this.examInfo.examNo
+    this.itemCode = this.examInfo.itemCode
+    this.examDate = this.examInfo.examDate
+    this.queryProgramTree(2)
+  },
+  methods: {
+    // 全选
+    selectAllExamine() {
+      this.checkAll = !this.checkAll
+      if (this.checkAll) {
+        this.$refs.examineTree.setCheckedNodes(this.treeData)
+      } else {
+        this.$refs.examineTree.setCheckedNodes([])
+      }
+      this.handlePreview()
+    },
+    // 反选
+    selectUnChecked() {
+      const res = this.$refs.examineTree
+      const nodes = res.getCheckedNodes(true, true)
+      this.batchSelect(this.treeData, res, true, nodes)
+      this.handlePreview()
+    },
+    batchSelect(nodes, refs, flag, seleteds) {
+      if (typeof nodes !== 'undefined') {
+        nodes.forEach(element => {
+          element.examItemVOS.forEach(row => {
+            refs.setChecked(row, flag, true)
+          })
+        })
+      }
+      if (typeof seleteds !== 'undefined') {
+        seleteds.forEach(node => {
+          refs.setChecked(node, !flag, true)
+        })
+      }
+    },
+    // 项目树
+    selProList() {
+      this.proFlag = true
+      this.queryProgramTree(2)
+    },
+    // 时间树
+    selTimeList() {
+      this.proFlag = false
+      this.queryProgramTree(1)
+    },
+    // 查询项目树/时间树
+    async queryProgramTree(type) {
+      this.examineType = type
+      const { data: res } = await this.$http.get('/patient/pac30/getPatientTree', { params: {
+        treeType: type,
+        patientId: this.patientInfo.patientId
+      }
+      })
+      if (res.code === 0) {
+        const data = res.data || []
+        for (let i = 0; i < data.length; i++) {
+          const temp = data[i].children
+          for (let j = 0; j < temp.length; j++) {
+            if (type === 2) {
+              temp[j].examTime = temp[j].examTime ? temp[j].examTime.substring(0, 11) : ''
+            }
+          }
+        }
+
+        this.allExamine = []
+        // if (res.data.length) {
+        //   for (let i = 0; i < data.length; i++) {
+        //     const cur = data[i]
+        //     const temp = data[i].children
+        //     if (type === 1) {
+        //       this.examDate = data[0].id
+        //     } else {
+        //       this.examItemCode = data[0].id
+        //     }
+        //     for (let j = 0; j < temp.length; j++) {
+        //       if (this.examineType === 1) {
+        //         temp[j].examDate = cur.id
+        //       }
+        //     }
+        //     this.defaultExpandedKeys = this.allExamine
+        //   }
+          this.treeData = data || []
+        //   this.queryExamine()
+        // }
+        // this.treeData = res.data || []
+        // this.examNoList = []
+        // if (this.treeData.length) {
+        //   this.examNoList.push(this.treeData[0].children[0].examNo)
+        //   this.$nextTick(() => {
+        //     this.$refs.examineTree.setCurrentKey(this.treeData[0].children[0].rownows)
+        //   })
+        //   for (let i = 0; i < this.treeData.length; i++) {
+        //     const temp = this.treeData[i].children
+        //     for (let j = 0; j < temp.length; j++) {
+        //       if (type === 1) {
+        //         temp[j].name = temp[j].examineItem || ''
+        //       } else {
+        //         temp[j].name = temp[j].examTime ? temp[j].examTime.substring(0, 11) : ''
+        //       }
+        //     }
+        //   }
+        this.queryExamine()
+        // }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 点击项目
+    onSelect(selectedKeys) {
+      console.log('点击项目', selectedKeys)
+      // if (!selectedKeys.length) return
+      // const tempKey = selectedKeys[0]
+      if (selectedKeys.children && selectedKeys.children.length) {
+        // 父节点
+        this.searchChild = 1
+        if (this.examineType === 2) {
+          // 项目树
+          this.examItemCode = selectedKeys.text
+          this.examDate = ''
+          this.examNo = ''
+        } else {
+          // 时间树
+          this.examDate = selectedKeys.text
+          this.examNo = ''
+          this.examItemCode = ''
+        }
+      } else {
+        // 子节点
+        this.searchChild = 2
+        this.examNo = selectedKeys.examNo
+        this.examItemCode = selectedKeys.id
+        if (this.examineType === 2) {
+          console.log('子节点', selectedKeys)
+          this.examDate = selectedKeys.text
+        } else {
+          this.examDate = selectedKeys.examDate
+        }
+      }
+      // this.examNoList = []
+      // const tempKey = selectedKeys.examItemVOS || []
+      // if (tempKey && tempKey.length) {
+      //   // 父节点
+      //   tempKey.forEach((item) => {
+      //     this.examNoList.push(item.examNo)
+      //   })
+      // } else {
+      //   // 子节点
+      //   this.examNoList.push(selectedKeys.examNo)
+      // }
+      this.queryExamine()
+    },
+    //
+    onChange() {
+      this.handlePreview()
+    },
+    // 浏览模式
+    handlePreview() {
+      const node = this.$refs.examineTree.getCheckedNodes()
+      if (!node.length) return this.$message.warning('请选择文件!')
+      const selectNode = node.filter(item => {
+        return item.examNo !== undefined
+      })
+      this.examNoList = []
+      selectNode.forEach((item) => {
+        this.examNoList.push(item.examNo)
+      })
+      this.queryExamine()
+    },
+    // 查询项目文件
+    promiseExamine() {
+      const params = {
+        searchType: this.examineType,
+        searchChild: this.searchChild,
+        examDate: '2020-07-20',
+        // patientId: this.patientInfo.patientId,
+        patientId: '2553716',
+        eyeType: this.eyeType,
+        fileType: this.fileType
+      }
+      if (this.examineType === 1) {
+        // 时间树
+        params.examDate = this.examDate
+        if (this.searchChild === 2) {
+          params.examNo = this.examNo
+        }
+      } else {
+        // 项目树
+        params.itemCode = this.examItemCode
+        if (this.searchChild === 2) {
+          params.examDate = this.examDate ? this.examDate.substring(0, 11) : this.examDate
+          params.examNo = this.examNo
+        }
+      }
+      Object.keys(params).map((item) => {
+        if (!params[item]) {
+          delete params[item]
+        }
+        return true
+      })
+
+      return new Promise((resolve, reject) => {
+        const { data: res } = this.$http.get('/patient/pac30/getExamFileList', { params: params }).then((res) => {
+          if (res.data && res.data.code === 0) {
+            const data = res.data.data
+            if (data && data.length) {
+              data.forEach(item => {
+                if (item.seriesList && item.seriesList.length) {
+                  item.seriesList.forEach(row => {
+                    row.time = row.seriesDate && row.seriesDate.length > 10 ? row.seriesDate.substring(0, 10) : row.seriesDate
+                    row.instanceList.forEach(e => {
+                      const type = e.imageId.substring(e.imageId.length - 3)
+                      e.imageId = 'http://z1.huimucloud.com:8001/' + e.imageId
+                      e.imageType = type.toLocaleUpperCase()
+                    })
+                  })
+                }
+              })
+            }
+            resolve(res.data)
+          }
+        })
+      })
+    },
+    // 查询多个文件并且获取缩略图
+    queryExamine() {
+      this.promiseExamine().then((res) => {
+        let curList = []
+        const data = res.data || []
+        data.forEach(item =>{
+          curList = curList.concat(item.seriesList)
+        })
+        this.dragList = curList
+        this.dragIndex = 0
+        this.handleLayout(1)
+        this.getDcmFile()
+      })
+    },
+    // 选择眼别
+    selectEye(item, index) {
+      this.eyeType = item.id === 1 ? '' : (item.id === 2 ? '右眼' : '左眼')
+      this.eyeIndex = index
+      this.queryExamine()
+    },
+    // 选择文件类型
+    selectFileType(item, index) {
+      this.fileType = item.id === 1 ? '' : (item.id === 2 ? '2' : '1')
+      this.fileIndex = index
+      this.queryExamine()
+    },
+    // 点击缩略图文件
+    handleClickFile(item, index) {
+      this.dragIndex = index
+      // 替换第一个文件
+      this.replaceFile('data-one', item)
+    },
+    // 替换布局中的某一项文件
+    replaceFile(id, item) {
+      const firstDiv = document.getElementById(id)
+      firstDiv.innerHTML = ''
+      const currentNodeList = this.getFileIdList([id])
+      for (let i = 0; i < currentNodeList.length; i++) {
+        currentNodeList[i].data = item
+      }
+      const newNode = this.loadFile(currentNodeList, 'tempId')
+      this.setFootNote(newNode, 'footId')
+      this.setFileInstance(this.layOutList, newNode)
+      this.fileInstance = newNode[0].fileInstance
+    },
+    // 判断点是否在目标矩形中
+    inside(x1, y1, x4, y4, x, y) {
+      // 默认:1点在左上,4点在右下
+      if (x <= x1) {
+        // 在矩形左侧
+        return false
+      }
+      if (x >= x4) {
+        // 在矩形右侧
+        return false
+      }
+      if (y <= y1) {
+        // 在矩形上侧
+        return false
+      }
+      if (y >= y4) {
+        // 在矩形下侧
+        return false
+      }
+      return true
+    },
+    // 拖拽结束
+    fileDragEnd(evt) {
+      const curIdx = evt.oldDraggableIndex
+      const curData = this.dragList[curIdx]
+      // 获取所有容器
+      const slot_con = document.querySelectorAll('[data-slot]')
+      for (const item of slot_con) {
+        const rect = item.getBoundingClientRect()
+        if (this.inside(rect.left, rect.top, rect.right, rect.bottom, evt.originalEvent.clientX, evt.originalEvent.clientY)) {
+          const curIdName = item.getAttribute('id')
+          this.replaceFile(curIdName, curData)
+        }
+      }
+    },
+    // 获取dcm缩略图
+    getDcmFile() {
+      if (!this.dragList.length) return
+      this.$nextTick(() => {
+        this.dragList.forEach((item, index) => {
+          const data = item.instanceList[0]
+          if (data.imageType === 'DCM') {
+            const name = 'fileSolt' + index
+            const element = this.$refs[name]
+            this.$cornerstone.enable(element[0])
+            this.loadImage(element[0], data.imageId)
+          }
+        })
+      })
+    },
+    // 打开标签列表弹框
+    showDrawer(tagType, item) {
+      this.tagFlag = true
+      this.tagType = tagType
+      if (tagType === 2) {
+        this.risNo = item.risNo
+        this.examNo = item.examNo
+        this.examItemCode = item.examItemCode
+      }
+      this.queryTags()
+    },
+    // 查询标签
+    async queryTags() {
+      const { data: res } = await this.$http.get('/tag/tree')
+      if (res.code === 0) {
+        if (res.data.length) {
+          res.data.forEach(item => {
+            // 禁止操作一级标签以及默认展开所有二级标签
+            item.disabled = true
+            this.expandKeys.push(item.id)
+          })
+        }
+        this.tagTreeList = res.data || []
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 添加子级标签
+    append(data) {
+      this.addSubmenuFlag = true
+      this.subTitle = '新增子级菜单'
+      this.tagName = ''
+      this.pid = data.id
+    },
+    // 编辑标签
+    editTag(data) {
+      this.addSubmenuFlag = true
+      this.subTitle = '编辑子级菜单'
+      this.tagName = data.tagName
+      this.tagId = data.id
+    },
+    // 新增/编辑标签
+    async handleAddTag() {
+      if (this.tagName === '') return this.$message.warning('菜单名称不能为空!')
+      const params = {
+        tagName: this.tagName
+      }
+      let url = ''
+      if (this.subTitle === '新增子级菜单') {
+        params.pid = this.pid
+        url = '/tag/saveTag'
+      } else {
+        params.id = this.tagId
+        url = '/tag/updateTagName'
+      }
+      const { data: res } = await this.$http({
+        method: 'post',
+        url: url,
+        data: params
+      })
+      if (res.code === 0) {
+        this.addSubmenuFlag = false
+        this.tagName = ''
+        await this.queryTags()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 删除标签
+    async handleDelTag(tagId) {
+      const { data: res } = await this.$http({
+        method: 'post',
+        url: '/tag/deleteTag',
+        data: {
+          id: tagId
+        }
+      })
+      if (res.code === 0) {
+        await this.queryTags()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 给患者/检查项打标签
+    async addPatientTag() {
+      const tagIds = this.$refs.tree.getCheckedKeys()
+      let url = ''
+      const params = {
+        tagIds: tagIds,
+        patientId: this.patientInfo.patientId,
+        patientIdNumber: this.patientInfo.patientIdNumber
+      }
+      if (this.tagType === 1) {
+        url = '/tag/relation/savePatientTag'
+        params.flag = 1
+      } else if (this.tagType === 2) {
+        url = '/tag/relation/saveExamItemTag'
+        params.risNo = this.risNo
+        params.examNo = this.examNo
+        params.examItemCode = this.examItemCode
+        params.flag = 2
+      }
+      const { data: res } = await this.$http({
+        method: 'post',
+        url: url,
+        data: params
+      })
+      if (res.code === 0) {
+        this.tagFlag = false
+        this.$message.success('添加成功!')
+        if (this.tagType === 1) {
+          // await this.queryPatientTag()
+        } else if (this.tagType === 2) {
+          await this.queryProgramTree(this.examineType)
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 查询患者标签
+    async queryPatientTag() {
+      const { data: res } = await this.$http.get('/tag/relation/getPatientTagList', { params: {
+        patientId: this.patientInfo.patientId
+      }
+      })
+      if (res.code === 0) {
+        this.patientTagList = res.data || []
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 删除病人标签
+    async deletePatientTag(item) {
+      const { data: res } = await this.$http({
+        method: 'post',
+        url: '/tag/relation/deletePatientTag',
+        data: {
+          id: item.id
+        }
+      })
+      if (res.code === 0) {
+        // await this.queryPatientTag()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 查询检查项标签
+    async queryExamineTags(row) {
+      if (row) {
+        this.risNo = row.risNo
+        this.examNo = row.examNo
+      }
+      const { data: res } = await this.$http.get('/tag/relation/getExamItemTagList', { params: {
+        risNo: this.risNo,
+        examNo: this.examNo
+      }
+      })
+      if (res.code === 0) {
+        this.examineTagList = res.data || []
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 删除检查项标签
+    async deleteExamineTag(item) {
+      const { data: res } = await this.$http({
+        method: 'post',
+        url: '/tag/relation/deleteExamItemTag',
+        data: {
+          id: item.id
+        }
+      })
+      if (res.code === 0) {
+        this.queryExamineTags()
+        this.queryProgramTree(this.examineType)
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 展示图像
+    loadImage(element, url) {
+      const self = this
+      const imageId = 'wadouri:' + url
+      this.$cornerstone.loadImage(imageId).then(function(image) {
+        const viewport = self.$cornerstone.getDefaultViewportForImage(element, image)
+        self.viewportDefault = viewport
+        self.$cornerstone.displayImage(element, image, viewport)
+      })
+    },
+    // 手动创建div追加到当前目标容器中，用于挂载覆盖，把组件挂载到创建的div上，返回实例列表
+    loadFile(currentNodeList, tempId) {
+      const tempLabel = document.createElement('div')
+      // 遍历当前的容器节点，挂载组件
+      for (let i = 0; i < currentNodeList.length; i++) {
+        tempLabel.id = tempId + i
+        const current = currentNodeList[i]
+        const currentNode = current.node
+        const currentData = current.data
+        // console.log(currentNode);
+        if (currentNode.hasChildNodes && currentNode.hasChildNodes()) {
+          for (let i = 0; i < currentNode.childNodes.length; i++) {
+            const tempNode = currentNode.childNodes[i]
+            if (tempNode.getAttribute('id') == 'footIndex') tempNode.remove()
+          }
+        }
+        currentNode.appendChild(tempLabel)
+        if (currentData) {
+          const fileConstructor = vm.extend(showFile)
+          // 把当前项的数据作为参数传入组件中
+          const fileInstance = new fileConstructor({
+            propsData: {
+              fileObject: currentData
+            }
+          }).$mount(`#${tempId}${i}`)
+          // 把当前的容器实例作为参数传入到当前的节点中，并且return出去
+          current.fileInstance = fileInstance
+        }
+      }
+      return currentNodeList
+    },
+    // new一个数组，传入所有容器的节点和对应的data
+    getFileIdList(idList) {
+      if (idList.length) {
+        const nodeList = []
+        for (let i = 0; i < idList.length; i++) {
+          const currentNode = document.getElementById(idList[i])
+          nodeList.push({ node: currentNode, data: {}})
+        }
+        return nodeList
+      }
+    },
+    // 设置角注
+    setFootNote(currentNodeList, footId) {
+      const tempLabel = document.createElement('div')
+      const temps = `<div foot-solt-id="footIndex">
+                        <div style="position: absolute;padding: 2px;left: 0;top: 0;">
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">{{fileItem.patientName}}</p>
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">{{fileItem.patientId}}</p>
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">{{fileItem.patientSex}}</p>
+                        </div>
+                        <div style="position: absolute;padding: 2px;right: 0;top: 0;text-align: right">
+                        <i class="el-icon-close" style="text-align: right;color: #418AE8;cursor: pointer" @click="delFIle()"></i>
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">{{fileItem.time}}</p>
+<!--                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">143135 </p>-->
+                        </div>
+                        <div style="position: absolute;padding: 2px;left: 0;bottom: 0;" v-if="fileItem.fileType != 'PDF'">
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">Render Time:{{fileIns.renderTime}} ms</p>
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">lmage # {{fileIns.curIndex}}/{{fileIns.total}} </p>
+
+<!--                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">lmage # {{fileIns.curIndex}}/{{fileIns.total}} </p>-->
+<!--                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">Series # 1</p>-->
+<!--                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">1205824 </p>-->
+                        </div>
+                        <div style="position: absolute;padding: 2px;right: 0;bottom: 0;" v-if="fileItem.fileType != 'PDF'">
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">Zoom:{{fileIns.zoomValue}}</p>
+                          <p style="font-size: 12px;color: #418AE8;margin-bottom: 0">WW/WL:{{fileIns.wwwcValue}}</p>
+                        </div>
+                     </div>`
+      for (let i = 0; i < currentNodeList.length; i++) {
+        tempLabel.id = footId + i
+        const current = currentNodeList[i]
+        const currentNode = current.node
+        if (currentNode.hasChildNodes()) {
+          for (let i = 0; i < currentNode.childNodes.length; i++) {
+            const tempNode = currentNode.childNodes[i]
+            if (tempNode.getAttribute('foot-solt-id') == 'footIndex') tempNode.remove()
+          }
+        }
+        currentNode.appendChild(tempLabel)
+        if (current.data) {
+          current.data.patientName = this.patientInfo.patientName
+          current.data.patientId = this.patientInfo.patientId
+          current.data.patientSex = this.patientInfo.patientSex
+          const myFootNote = vm.extend({
+            props: ['data'],
+            data() {
+              return {
+                fileItem: current.data,
+                fileIns: current.fileInstance
+              }
+            },
+            methods: {
+              delFIle() {
+                const curFIle = document.getElementById(current.node.id)
+                curFIle.innerHTML = ''
+              }
+            },
+            template: temps
+          })
+          new myFootNote({ propsData: { fileItem: current.data, fileIns: current.fileInstance }}).$mount(`#${footId}${i}`)
+        }
+      }
+    },
+    // 点击容器里的文件，选中当前实例
+    handleSelectFile(item) {
+      this.fileInstance = item.file
+    },
+    // 将所有的组件实例当作参数传入对应的数组中
+    setFileInstance(list, newNode) {
+      const secondClass = list[0].secondClass
+      for (let k = 0; k < newNode.length; k++) {
+        const curItem = newNode[k]
+        const curNode = curItem.node
+        const curId = curNode.getAttribute('data-slot')
+        for (let i = 0; i < secondClass.length; i++) {
+          const temp = secondClass[i]
+          if (temp.sign && temp.sign === curId) {
+            temp.file = curItem.fileInstance
+          }
+          for (let j = 0; j < temp.thirdClass.length; j++) {
+            const _temp = temp.thirdClass[j]
+            if (_temp.sign && _temp.sign === curId) {
+              _temp.file = curItem.fileInstance
+            }
+          }
+        }
+      }
+    },
+    // 把缩略图中的前i项的数据作为参数传到节点中
+    setContentData(currentNodeList, contentList) {
+      for (let i = 0; i < contentList.length; i++) {
+        for (let j = 0; j < currentNodeList.length; j++) {
+          currentNodeList[j].data = contentList[j]
+        }
+      }
+    },
+    // 设置容器中数据
+    setLayoutData(idList, contentList) {
+      this.$nextTick(() => {
+        const currentNodeList = this.getFileIdList(idList)
+        this.setContentData(currentNodeList, contentList)
+        const newNode = this.loadFile(currentNodeList, 'tempId')
+        this.setFootNote(newNode, 'footId')
+        this.setFileInstance(this.layOutList, newNode)
+        this.fileInstance = newNode[0].fileInstance
+      })
+    },
+    // 布局
+    handleLayout(i) {
+      // 组件容器中如果有文件，则删除
+      const file_solt = document.querySelectorAll('[file-solt-id]')
+      for (const item of file_solt) item.remove()
+      // 获取缩略图中的前i项
+      let contentList = []
+      if (i > this.dragList.length - 1) {
+        contentList = this.dragList
+      } else {
+        contentList = this.dragList.slice(0, i)
+      }
+      // 标记13种布局方式中每个用于展示的容器，以及控制样式
+      if (i === 1) {
+        const idList = ['data-one']
+        this.layOutList = _.cloneDeep([{ className: 'rowBox', secondClass: [{ classA: 'singleBox', sign: 'data-one', thirdClass: [{ classA: 'dis' }] }] }])
+        this.setLayoutData(idList, contentList)
+      } else if (i === 2) {
+        const idList = ['data-one', 'data-two']
+        this.layOutList = _.cloneDeep([{ className: 'rowBox', secondClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mr8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-two', thirdClass: [{ classA: 'dis' }] }] }])
+        this.setLayoutData(idList, contentList)
+      } else if (i === 3) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = _.cloneDeep([{ className: 'rowBox', secondClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mr8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-two', classB: 'mr8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-three', thirdClass: [{ classA: 'dis' }] }] }])
+        this.setLayoutData(idList, contentList)
+      } else if (i === 4) {
+        const idList = ['data-one', 'data-two']
+        this.layOutList = _.cloneDeep([{ className: 'columnBox', secondClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mb8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-two', classB: '', thirdClass: [{ classA: 'dis' }] }] }])
+        this.setLayoutData(idList, contentList)
+      } else if (i === 5) {
+        const idList = ['data-one', 'data-two', 'data-three', 'data-four']
+        this.layOutList = _.cloneDeep([{ className: 'columnBox', secondClass: [{ classA: 'rowBox', classB: 'mb8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-two', classB: '' }] }, { classA: 'rowBox', classB: '', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-four', classB: '' }] }] }])
+        this.setLayoutData(idList, contentList)
+      } else if (i === 6) {
+        const idList = ['data-one', 'data-two', 'data-three', 'data-four', 'data-five', 'data-six']
+        this.layOutList = [{ className: 'columnBox', secondClass: [{ classA: 'rowBox', classB: 'mb8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-two', classB: '' }] }, { classA: 'rowBox', classB: 'mb8', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-four', classB: '' }] }, { classA: 'rowBox', classB: '', thirdClass: [{ classA: 'singleBox', sign: 'data-five', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-six', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 7) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = [{ className: 'columnBox', secondClass: [{ classA: 'rowBox', classB: 'mb8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-two', classB: '' }] }, { classA: 'rowBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 8) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = [{ className: 'columnBox', secondClass: [{ classA: 'rowBox', classB: 'mb8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: '' }] }, { classA: 'rowBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-two', classB: 'mr8' }, { classA: 'singleBox', sign: 'data-three', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 9) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = [{ className: 'rowBox', secondClass: [{ classA: 'rowBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: '' }] }, { classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-two', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-three', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 10) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = [{ className: 'rowBox', secondClass: [{ classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-two', classB: '' }] }, { classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 11) {
+        const idList = ['data-one', 'data-two', 'data-three']
+        this.layOutList = [{ className: 'columnBox', secondClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mb8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-two', classB: 'mb8', thirdClass: [{ classA: 'dis' }] }, { classA: 'singleBox', sign: 'data-three', thirdClass: [{ classA: 'dis' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 12) {
+        const idList = ['data-one', 'data-two', 'data-three', 'data-four', 'data-five', 'data-six']
+        this.layOutList = [{ className: 'rowBox', secondClass: [{ classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-four', classB: '' }] }, { classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-two', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-five', classB: '' }] }, { classA: 'columnBox', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-six', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      } else if (i === 13) {
+        const idList = ['data-one', 'data-two', 'data-three', 'data-four', 'data-five', 'data-six', 'data-seven', 'data-eight', 'data-nine']
+        this.layOutList = [{ className: 'rowBox', secondClass: [{ classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-one', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-four', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-seven', classB: '' }] }, { classA: 'columnBox', classB: 'mr8', thirdClass: [{ classA: 'singleBox', sign: 'data-two', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-five', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-eight', classB: '' }] }, { classA: 'columnBox', thirdClass: [{ classA: 'singleBox', sign: 'data-three', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-six', classB: 'mb8' }, { classA: 'singleBox', sign: 'data-nine', classB: '' }] }] }]
+        this.setLayoutData(idList, contentList)
+      }
+    },
+    // 窗宽窗位
+    toolWwwl() {
+      this.fileInstance.setWwwl()
+    },
+    // 负片
+    toolInvert() {
+      this.fileInstance.setInvert()
+    },
+    // 移动
+    toolMove() {
+      this.fileInstance.setMove()
+    },
+    // 缩放
+    toolZoom() {
+      this.fileInstance.setZoom()
+    },
+    // 放大
+    toolMagnify() {
+      this.fileInstance.setMagnify()
+    },
+    // 角注
+    toolNote() {
+      const noteList = document.querySelectorAll('[foot-solt-id]')
+      for (let i = 0; i < noteList.length; i++) {
+        noteList[i].style.display = noteList[i].style.display === 'none' ? 'inline' : 'none'
+      }
+    },
+    // 重载
+    toolReset() {
+      this.fileInstance.setReset()
+    },
+    // 全屏
+    toolFullScreen() {
+      const full = document.getElementById('full-screen-solt')
+      this.launchIntoFullscreen(full)
+    },
+    // 全屏
+    launchIntoFullscreen(element) {
+      if (element.requestFullscreen) {
+        element.requestFullscreen()
+      } else if (element.mozRequestFullScreen) {
+        element.mozRequestFullScreen()
+      } else if (element.webkitRequestFullscreen) {
+        element.webkitRequestFullscreen()
+      } else if (element.msRequestFullscreen) {
+        element.msRequestFullscreen()
+      }
+    }
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+.layout{
+  width: 100%;
+  height: 100%;
+  //padding-bottom: 50px;
+  .expansion{
+    width: 32px;
+    height: 32px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 99999;
+  }
+  .leftBox{
+    width: 100%;
+    padding-top: 16px;
+    //height: calc(100% - 48px);
+    height: 100%;
+    display: flex;
+    justify-content: flex-start;
+    background-color: #1F2329;
+    overflow: hidden;
+
+    .leftBtn{
+      width: 32px;
+      height: 100%;
+      flex:0 0 auto;
+      position: relative;
+    }
+    .leftPro{
+      width: 288px;
+      flex:0 0 auto;
+      position: relative;
+    }
+    .treeSide{
+      height: calc(100% - 135px);
+      overflow-y: auto;
+    }
+    .leftNote{
+      width: 32px;
+      height: 46px;
+      position: absolute;
+      left: 0;
+      bottom: 32px;
+    }
+    .leftNote:hover{
+      opacity: 0.8;
+    }
+    .leftBottom{
+      width: 100%;
+      height: 32px;
+      line-height: 32px;
+      background-color: #141414;
+      position: absolute;
+      left: 0;
+      bottom: 0;
+    }
+    .copyRight{
+      font-size: 12px;
+      font-family: PingFang SC;
+      color: #A3A3A3;
+      margin-left: 20px;
+    }
+    .tipLabel{
+      width: 58px;
+      height: 32px;
+      position: absolute;
+      right: 34px;
+      top: 0;
+    }
+    .tipLabel:hover{
+      opacity: 0.8;
+    }
+    .topInfo{
+      color: #FFFFFF;
+      font-size: 16px;
+      font-family: PingFang SC;
+      line-height: 32px;
+      margin-bottom: 0;
+      font-weight: bold;
+      position: absolute;
+      left: 0;
+      top: 0px;
+
+      .mr5{
+        margin-right: 7px;
+      }
+    }
+    .proTree{
+      width: 32px;
+      height: 142px;
+      position: absolute;
+      top: 75px;
+      left: 0;
+    }
+    .timeTree{
+      width: 32px;
+      height: 142px;
+      position: absolute;
+      top: 192px;
+      left: 0;
+    }
+    .proTree:hover, .timeTree:hover{
+      opacity: 0.8;
+    }
+    .tipTop{
+      width: 286px;
+      height: 32px;
+      position: relative;
+      left: -32px;
+      top: 0;
+    }
+    .tipPack{
+      width: 58px;
+      height: 32px;
+      position: absolute;
+      right: 0;
+      top: 0;
+    }
+    .tipPack:hover{
+      opacity: 0.8;
+    }
+    .back{
+      width: 21px;
+      height: 21px;
+      position: absolute;
+      right: 5.5px;
+      top: 5.5px;
+    }
+    .back:hover{
+      opacity: 0.8;
+    }
+    .projectBtn{
+      width: 100%;
+      height: 32px;
+      margin: 16px 0;
+      display: flex;
+      justify-content: space-between;
+
+      .selectBtn{
+        color: #4797FF;
+        font-size: 14px;
+        font-family: PingFang SC;
+        line-height: 32px;
+      }
+      .noteBox{
+        width: 66px;
+        height: 32px;
+        margin-right: 16px;
+      }
+      .noteBox:hover{
+        opacity: 0.8;
+      }
+      .ml12{
+        margin-left: 12px;
+        cursor: pointer;
+      }
+      .ml16{
+        margin-left: 16px;
+        cursor: pointer;
+      }
+    }
+    .examTree{
+      background-color: #1F2329;
+      color: #FFFFFF;
+    }
+    .custom-tree-node{
+      display: inherit;
+      width: 100%;
+      padding-right: 18px;
+    }
+    .labelImg{
+      float: right;
+      margin-top: 6px;
+    }
+    .disSel{
+      display: none;
+    }
+
+  }
+  .contentBox{
+    width: 100%;
+    height: 100%;
+    padding: 16px;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+
+    .contentLeft{
+      width: 120px;
+      height: 100%;
+      margin-right: 16px;
+      transition: width 0.2s;
+      -moz-transition: width 0.2s; /* Firefox 4 */
+      -webkit-transition: width 0.2s; /* Safari and Chrome */
+      -o-transition: width 0.2s; /* Opera */
+      overflow: hidden;
+
+      .fileContent{
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        //overflow-y: hidden;
+
+        .eyeBox{
+          color: #FFFFFF;
+          display: flex;
+          justify-content: flex-start;
+          margin-bottom: 8px;
+
+          .eyeSel{
+            width: 40px;
+            height: 32px;
+            color: #FFFFFF;
+            font-size: 14px;
+            font-family: PingFang SC;
+            line-height: 24px;
+            text-align: center;
+            cursor: pointer;
+            padding: 0 3px;
+            word-spacing: -3px;
+            box-sizing: border-box;
+            background-color: #262626;
+            border: none;
+          }
+          .eyeSel:hover{
+            background-color: #434343;
+          }
+          .eyeActive{
+            background-color: #1C69DC !important;
+          }
+        }
+        .scrollContain{
+          flex: 1;
+          overflow-y: auto;
+
+          .fileBox{
+            width: 108px;
+            // height: 163px;
+            padding-top: 4px;
+            box-sizing: border-box;
+            text-align: center;
+            margin: 8px auto 8px;
+            border-radius: 4px;
+            overflow-x: hidden;
+          }
+          .fileActive{
+            background-color: #0D2247;
+          }
+          .fileBox:hover{
+            background-color: #0D2247;
+          }
+          .fileImg{
+            width: 100px;
+            // height: 100px;
+            margin: auto auto 4px;
+          }
+          .imgName{
+            font-size: 12px;
+            text-align: center;
+            font-family: PingFang SC;
+            color: #FFFFFF;
+            margin-bottom: 0;
+            word-wrap:break-word;
+            word-break:break-all;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            //display: -webkit-box;
+          }
+
+        }
+      }
+    }
+    .contentRight{
+      width: 100%;
+      height: 100%;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+
+      .content_top{
+        width: 100%;
+        margin-bottom: 8px;
+      }
+
+      .toolBox{
+        width: 100%;
+        height: 32px;
+        padding: 0 20px;
+        position: relative;
+        display: flex;
+        justify-content: space-between;
+        line-height: 32px;
+        border-radius: 4px;
+        background-color: #262626;
+        .subscript {
+          width: 6px !important;
+          height: 16px;
+        }
+        .tool,.layBox{
+          line-height: 32px;
+          color: #FFFFFF;
+          cursor: pointer;
+
+          img{
+            width: 16px;
+            height: 16px;
+            vertical-align: sub;
+          }
+          .toolActive{
+            position: absolute;
+            bottom: -24px;
+            left: -26px;
+            display: none;
+          }
+        }
+        .tool:hover{
+          opacity: 0.7;
+        }
+      }
+      .mb16{
+        margin-bottom: 16px;
+      }
+      .mb8{
+        margin-bottom: 8px;
+      }
+      .showBox{
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        flex: 1;
+
+        .rowBox{
+          width: 100%;
+          height: 100%;
+          overflow: hidden;
+          display: flex;
+          justify-content: space-around;
+        }
+        .columnBox{
+          width: 100%;
+          height: 100%;
+          overflow: hidden;
+          display: flex;
+          flex-direction: column;
+        }
+        .singleBox{
+          width: 100%;
+          height: 100%;
+          flex: 1 1 auto;
+          position: relative;
+          padding: 0px 50px;
+          border: 1px solid #418AE8;
+          overflow: hidden;
+        }
+        .dis{
+          display: none;
+        }
+        .mr8{
+          margin-right: 8px;
+        }
+        .mb8{
+          margin-bottom: 8px;
+        }
+
+        .notesBox{
+          position: absolute;
+          padding: 2px;
+
+          p{
+            font-size: 12px;
+            color: #418AE8;
+            font-family: "PingFang SC";
+            margin-bottom: 0;
+          }
+        }
+        .lt{
+          left: 0;
+          top: 0;
+        }
+        .rt{
+          right: 0;
+          top: 0;
+        }
+        .lb{
+          left: 0;
+          bottom: 0;
+        }
+        .rb{
+          right: 0;
+          bottom: 0;
+        }
+      }
+    }
+    }
+  .treeLabel{
+    display: inline-block;
+    white-space: normal;
+    margin-top: 5px;
+    overflow: hidden;
+    text-overflow:ellipsis;
+  }
+  .tagTree{
+    background: #1F2329;
+    color: rgba(255,255,255,0.85);;
+  }
+  ::-webkit-scrollbar
+  {
+    width: 5px;
+  }
+
+  /*定义滚动条轨道 内阴影+圆角*/
+  ::-webkit-scrollbar-track
+  {
+    border-radius: 10px;
+    background-color: rgba(0, 0, 0, 0.1);
+  }
+
+  /*定义滑块 内阴影+圆角*/
+  ::-webkit-scrollbar-thumb
+  {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+    background-color: rgba(0,0,0,0.1);
+  }
+}
+</style>
+<style lang="scss">
+.layout{
+  .addNote{
+    .el-dialog__footer{
+      background: #0c1016;
+      padding-top: 30px;
+    }
+    .el-dialog__header{
+      background: #0C1016 !important;
+      border-bottom: 1px solid #000000 !important;
+    }
+    .el-dialog__body{
+      background-color: #0C1016;
+      padding: 0 20px !important;
+    }
+    .el-dialog__headerbtn .el-dialog__close{
+      color: #FFFFFF;
+    }
+    .cancelNote{
+      background-color: #202020;
+      color: #FFFFFF;
+      border: 1px dotted #274916;
+    }
+  }
+  .el-tree-node__content:hover{
+    background-color: #0D2247;
+
+    .disSel{
+      display: inline-block;
+    }
+  }
+  .el-tree-node:focus>.el-tree-node__content{
+    background-color: #0D2247;
+  }
+  .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #0D2247;
+  }
+}
+.el-checkbox__input{
+  line-height: normal;
+}
+.record-popverClass{
+  background: #262626;
+  border: 1px solid #262626;
+  color: #FFFFFF;
+}
+.tagContent{
+  .el-tag{
+    color: #52C41A;
+    background: #162312;
+    border: 1px solid #274916;
+    display: block;
+    margin-bottom: 8px;
+     .el-tag__close{
+       color: #FFFFFF;
+     }
+    .el-tag__close:hover{
+      background-color: transparent;
+    }
+  }
+  .addTag{
+    background-color: #202020;
+    color: #FFFFFF;
+    border: 1px dotted #274916;
+    cursor: pointer;
+  }
+}
+.record-popverClass  {
+  .popper__arrow::after{
+     border-bottom-color: #262626 !important;
+  }
+ .popper__arrow {
+    border-bottom-color: #262626 !important;
+  }
+}
+.layPopver{
+  height: 115px;
+  min-width: 120px;
+  padding: 8px;
+  background-color: #262626;
+  border: none;
+  .layShow{
+    width: 105px;
+    height: 100px;
+    background-color: #262626;
+    box-sizing: border-box;
+    border-radius: 2px;
+    .tool-layout{
+      display: flex;
+      flex-direction: column;
+
+      .layImg{
+        width: 20px;
+        height: 20px;
+        margin-right: 6px;
+
+        &:hover{
+          opacity: 0.45;
+        }
+      }
+    }
+
+  }
+}
+</style>
diff --git a/src/page-subspecialty/views/pages/pacs/index.vue b/src/page-subspecialty/views/pages/pacs/index.vue
new file mode 100644
index 0000000..e3af360
--- /dev/null
+++ b/src/page-subspecialty/views/pages/pacs/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="detail-view">
+    <imgRecord v-if="imgFlag" :patient-info="patientBaseData" :exam-info="info"/>
+  </div>
+</template>
+
+<script>
+import imgRecord from './img-record'
+export default {
+  components: {
+    imgRecord
+  },
+  data() {
+    return {
+      imgFlag: false,
+      info: {},
+      patientBaseData: {}
+    }
+  },
+  mounted() {
+    this.info = JSON.parse(this.$Base64.decode(this.$route.query.info))
+    this.getPatientData()
+  },
+  methods: {
+    // 根据id获取患者信息
+    async getPatientData() {
+      if (!this.info.patientId) return
+      const { data: res } = await this.$http.get(
+        '/patient/view/getPatientData',
+        {
+          params: {
+            patientId: this.info.patientId
+          }
+        }
+      )
+      if (res.code === 0) {
+        this.patientBaseData = res.data ? res.data : {}
+        this.imgFlag = true
+      } else {
+        this.$message.error(res.msg)
+      }
+    }
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/page-subspecialty/views/pages/pacs/show-file.vue b/src/page-subspecialty/views/pages/pacs/show-file.vue
new file mode 100644
index 0000000..2e0abdc
--- /dev/null
+++ b/src/page-subspecialty/views/pages/pacs/show-file.vue
@@ -0,0 +1,284 @@
+<template>
+  <div id="fileId" v-resize="handleResize" class="container" file-solt-id="fileId">
+    <div v-if="fileType == 'PDF' && instanceList.length > 1" style="margin: 2px">
+      <el-pagination simple :current-page="curIndex" :total="instanceList.length" defaultPageSize="1"  @current-change="handleCurrentChange" />
+    </div>
+    <iframe v-if="fileType == 'PDF'" :src="pdfUrl + '#view=FitH,top&pagemode=thumbs'" frameborder="0" style="width: 100%; height: 100%"></iframe>
+    <div v-if="fileType == 'DCM'" class="dicom" ref="dicomElement"></div>
+    <div v-if="fileType == 'JPG'" style="width: 100%;height: 100%" class="dicom" ref="dicomElement"></div>
+<!--    <iframe v-if="curFile.fileType == 'PDF'" :src="curFile.filePath + '#view=FitH,top&pagemode=thumbs'" frameborder="0" style="width: 100%; height: 100%" />-->
+<!--    <div v-if="curFile.fileType == 'DCM'" ref="dicomElement" class="dicom" />-->
+<!--    <div v-if="curFile.fileType == 'JPG' || curFile.fileType == 'PNG'" ref="imgElement" class="dicom" />-->
+  </div>
+</template>
+
+<script>
+
+export default {
+  directives: { // 使用局部注册指令的方式
+    resize: { // 指令的名称
+      bind(el, binding) { // el为绑定的元素，binding为绑定给指令的对象
+        let width = ''; let height = ''
+        function isReize() {
+          const style = document.defaultView.getComputedStyle(el)
+          if (width !== style.width || height !== style.height) {
+            binding.value()
+          }
+          width = style.width
+          height = style.height
+        }
+        el.__vueSetInterval__ = setInterval(isReize, 300)
+      },
+      unbind(el) {
+        clearInterval(el.__vueSetInterval__)
+      }
+    }
+  },
+  props: ['fileObject'],
+  data() {
+    return {
+      curFile: this.fileObject,
+      curElement: '',
+      fileType: '',
+      viewportDefault: '',
+      zoomValue: '',
+      wwwcValue: '',
+      renderTime: '',
+      pdfUrl: '',
+      curIndex: 1,
+      total: 1,
+      childrenList: [],
+      instanceList: []
+    }
+  },
+  watch: {
+    fileObject(val) {
+      this.curFile = val
+    }
+  },
+  created() {
+    this.instanceList = this.fileObject.instanceList || []
+    this.fileType = this.instanceList.length ? this.instanceList[0].imageType : ''
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    handleCurrentChange (val) {
+      console.log(val)
+      this.pdfUrl = this.instanceList[val - 1].imageId
+    },
+    // 加载DICM和图片
+    drawCornerStone(imageUrl, type) {
+      const self = this
+      let element = ''
+      let imageId = ''
+      if (type === 'DCM') {
+        element = this.$refs.dicomElement
+        imageId = 'wadouri:' + imageUrl// dicom文件需要加上前缀'wadouri:'
+      } else {
+        element = this.$refs.dicomElement
+        imageId = imageUrl
+      }
+      this.$cornerstoneTools.init()
+      this.$cornerstone.enable(element)
+      element.width = document.documentElement.clientWidth
+      element.height = document.documentElement.clientHeight
+      this.$cornerstone.loadImage(imageId).then(function (image) {
+        if (type === 'DCM') {
+          const viewport = self.$cornerstone.getDefaultViewportForImage(element, image)
+          self.viewportDefault = viewport
+          self.$cornerstone.displayImage(element, image, viewport)
+        } else {
+          self.$cornerstone.displayImage(element, image)
+        }
+      })
+      element.addEventListener('cornerstoneimagerendered', this.getZoomRate)// 监听事件
+      // let imageId = ''
+      // const self = this
+      // if (type === 'DCM') {
+      //   imageId = 'wadouri:' + imageUrl // dicom文件需要加上前缀'wadouri:'
+      // } else {
+      //   imageId = imageUrl
+      // }
+      // this.$cornerstoneTools.init()
+      // this.$cornerstone.enable(this.curElement)
+      // this.curElement.width = document.documentElement.clientWidth
+      // this.curElement.height = document.documentElement.clientHeight
+      // this.$cornerstone.loadImage(imageId).then(function(image) {
+      //   // 获取当前图像默认的窗宽窗位
+      //   const viewport = self.$cornerstone.getDefaultViewportForImage(self.curElement, image)
+      //   self.viewportDefault = viewport
+      //   if (type === 'DCM') {
+      //     self.$cornerstone.displayImage(self.curElement, image, viewport)
+      //   } else {
+      //     self.$cornerstone.displayImage(self.curElement, image)
+      //   }
+      // })
+    },
+    // 重新渲染
+    handleResize() {
+      const canvas = document.getElementById('fileId')
+      if (this.curElement && canvas) {
+        this.curElement.style.width = canvas.offsetWidth + 'px'
+        this.curElement.style.height = canvas.offsetHeight + 'px'
+        this.$cornerstone.resize(this.curElement)
+      }
+    },
+    // 窗宽窗位
+    setWwwl() {
+      const WwwcTool = this.$cornerstoneTools.WwwcTool
+      this.$cornerstoneTools.addTool(WwwcTool)
+      this.$cornerstoneTools.setToolActive('Wwwc', { mouseButtonMask: 1 })
+      this.$forceUpdate()
+    },
+    // 负片
+    setInvert() {
+      if (!this.curElement) return
+      this.viewportDefault.invert = !this.viewportDefault.invert
+      this.$cornerstone.setViewport(this.curElement, this.viewportDefault)
+    },
+    // 缩放
+    setZoom() {
+      const ZoomTool = this.$cornerstoneTools.ZoomTool
+      this.$cornerstoneTools.addTool(ZoomTool, {
+        configuration: {
+          invert: false,
+          preventZoomOutsideImage: false,
+          minScale: 0.1,
+          maxScale: 20.0
+        }
+      })
+      this.$cornerstoneTools.setToolActive('Zoom', { mouseButtonMask: 1 })
+    },
+    // 移动
+    setMove() {
+      const PanTool = this.$cornerstoneTools.PanTool
+      this.$cornerstoneTools.addTool(PanTool)
+      this.$cornerstoneTools.setToolActive('Pan', { mouseButtonMask: 1 })
+    },
+    // 放大镜
+    setMagnify() {
+      const MagnifyTool = this.$cornerstoneTools.MagnifyTool
+      this.$cornerstoneTools.addTool(MagnifyTool)
+      this.$cornerstoneTools.setToolActive('Magnify', { mouseButtonMask: 1 })
+    },
+    // 重载
+    setReset() {
+      if (!this.curElement) return
+      this.$cornerstone.reset(this.curElement)
+    },
+    setScroll() {
+      const self = this
+      const element = this.$refs.dicomElement
+      if (!element) return
+      this.$cornerstoneTools.init()
+      this.$cornerstone.enable(element)
+      const s = document.getElementById('fileId')
+      element.width = s.clientWidth
+      element.height = s.clientHeight
+      const series = this.childrenList
+      let imageIds = ''
+      if (this.fileType === 'DCM') {
+        const scheme = 'wadouri'
+        imageIds = series.map(seriesImage => `${scheme}:${seriesImage.imageId}`)
+      } else {
+        imageIds = series.map(seriesImage => `${seriesImage.imageId}`)
+      }
+      const StackScrollTool = this.$cornerstoneTools.StackScrollTool
+      this.total = imageIds.length
+      const stack = {
+        currentImageIdIndex: 0,
+        imageIds
+      }
+      // load images and set the stack
+      // loadAndCacheImage
+      this.$cornerstone.loadImage(imageIds[0]).then((image) => {
+        const viewport = this.$cornerstone.getDefaultViewportForImage(element, image)
+        self.viewportDefault = viewport
+        this.$cornerstone.displayImage(element, image, viewport)
+        this.$cornerstoneTools.addStackStateManager(element, ['stack'])
+        this.$cornerstoneTools.addToolState(element, 'stack', stack)
+      })
+      this.$cornerstoneTools.addTool(StackScrollTool)
+      this.$cornerstoneTools.setToolActive('StackScroll', { mouseButtonMask: 1 })
+      element.addEventListener('cornerstoneimagerendered', this.getZoomRate)// 监听事件
+    },
+    // 计算缩放/窗宽/窗位/渲染时间
+    getZoomRate(e) {
+      if (!this.curElement) return
+      const contextData = e.detail
+      const viewport = this.$cornerstone.getViewport(this.curElement)
+      const dcmaxTools = this.$cornerstoneTools.getToolState(this.curElement, 'stack')
+      this.zoomValue = viewport.scale.toFixed(2)
+      this.wwwcValue = Math.round(viewport.voi.windowWidth) + '/' + Math.round(viewport.voi.windowCenter)
+      this.renderTime = contextData.renderTimeInMs.toFixed(2)
+      if (dcmaxTools && dcmaxTools.data && dcmaxTools.data.length) {
+        this.curIndex = dcmaxTools.data[0].currentImageIdIndex + 1
+      }
+    },
+    initData() {
+      if (this.instanceList.length === 1 && this.fileType === 'DCM') {
+        this.curElement = this.$refs.imgElement
+        const imageUrl = this.instanceList[0].imageId
+        this.drawCornerStone(imageUrl, 'DCM')
+        this.handleResize()
+      } else if (this.instanceList.length === 1 && (this.fileType === 'JPG' || this.fileType === 'PNG')) {
+        this.curElement = this.$refs.imgElement
+        const imageUrl = this.instanceList[0].imageId
+        this.drawCornerStone(imageUrl, 'JPG')
+        this.handleResize()
+      } else if (this.instanceList.length > 1 && (this.fileType === 'JPG' || this.fileType === 'PNG')) {
+        this.curElement = this.$refs.imgElement
+        this.childrenList = this.instanceList
+        this.setScroll()
+        this.handleResize()
+      } else if (this.instanceList.length > 1 && this.fileType === 'DCM') {
+        console.log('序列', this.instanceList)
+        this.curElement = this.$refs.dicomElement
+        this.childrenList = this.instanceList
+        this.setScroll()
+        this.handleResize()
+      } else if (this.fileType === 'PDF') {
+        console.log('pdf')
+        this.pdfUrl = this.instanceList[0].imageId
+        this.total = this.instanceList.length
+      }
+      // if (this.curFile && this.curFile.fileType === 'DCM') {
+      //   this.curElement = this.$refs.dicomElement
+      //   const imageUrl = this.curFile.filePath
+      //   this.drawCornerStone(imageUrl, 'DCM')
+      //   // 每当图像被cornerstone重新绘制时，将发出CornerstoneImageRendered事件调用
+      //   this.curElement.addEventListener('cornerstoneimagerendered', this.getZoomRate)// 监听事件
+      // } else if (this.curFile && (this.curFile.fileType === 'JPG' || this.curFile.fileType === 'PNG')) {
+      //   const imageUrl = this.curFile.filePath
+      //   this.curElement = this.$refs.imgElement
+      //   this.drawCornerStone(imageUrl, 'JPG')
+      //   this.curElement.addEventListener('cornerstoneimagerendered', this.getZoomRate)// 监听事件
+      // }
+    }
+  }
+}
+
+</script>
+<style lang="scss" scoped>
+  .container {
+    color: #FFFFFF;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    text-align: center;
+
+    .dicom{
+      width: 100% !important;
+      height: 100% !important;
+    }
+  }
+</style>
+<style lang="scss">
+.container{
+  .cornerstone-canvas{
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/page-subspecialty/views/pages/pacsManage/index.vue b/src/page-subspecialty/views/pages/pacsManage/index.vue
index 6fd5b47..7ed183c 100644
--- a/src/page-subspecialty/views/pages/pacsManage/index.vue
+++ b/src/page-subspecialty/views/pages/pacsManage/index.vue
@@ -149,8 +149,6 @@ export default {
       page: 1,
       limit: 10,
       total: 0,
-      // patientId: '2328656',
-      // patientId: '2553716',
       patientId: '',
       patientName: '', // 病人姓名
       userName: '', // 用户名
@@ -226,7 +224,6 @@ export default {
   },
   mounted() {
     this.userName = window.localStorage.getItem('userName')
-    // this.getPatientData()
     this.queryPatientList()
   },
   methods: {
@@ -242,6 +239,12 @@ export default {
       this.startDate = null
       this.endDate = null
     },
+    // 点击进入患者详情
+    handleClickRow(record) {
+      console.log(record)
+      this.patientId = record.id
+      this.getPatientData()
+    },
     // 根据id获取患者信息--中间上侧患者信息
     async getPatientData() {
       const { data: res } = await this.$http.get(
@@ -254,6 +257,7 @@ export default {
       )
       if (res.code === 0) {
         this.patientBaseData = res.data ? res.data : {}
+        this.isActive = true
       } else {
         this.$message.error(res.msg)
       }
@@ -332,28 +336,7 @@ export default {
       const url = `${api.interfaceConfig.downLoad}?patientId=${this.patientId}&token=${token}`
       window.location.href = url
     },
-    // 点击进入患者详情
-    handleClickRow(record, index) {
-      console.log(record)
-      this.patientId = record.id
-      this.getPatientData()
-      // this.patientBaseData = record
-      this.isActive = true
-      // return {
-      //   on: {
-      //     click: () => {
-      //       console.log(record)
-      //       // window.localStorage.setItem('patientId', '88163664')
-      //       window.localStorage.setItem('patientId', '2553716')
-      //       // window.localStorage.setItem('patientId', record.id)
-      //       window.localStorage.setItem('name', record.name)
-      //       window.localStorage.setItem('age', record.age)
-      //       window.localStorage.setItem('sex', record.sex)
-      //       this.$router.push({ name: 'patientDetail' })
-      //     }
-      //   }
-      // }
-    },
+
     // 关闭360弹框
     closePacs() {
       this.isActive = false
@@ -390,7 +373,6 @@ export default {
       if (res.code === 0) {
         this.patientList = res.data ? res.data.list : []
         this.total = res.data ? res.data.total : 0
-        console.log(this.patientList)
       } else {
         this.$message.error(res.msg)
       }