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

src/components/360View/index1.vue

@@ -406,8 +406,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({

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/index.vue

@@ -2,10 +2,10 @@
   <div class="notice-book">
     <el-tabs v-model="activeName" @tab-click="tabClick">
       <el-tab-pane label="角膜塑形镜" name="first">
-        <notice-book :patient-id="patientId" />
+        <notice-book :patient-id="patientId" v-if="activeName ==='first'"/>
       </el-tab-pane>
       <el-tab-pane label="RGP 知情同意书" name="second">
-        <rgpBook :patient-id="patientId"></rgpBook>
+        <rgpBook :patient-id="patientId" v-if="activeName ==='second'"></rgpBook>
       </el-tab-pane>
     </el-tabs>
   </div>

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue

@@ -115,7 +115,7 @@
               <div style="margin-top: 3px;margin-left: 145px">
                 <span style="margin-left: 16px">日期：</span>
                 <el-date-picker
-                  v-model="patientSignDate"
+                  v-model="wearerOrGuardianSignDate"
                   style="width: 160px"
                   size="small"
                   type="date"
@@ -145,7 +145,7 @@ export default {
   data() {
     return {
       doctorSignDate: null,
-      patientSignDate: null
+      wearerOrGuardianSignDate: null
     }
   },
   computed: {
@@ -188,7 +188,7 @@ export default {
     // this.getNoticeName()
     this.$store.commit('initPlugin')
     this.doctorSignDate = this.$moment().format('YYYY-MM-DD')
-    this.patientSignDate = this.$moment().format('YYYY-MM-DD')
+    this.wearerOrGuardianSignDate = this.$moment().format('YYYY-MM-DD')
   },
   methods: {
     signClick(index) {
@@ -200,14 +200,17 @@ export default {
     // 获取告知书签名
     getNoticeName() {
       const params = {
-        patientId: this.patientId
+        patientId: this.patientId,
+        noticeType: 1
       }
       this.$http.get('/hospital/notice/getNoticeSign', { params: params }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
         if (res.data) {
-          this.$store.commit('optomSign2', res.data.optomSign)
+          this.doctorSignDate = res.data.doctorSignDate
+          this.wearerOrGuardianSignDate = res.data.wearerOrGuardianSignDate
+          this.$store.commit('optomSign2', res.data.ygsSign)
           this.$store.commit('doctorSign2', res.data.doctorSign)
           this.$store.commit('patientSign2', res.data.patientSign)
           this.$store.commit('guardianSign2', res.data.guardianSign)
@@ -222,16 +225,16 @@ export default {
     // 保存、修改告知书
     saveEditNotice() {
       const params = {
+        noticeType: 1,
         patientId: this.patientId,
-        doctorSign: this.doctorSign,
-        guardianSign: this.guardianSign,
-        patientSign: this.patientSign,
-        readerSign: this.readerSign,
-        wearerOrGuardianSign: this.wearerOrGuardianSign,
+        doctorSign: this.doctorSign2,
+        guardianSign: this.guardianSign2,
+        patientSign: this.patientSign2,
+        ygsSign: this.optomSign2,
         doctorSignDate: this.doctorSignDate,
         wearerOrGuardianSignDate: this.wearerOrGuardianSignDate
       }
-      this.$http.post('/hospital/notice', params).then(({ data: res }) => {
+      this.$http.post('/hospital/notice/saveOrUpdateNoticeSign', params).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue

@@ -82,7 +82,7 @@
                 <span style="margin-left: 16px">日期：</span>
                 <el-date-picker
                   v-model="doctorSignDate"
-                  style="width: 140px"
+                  style="width: 160px"
                   size="small"
                   type="date"
                   placeholder="选择日期"
@@ -103,8 +103,8 @@
               <div style="margin-top: 3px;margin-left: 145px">
                 <span style="margin-left: 16px">日期：</span>
                 <el-date-picker
-                  v-model="patientSignDate"
-                  style="width: 140px"
+                  v-model="wearerOrGuardianSignDate"
+                  style="width: 160px"
                   size="small"
                   type="date"
                   placeholder="选择日期"
@@ -133,7 +133,7 @@ export default {
   data() {
     return {
       doctorSignDate: null,
-      patientSignDate: null
+      wearerOrGuardianSignDate: null
     }
   },
   computed: {
@@ -173,10 +173,10 @@ export default {
   created() {
   },
   mounted() {
+    // this.getNoticeName()
     this.$store.commit('initPlugin')
     this.doctorSignDate = this.$moment().format('YYYY-MM-DD')
-    this.patientSignDate = this.$moment().format('YYYY-MM-DD')
-    // this.getNoticeName()
+    this.wearerOrGuardianSignDate = this.$moment().format('YYYY-MM-DD')
   },
   methods: {
     signClick(index) {
@@ -188,6 +188,7 @@ export default {
     // 获取告知书签名
     getNoticeName() {
       const params = {
+        noticeType: 2,
         patientId: this.patientId
       }
       this.$http.get('/hospital/notice/getNoticeSign', { params: params }).then(({ data: res }) => {
@@ -195,7 +196,9 @@ export default {
           return this.$message.error(res.msg)
         }
         if (res.data) {
-          this.$store.commit('optomSign', res.data.optomSign)
+          this.doctorSignDate = res.data.doctorSignDate
+          this.wearerOrGuardianSignDate = res.data.wearerOrGuardianSignDate
+          this.$store.commit('optomSign', res.data.ygsSign)
           this.$store.commit('doctorSign', res.data.doctorSign)
           this.$store.commit('patientSign', res.data.patientSign)
           this.$store.commit('guardianSign', res.data.guardianSign)
@@ -210,18 +213,16 @@ export default {
     // 保存、修改告知书
     saveEditNotice() {
       const params = {
+        noticeType: 2,
         patientId: this.patientId,
-        drgsName: window.localStorage.getItem('identity'),
         doctorSign: this.doctorSign,
         guardianSign: this.guardianSign,
         patientSign: this.patientSign,
-        readerSign: this.readerSign,
-        wearerOrGuardianSign: this.wearerOrGuardianSign,
+        ygsSign: this.optomSign,
         doctorSignDate: this.doctorSignDate,
-        wearerOrGuardianSignDate: this.wearerOrGuardianSignDate,
-        isAgree: this.isAgree
+        wearerOrGuardianSignDate: this.wearerOrGuardianSignDate
       }
-      this.$http.post('/hospital/notice', params).then(({ data: res }) => {
+      this.$http.post('/hospital/notice/saveOrUpdateNoticeSign', params).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {