Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/components/360View/index.vue

@@ -330,7 +330,8 @@ export default {
     // 切换病史总览时间轴
     tabClick(type) {
       this.timeAxisType = type.name
-      this.timeAxisNodeInfo = []
+      if (this.timeAxisType === '病史总览' || this.timeAxisType === '门诊病历' || this.timeAxisType === '常规检查' || this.timeAxisType === '特殊检查' || this.timeAxisType === '视光档案' || this.timeAxisType === '随访记录') return
+      this.searchAxisData()
     },
     selectType(type) {
       this.dataType = type
@@ -347,9 +348,7 @@ export default {
       eventBus.$off('sendForData')
       eventBus.$on('sendForData', data => {
         const arr = this.foreList.concat(data)
-        // const id = 'id'
         this.foreList = this.unique(arr)
-        // this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
         this.openDataDrink()
       })
     },
@@ -409,8 +408,8 @@ export default {
     // 360浏览器
     handlePacs() {
       // const baseUrl = 'http://z1.huimucloud.com:8085'
-      // const baseUrl = 'http://10.80.5.32:8026'
-      const baseUrl = 'http://192.168.0.85:8001'
+      const baseUrl = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
       const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
       window.open(href, '_blank')
       // const { href } = this.$router.resolve({
@@ -466,13 +465,11 @@ export default {
         this.$message.error(res.msg)
       }
     },
-    // 获取时间轴节点信息--点击左侧时间轴获取患者具体信息
-    async getTimeAxisNodeInfo(item) {
-      this.timeAxisType = item.groupName
+    async searchAxisData() {
       const { data: res } = await this.$http.get('/patient/view/getTimeAxisNodeInfo', {
         params: {
-          date: item.opDate,
-          groupName: item.groupName,
+          date: this.date,
+          groupName: this.timeAxisType,
           patientId: this.patientId || this.$route.query.patientId
         }
       })
@@ -481,6 +478,16 @@ export default {
       } else {
         this.$message.error(res.msg)
       }
+    },
+    // 获取时间轴节点信息--点击左侧时间轴获取患者具体信息
+    async getTimeAxisNodeInfo(item) {
+      this.date = item.opDate
+      if (item.groupName === '特检') {
+        this.timeAxisType = '特殊检查'
+      } else {
+        this.timeAxisType = item.groupName
+      }
+      await this.searchAxisData()
     }
   }
 }

src/page-subspecialty/views/modules/formList/childrenLacrimal.vue

@@ -133,6 +133,7 @@ export default {
           ]
         }
       ],
+      sourceData: {},
       print: {
         id: 'mraFunc',
         closeCallback: () => {
@@ -166,6 +167,7 @@ export default {
     }
   },
   created() {
+    this.sourceData = JSON.parse(JSON.stringify(this.confirmData))
     this.getformList()
     this.$store.commit('initPlugin')
   },
@@ -191,7 +193,10 @@ export default {
         if (res.data) {
           if (res.data.jsonText) {
             this.confirmData = JSON.parse(res.data.jsonText)
+            this.$store.commit('childrenSign', this.confirmData.patientSign)
           } else {
+            this.confirmData = JSON.parse(JSON.stringify(this.sourceData))
+            this.$store.commit('childrenSign', '')
             this.setData()
           }
         }

src/page-subspecialty/views/modules/formList/conjunctivalOperation.vue

@@ -191,6 +191,7 @@ export default {
       },
       printHidden: true,
       formId: '',
+      sourceData: {},
       confirmData: {
         relation: '',
         diagnose: '',
@@ -219,6 +220,7 @@ export default {
     }
   },
   created() {
+    this.sourceData = JSON.parse(JSON.stringify(this.confirmData))
     this.getformList()
     this.$store.commit('initPlugin')
   },
@@ -244,7 +246,12 @@ export default {
         if (res.data) {
           if (res.data.jsonText) {
             this.confirmData = JSON.parse(res.data.jsonText)
+            this.$store.commit('conPatientSign', this.confirmData.patientSign)
+            this.$store.commit('conKinSign', this.confirmData.familySign)
           } else {
+            this.confirmData = JSON.parse(JSON.stringify(this.sourceData))
+            this.$store.commit('conPatientSign', '')
+            this.$store.commit('conKinSign', '')
             this.setData()
           }
         }

src/page-subspecialty/views/modules/formList/cornealForeign.vue

@@ -233,8 +233,12 @@ export default {
         if (res.data) {
           if (res.data.jsonText) {
             this.confirmData = JSON.parse(res.data.jsonText)
+            this.$store.commit('cornealPatientSign', this.confirmData.patientSign)
+            this.$store.commit('cornealKinSign', this.confirmData.familySign)
           } else {
             this.confirmData = JSON.parse(JSON.stringify(this.sourceData))
+            this.$store.commit('cornealPatientSign', '')
+            this.$store.commit('cornealKinSign', '')
             this.setData()
           }
         }

src/page-subspecialty/views/modules/formList/puncture.vue

@@ -170,6 +170,7 @@ export default {
       },
       printHidden: true,
       formId: '',
+      sourceData: {},
       confirmData: {
         illness: '',
         narcotize: '',
@@ -201,6 +202,7 @@ export default {
     }
   },
   created() {
+    this.sourceData = JSON.parse(JSON.stringify(this.confirmData))
     this.getformList()
     this.$store.commit('initPlugin')
   },
@@ -226,7 +228,12 @@ export default {
         if (res.data) {
           if (res.data.jsonText) {
             this.confirmData = JSON.parse(res.data.jsonText)
+            this.$store.commit('puncturePatientSign', this.confirmData.patientSign)
+            this.$store.commit('punctureKinSign', this.confirmData.familySign)
           } else {
+            this.confirmData = JSON.parse(JSON.stringify(this.sourceData))
+            this.$store.commit('puncturePatientSign', '')
+            this.$store.commit('punctureKinSign', '')
             this.setData()
           }
         }