Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -1801,10 +1801,16 @@ export default {
       })
     },
     next(){
+      let schedule_type = null
+      if(new Date().getHours() < 11){
+        schedule_type = 1
+      }else {
+        schedule_type = 2
+      }
       console.log('patient_id',this.$route.query.date)
       let org_id =  parseInt(sessionStorage.getItem("org_id"));
       let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-      axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+      axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
         console.log(res)
         if(res.data.data.patientInfo == null){
           this.$message.error('已经是最后一位了');

src/xt_pages/dialysis/schedualPatient.vue

@@ -378,13 +378,30 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           // let res = re.data;
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
+            let timeType = null
+            if(new Date().getHours() < 11){
+              timeType = 1
+            }else if(new Date().getHours() >= 11){
+              timeType = 2
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
             if(res.data.fisrtQueueInfo != null){
-              if(res.data.fisrtQueueInfo.create_time){
-                res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
-              }
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
             }
+            this.fisrtQueueInfo = fisrtQueueInfo
             this.queueConfig = res.data.queueConfig
-            this.fisrtQueueInfo = res.data.fisrtQueueInfo
+            // this.fisrtQueueInfo = res.data.fisrtQueueInfo
             let arr = res.data.patientQueueList.data
             let waitingCalledArr = []
             let calledArr = []
@@ -448,10 +465,16 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             this.$message.error('已经是最后一位了');
             return
           }
+          let schedule_type = null
+          if(new Date().getHours() < 11){
+            schedule_type = 1
+          }else {
+            schedule_type = 2
+          }
           console.log('patient_id',patient_id)
           let org_id =  parseInt(sessionStorage.getItem("org_id"));
           let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-          axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+          axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
               console.log(res)
               // let patientArr = res.data.queue_list.data
               // this.patientArr = patientArr

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -122,47 +122,49 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res3333333333',res)
-                if(res.data.type == 3){
+                
                     if(res.channel == 'queue/join'){
-                        let fisrtQueueInfo = []
-                        this.newFisrtQueueInfo = res.data.fisrtQueueInfo
-                        if(res.data.fisrtQueueInfo != null){
-                            if(this.patientStateVal == 0){
-                                fisrtQueueInfo = res.data.fisrtQueueInfo.morning
-                                if(fisrtQueueInfo.create_time){
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
-                                }
-                            }else if(this.patientStateVal == 1){
-                                fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
-                                if(fisrtQueueInfo.create_time){
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                        if(res.data.type == 3){
+                            let fisrtQueueInfo = []
+                            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+                            if(res.data.fisrtQueueInfo != null){
+                                if(this.patientStateVal == 0){
+                                    fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
+                                }else if(this.patientStateVal == 1){
+                                    fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
                                 }
                             }
-                        }
-                        this.fisrtQueueInfo = fisrtQueueInfo
-                        let arr = res.data.patientQueueList.data
-                        // let waitingCalledArr = []
-                        let waitingCalledAm = []
-                        let waitingCalledPm = []
-                        let calledArr = []
-                        arr.map(item => {
-                            if(item.status == 1){
-                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                // waitingCalledArr.push(item)
-                                if(item.schedule_type == 1){
-                                    waitingCalledAm.push(item)
-                                }else if(item.schedule_type == 2){
-                                    waitingCalledPm.push(item)
+                            this.fisrtQueueInfo = fisrtQueueInfo
+                            let arr = res.data.patientQueueList.data
+                            // let waitingCalledArr = []
+                            let waitingCalledAm = []
+                            let waitingCalledPm = []
+                            let calledArr = []
+                            arr.map(item => {
+                                if(item.status == 1){
+                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                    // waitingCalledArr.push(item)
+                                    if(item.schedule_type == 1){
+                                        waitingCalledAm.push(item)
+                                    }else if(item.schedule_type == 2){
+                                        waitingCalledPm.push(item)
+                                    }
+                                }else if(item.status == 2){
+                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                    calledArr.push(item)
                                 }
-                            }else if(item.status == 2){
-                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                calledArr.push(item)
-                            }
-                        })
-                        // this.waitingCalled = waitingCalledArr
-                        this.waitingCalledAm = waitingCalledAm
-                        this.waitingCalledPm = waitingCalledPm
-                        this.called = calledArr
+                            })
+                            // this.waitingCalled = waitingCalledArr
+                            this.waitingCalledAm = waitingCalledAm
+                            this.waitingCalledPm = waitingCalledPm
+                            this.called = calledArr
+                        }
                     }else if(res.channel == 'allQueueList'){
                         let arr = res.data.queue_list.data
                         // let waitingCalledArr = []
@@ -191,7 +193,7 @@ export default {
                         res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
                         this.fisrtQueueInfo = res.data.patientInfo
                     }
-                }
+                
             }
         },
         handleStateChange: function(index) {

src/xt_pages/sign/components/computerCalling.vue

@@ -13,7 +13,7 @@
             <div class="callingArea">
                 <called v-if="patientStateVal == 0" :index='1' :called='waitingCalledAm'></called>
                 <called v-if="patientStateVal == 1" :index='1' :called='waitingCalledPm'></called>
-                <called v-if="patientStateVal == w" :called="called"></called>
+                <called v-if="patientStateVal == 2" :called="called"></called>
             </div>
             <div class="nowCalling" v-if="patientStateVal == 0">
                 <p class="nowCallingTitle">当前叫号</p>
@@ -95,12 +95,11 @@ export default {
         },
         websocketMess() {
             this.websocket.onmessage = e => {
-                
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.data.type == 4){
-                    if(res.channel == 'queue/join'){
+                if(res.channel == 'queue/join'){
+                    if(res.data.type == 4){
                         let fisrtQueueInfo = []
                         this.newFisrtQueueInfo = res.data.fisrtQueueInfo
                         if(res.data.fisrtQueueInfo != null){
@@ -140,34 +139,34 @@ export default {
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
                         this.called = calledArr
-                    }else if(res.channel == 'allQueueList'){
-                        let arr = res.data.queue_list.data
-                        // let waitingCalledArr = []
-                        let waitingCalledAm = []
-                        let waitingCalledPm = []
-                        let calledArr = []
-                        arr.map(item => {
-                            if(item.status == 1){
-                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                // waitingCalledArr.push(item)
-                                if(item.schedule_type == 1){
-                                    waitingCalledAm.push(item)
-                                }else if(item.schedule_type == 2){
-                                    waitingCalledPm.push(item)
-                                }
-                            }else if(item.status == 2){
-                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                calledArr.push(item)
+                    }
+                }else if(res.channel == 'allQueueList'){
+                    let arr = res.data.queue_list.data
+                    // let waitingCalledArr = []
+                    let waitingCalledAm = []
+                    let waitingCalledPm = []
+                    let calledArr = []
+                    arr.map(item => {
+                        if(item.status == 2){
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            // waitingCalledArr.push(item)
+                            if(item.schedule_type == 1){
+                                waitingCalledAm.push(item)
+                            }else if(item.schedule_type == 2){
+                                waitingCalledPm.push(item)
                             }
-                        })
-                        // this.waitingCalled = waitingCalledArr
-                        this.waitingCalledAm = waitingCalledAm
-                        this.waitingCalledPm = waitingCalledPm
-                        this.called = calledArr
-                    }else if(res.channel == 'patientCallInfo'){
-                        res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
-                        this.fisrtQueueInfo = res.data.patientInfo
-                    } 
+                        }else if(item.status == 3){
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            calledArr.push(item)
+                        }
+                    })
+                    // this.waitingCalled = waitingCalledArr
+                    this.waitingCalledAm = waitingCalledAm
+                    this.waitingCalledPm = waitingCalledPm
+                    this.called = calledArr
+                }else if(res.channel == 'patientCallInfo'){
+                    res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
+                    this.fisrtQueueInfo = res.data.patientInfo
                 }
             }
         },

src/xt_pages/sign/lineUp.vue

@@ -353,18 +353,20 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.data.type == 2){
+                
                     if(res.channel == 'queue/join'){
-                        this.queueConfig = res.data.queueConfig
-                        this.lineUpList = res.data.patientQueueList.data
-                        this.receivingPatient = res.data.receivingPatient
-                        this.waitDoctorList = res.data.waitDoctorList
-                        this.upPatientList = res.data.upPatientList
-                        this.count = res.data.patientQueueList.count
-                        // this.lineUpList.map(item => {
-                        //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                        //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
-                        // })
+                        if(res.data.type == 2){
+                            this.queueConfig = res.data.queueConfig
+                            this.lineUpList = res.data.patientQueueList.data
+                            this.receivingPatient = res.data.receivingPatient
+                            this.waitDoctorList = res.data.waitDoctorList
+                            this.upPatientList = res.data.upPatientList
+                            this.count = res.data.patientQueueList.count
+                            // this.lineUpList.map(item => {
+                            //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                            // })
+                        }
                     }else if(res.channel == 'queue/queuelist'){
                         this.lineUpList = res.data.patientQueueList.data
                         this.count = res.data.patientQueueList.count
@@ -424,7 +426,7 @@ export default {
                     }else if(res.channel == 'updateUpCallList'){
                         this.upPatientList = res.data.queue_list
                     }
-                }
+                
                 // else if(res.channel == "patientQueueInfo"){
                 //     this.queueInfo = res.data.queueInfo
                 //     let obj = {

src/xt_pages/sign/signIn.vue

@@ -216,13 +216,15 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.data.type == 1){
+                
                     if(res.channel == 'queue/join'){
-                        this.signInList = res.data.patientQueueList.data
-                        this.count = res.data.patientQueueList.count
-                        this.signInList.map(item => {
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                        })
+                        if(res.data.type == 1){
+                            this.signInList = res.data.patientQueueList.data
+                            this.count = res.data.patientQueueList.count
+                            this.signInList.map(item => {
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            })
+                        }
                     }else if(res.channel == "patientQueueInfo"){
                         clearTimeout(this.ds)
                         this.ds = null
@@ -246,7 +248,7 @@ export default {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                         })
                     }
-                }
+                
                 // console.log("action", re.action);
                 // console.log("data", JSON.stringify(res));
             }