1

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -22,6 +22,7 @@
                 <el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button>
                 <!-- <el-button style="margin: 0px 0 20px 0;" @click="pass(fisrtQueueInfo.patient_id)">&ensp;过号&ensp;</el-button> -->
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下五位</el-button>
             </div>
         </div>
     </div>
@@ -130,13 +131,17 @@ export default {
                             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')
+                                    if(fisrtQueueInfo != null){
+                                        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(fisrtQueueInfo != null){
+                                        if(fisrtQueueInfo.create_time){
+                                            fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                        }
                                     }
                                 }
                             }
@@ -286,6 +291,37 @@ export default {
                 }
             })
         },
+        nextFive(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
+            let schedule_type = null
+            if(this.patientStateVal == 0){
+                schedule_type = 1
+            }else if(this.patientStateVal == 1){
+                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 + '&schedule_type=' + schedule_type + '&num=5').then(res => {
+                console.log(res)
+                // let patientArr = res.data.queue_list.data
+                // this.patientArr = patientArr
+                // this.$emit('child-event',this.patientArr)
+                if(res.data.data.patientInfo == null){
+                    this.$message.error('已经是最后一位了');
+                    return
+                }
+                if(res.data.code == 200){
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                }
+            })
+        },
         pass(patient_id){
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
@@ -324,7 +360,7 @@ export default {
     height: 313px;
     border: 1px solid #e5e5ee;
     // flex: 1;
-    width: 12%;
+    width: 14%;
     text-align: center;
     .nowCallingTitle{
         font-size: 20px;

src/xt_pages/sign/components/computerCalling.vue

@@ -21,6 +21,7 @@
                 <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</p>
                 <p><el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button></p>
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下五位</el-button>
             </div>
         </div>
     </div>
@@ -105,13 +106,17 @@ export default {
                         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')
+                                if(fisrtQueueInfo != null){
+                                    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(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
                                 }
                             }
                         }
@@ -260,6 +265,37 @@ export default {
                 }
             })
         },
+        nextFive(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
+            console.log('patient_id',patient_id)
+            let schedule_type = null
+            if(this.patientStateVal == 0){
+                schedule_type = 1
+            }else if(this.patientStateVal == 1){
+                schedule_type = 2
+            }
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
+            let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
+            axios.get('/api/index/nextupcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type + '&num=5').then(res => {
+                console.log(res)
+                // let patientArr = res.data.queue_list.data
+                // this.patientArr = patientArr
+                // this.$emit('child-event',this.patientArr)
+                if(res.data.data.patientInfo == null){
+                    this.$message.error('已经是最后一位了');
+                    return
+                }
+                if(res.data.code == 200){
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                }
+            })
+        },
     }
 }
 </script>

src/xt_pages/sign/lineUp.vue

@@ -394,8 +394,8 @@ export default {
                         // })
                     }else if(res.channel == 'patientCallInfo'){
                         console.log(999999999999,res.data)
-                        
-                        
+                        let second = res.data.second
+                    
                         console.log('执行几次',this.voiceNum)
                         if(this.voice == true){
                             this.patient_id = res.data.patientInfo.patient_id
@@ -423,7 +423,7 @@ export default {
                                     clearInterval(this.voiceTime);
                                     this.voiceTime = null
                                 }
-                            },6000)
+                            },1000 * second)
                         }else {
                             // this.$message({
                             //     message: '警告哦，这是一条警告消息',