1

config/dev.env.js

@@ -6,8 +6,8 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
   // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',

config/index.js

@@ -12,7 +12,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'http://hf.sgjyun.com',//设置你调用的接口域名和端口号 别忘了加http
+        target: 'http://hf.sgjyun.com',//设置你调用的接口域名和端口号 别忘了加http 正式
+        // target: 'http://hf.szjkhd.com',//设置你调用的接口域名和端口号 别忘了加http 测试
         changeOrigin: true,//设置true 代表跨域访问
         secure: false,  // 如果是https接口，需要配置这个参数
         pathRewrite: {

src/api/call.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+export function getQueue() {
+  return request({
+    url: '/api/queue/get',
+    method: 'get'
+  })
+}
+export function changeQueue(params) {
+  return request({
+    url: '/api/queue/update',
+    method: 'get',
+    params:params
+  })
+}

src/lang/zh.js

@@ -90,7 +90,7 @@ export default {
     patient: '患者中心',
     dialysisSolution: '透析处方',
     inspection: '检验检查',
-    home: '首页',
+    home: '透析首页',
     weight: '干体重',
     dialysisRecord: '透析记录',
     scheduling: '排班信息',

src/views/layout/components/Navbar.vue

@@ -293,7 +293,8 @@ export default {
         if(res.data.code == 0){
           let token = res.data.data.token
           localStorage.setItem("token",token)
-          let http = 'wss://socket.sgjyun.com?token='
+          let http = 'wss://socket.sgjyun.com?token=' 
+          // let http = 'ws://socket.szjkhd.com?token='//测试
           console.log(this.$store.state.user.websocket)
           this.$store.state.user.websocket = new ReconnectingWebSocket(
             http + token

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -2252,6 +2252,9 @@
 
       },
       getDialysisScheduleDetail() {
+        if(this.$route.query.showView && this.$route.query.showView == true){
+          return
+        }
         getDialysisScheduleDetail(this.patientid, this.record_date).then(response => {
           if (response.data.state == 1) {
             var doctor_advices = response.data.data.doctor_advices

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -44,6 +44,7 @@
 </template>
 
 <script>
+  import axios from 'axios'
   import { finishDialysis,PostModifyFinishDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
 
@@ -211,6 +212,11 @@
             for (const key in dialysis_order) {
               this.$set(this_order, key, dialysis_order[key])
             }
+            let orgId = parseInt(sessionStorage.getItem("org_id"));
+            axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
+              console.log('res',res.data)
+
+            }) 
             this.hide()
             this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 

src/xt_pages/dialysis/details/index.vue

@@ -3,6 +3,20 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div class="print" style="float:left;">
+        <el-button
+          v-if="queueConfig.txxqyxs == 1"
+          size="small"
+          type="primary"
+          @click="call"
+          >叫号</el-button
+        >
+        <el-button
+          v-if="queueConfig.txxqyxs == 1"
+          size="small"
+          type="primary"
+          @click="next"
+          >下一位</el-button
+        >
         <el-button
           size="small"
           type="primary"
@@ -197,7 +211,7 @@
 
 
     </div>
-    <div style="width:75%">
+    <div style="width:75%" v-show="!showView">
       <div style="margin-left:60px;color:#34495e">
         <span>{{ patient.name }}({{ patient.dialysis_no }})</span>
         <span v-if="newTime != ''">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
@@ -499,11 +513,20 @@
         title="治疗小结"
       ></treatment-of>
       </div>
+    <div v-if="showView" style="text-align:center;margin: 0 auto;font-size:20px;">
+      <p style="margin-top:20px;">当前叫号</p>
+      <p style="margin-top:20px;">{{ $route.query.patient_name ? $route.query.patient_name : ""}}</p>
+      <p style="margin-top:20px;">签到时间：{{ $route.query.curPatientTime ? getDates($route.query.curPatientTime) : '' }}</p>
+      <p style="color:red;margin-top:20px;">提示：当前患者无排班，请先排班</p>
+
+    </div>
     </div>
   </div>
 </template>
 
 <script>
+const moment = require('moment')
+import axios from 'axios'
 import NavIgation from './NavIgation'
 import BasicInfor from './BasicInfor'
 import DialysisPrescription from './DialysisPrescription'
@@ -643,10 +666,19 @@ export default {
       arr: [],
       newName: '',
       newTime: '',
-      scheudle_mode:""
+      scheudle_mode:"",
+
+
+      showView:false,
+      curPatient:{},
+
+      queueConfig:{}
     }
   },
   created() {
+    if(this.$route.query.showView){
+      this.showView = this.$route.query.showView
+    }
     if(sessionStorage.getItem("nameActive")){
       this.activeName = sessionStorage.getItem("nameActive")
     }
@@ -680,8 +712,39 @@ export default {
       this.selected_date = selected_date.selected_date
     }
 
+    this.initData = {
+      cmd: "queue/join",
+      data: {type:3,page:0,size:0},
+    };
+    this.websocketSend(this.initData)
+
     this.getInitData()
   },
+  beforeMount() {
+    if (this.websocket) {
+      if (this.websocket.readyState == 1) {
+        console.log('执行1')
+        this.websocketMess();
+      } else {
+        setTimeout(() => {
+          console.log('执行2')
+          this.websocketMess();
+        }, 1000);
+      }
+    } else {
+      setTimeout(() => {
+        if (this.websocket) {
+          console.log('执行3')
+          this.websocketMess();
+        } else {
+          setTimeout(() => {
+            console.log('执行4')
+            this.websocketMess();
+          }, 1000);
+        }
+      }, 1000);
+    }
+  },
   mounted() {
     const timer = setInterval(() => {
       // this.getInitData();
@@ -691,6 +754,14 @@ export default {
     this.$once('hook:beforeDestroy', () => {
       clearInterval(timer)
     })
+
+    this.timers = setInterval(() => {
+      let obj = {
+        cmd: "queue/join",
+        data: {type:3,page:0,size:0},
+      };
+      this.websocketSend(obj)
+    }, 1000*50);
   },
   computed: {
     steps: function() {
@@ -804,6 +875,16 @@ export default {
       // return schedules
     }
   },
+  beforeDestroy(){
+    clearInterval(this.timers);　　// 清除定时器
+    this.timers = null
+
+    let unObj = {
+      cmd: "queue/unjoin",
+      data: {type:3},
+    };
+    this.websocketSend(unObj)
+  },
   methods: {
     adviceFunc() {
       this.getScheduleDetail()
@@ -872,6 +953,10 @@ export default {
     getScheduleDetail: function() {
       this.loading = true
       var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+      if(this.$route.query.showView == true){
+        this.loading = false
+        return
+      }
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
@@ -1562,6 +1647,184 @@ export default {
     refresh(){
       console.log('1111111')
       this.requestDialysisSchedules()
+    },
+    websocketSend(data) {
+      try {
+        this.websocket.send(JSON.stringify(data))
+          
+      } catch (error) {
+        this.showError = true;
+        this.showIndex = 4;
+        this.errorInfo = "网络异常，请稍后退出重试！";
+      }
+    },
+    websocketMess() {
+      console.log('执行',this.websocket)
+      this.websocket.onmessage = e => {
+        let res = JSON.parse(e.data);
+        // let res = re.data;
+        console.log('res3333333333',res)
+        if(res.channel == 'queue/join'){
+          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')
+            }
+          }
+          this.queueConfig = res.data.queueConfig
+          this.fisrtQueueInfo = res.data.fisrtQueueInfo
+          let arr = res.data.patientQueueList.data
+          let waitingCalledArr = []
+          let calledArr = []
+          arr.map(item => {
+              if(item.status == 1){
+                  // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                  waitingCalledArr.push(item)
+              }else if(item.status == 2){
+                  // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                  calledArr.push(item)
+              }
+          })
+          console.log('waitingCalledArr待叫号',waitingCalledArr)
+          console.log('waitingCalledArr以较好',calledArr)
+          this.waitingCalled = waitingCalledArr
+          this.called = calledArr
+        }else if(res.channel == 'allQueueList'){
+          let arr = res.data.queue_list.data
+          let waitingCalledArr = []
+          let calledArr = []
+          arr.map(item => {
+              if(item.status == 1){
+                // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                waitingCalledArr.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.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
+        }
+      }
+    },
+    call(){
+      // 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/callpatient?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id).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'
+          });
+          this.curPatient = res.data.data.patientInfo
+          let arr = []
+          let newArr = []
+          this.zone_schedules.map(item => {
+            newArr.push(...item.schedules)
+          })
+          newArr.map(item => {
+            arr.push(item.patient_id)
+          })
+          if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
+            
+            this.showView = false
+            this.$router.push({
+              path: '/dialysis/details',
+              query: {
+                patient_id: parseInt(res.data.data.patientInfo.patient_id),
+                date: this.$route.query.date,
+                patient_name: res.data.data.patientInfo.patient_name,
+                mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
+                curPatientTime:res.data.data.patientInfo.create_time,
+                showView:false
+              }
+            })
+            
+          }else {
+            
+            this.showView = true
+            this.$router.push({
+              path: '/dialysis/details',
+              query: {
+                patient_id: parseInt(res.data.data.patientInfo.patient_id),
+                date: this.$route.query.date,
+                patient_name: res.data.data.patientInfo.patient_name,
+                mode_id:this.$route.query.mode_id,
+                curPatientTime:res.data.data.patientInfo.create_time,
+                showView:true
+              }
+            })
+          }
+        }
+      })
+    },
+    next(){
+      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 => {
+        console.log(res)
+        if(res.data.data.patientInfo == null){
+          this.$message.error('已经是最后一位了');
+          return
+        }
+        if(res.data.code == 200){
+          this.$message({
+            message: res.data.msg,
+            type: 'success'
+          });
+          this.curPatient = res.data.data.patientInfo
+          let arr = []
+          let newArr = []
+          this.zone_schedules.map(item => {
+            newArr.push(...item.schedules)
+          })
+          newArr.map(item => {
+            arr.push(item.patient_id)
+          })
+          if(arr.indexOf(parseInt(res.data.data.patientInfo.patient_id)) > -1){
+            this.showView = false
+            this.$router.push({
+              path: '/dialysis/details',
+              query: {
+                patient_id: parseInt(res.data.data.patientInfo.patient_id),
+                date: this.$route.query.date,
+                patient_name: res.data.data.patientInfo.patient_name,
+                mode_id:newArr[arr.indexOf(parseInt(res.data.data.patientInfo.patient_id))].mode_id,
+                curPatientTime:res.data.data.patientInfo.create_time,
+                showView:false
+              }
+            })
+          }else {
+            this.showView = true
+            this.$router.push({
+              path: '/dialysis/details',
+              query: {
+                patient_id: parseInt(res.data.data.patientInfo.patient_id),
+                date: this.$route.query.date,
+                patient_name: res.data.data.patientInfo.patient_name,
+                mode_id:this.$route.query.mode_id,
+                curPatientTime:res.data.data.patientInfo.create_time,
+                showView:true
+              }
+            })
+          }
+        }
+      })
+    },
+    getDates(time){
+      return moment(time * 1000).format('HH:mm:ss')
     }
   }
 }

src/xt_pages/dialysis/schedualPatient.vue

@@ -39,6 +39,13 @@
           </li>
         </ul>
       </div>
+      <!-- <label class="title"><span class="name">叫号状态</span> : </label>
+      <div class="time ">
+        <ul class="">
+          <li v-for="option in call_state" :key="option.value" @click="handleCallChange(option.value)" :class="callVal == option.value ? 'active' : ''" >{{option.label}}
+          </li>
+        </ul>
+      </div> -->
     </div>
     <div class="cell clearfix">
       <label class="title"><span class="name">治疗状态</span> : </label>
@@ -72,15 +79,24 @@
       <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
     </div>
-
-    <div class="PatientArea">
-      <div v-for="zone_schedule in allPatient" :key="zone_schedule.zone_id" class="list clearfix">
-        <!-- <h3 style="width:40px;" class="title">{{zone_schedule.zone_name}}</h3> -->
-        <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
-        <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' style="flex:1"></patient-box>
+    <div style="display:flex;justify-content: space-between;">
+      <div :class="queueConfig.txglsyxs != 1 ? 'PatientArea' : 'PatientArea smallWidth'">
+        <div v-for="zone_schedule in allPatient" :key="zone_schedule.zone_id" class="list clearfix">
+          <!-- <h3 style="width:40px;" class="title">{{zone_schedule.zone_name}}</h3> -->
+          <div v-if="zone_schedule.schedules.length > 0 && patientStateVal != 1" style="font-size:16px;font-weight: bold;color: #34495e;margin-right:10px;line-height:30px;">{{zone_schedule.zone_name}}</div>
+          <patient-box :schedules="zone_schedule.schedules" :patientStateVal='patientStateVal' style="flex:1"></patient-box>
+        </div>
+        <div class="NoData" v-show="filtedSchedules.length == 0">
+          <img src="@/assets/img/data.jpg" alt="">
+        </div>
       </div>
-      <div class="NoData" v-show="filtedSchedules.length == 0">
-        <img src="@/assets/img/data.jpg" alt="">
+      <div class="nowCalling" v-if="queueConfig.txglsyxs == 1">
+        <p class="nowCallingTitle">当前叫号</p>
+        <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
+        <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</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>
+        <!-- <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 : '')">下一位</el-button>
       </div>
     </div>
   </div>
@@ -88,6 +104,8 @@
 </template>
 
 <script>
+const moment = require('moment')
+import axios from 'axios'
   import PatientBox from './PatientBox'
 import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
@@ -166,10 +184,26 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           {value: 3,label: '待医嘱核对'},
         ],
         treatStateVal: 0,
-        allPatient:[]
+        allPatient:[],
+
+        //叫号
+        waitingCalled:[],
+        called:[],
+        fisrtQueueInfo:{},
+        call_state:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '待叫号'},
+          {value: 2,label: '已叫号'},
+        ],
+        callVal: 0,
+        timers:null,
+        queueConfig:{}
       }
     },
     computed: {
+      websocket() {
+        return this.$store.state.user.websocket;
+      },
       filtedSchedules: function() {
         var search_keyword = this.search_keyword
         if (search_keyword.length > 0) {
@@ -265,10 +299,44 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       if(selected_date.selected_date){
         this.selected_date = selected_date.selected_date
       }
+      this.initData = {
+        cmd: "queue/join",
+        data: {type:3,page:0,size:0},
+      };
+      this.websocketSend(this.initData)
+      
 
       this.getInitData()
 
-    }, mounted() {
+
+
+    },
+    beforeMount() {
+      if (this.websocket) {
+            if (this.websocket.readyState == 1) {
+                console.log('执行1')
+                this.websocketMess();
+            } else {
+                setTimeout(() => {
+                    console.log('执行2')
+                    this.websocketMess();
+                }, 1000);
+            }
+        } else {
+            setTimeout(() => {
+                if (this.websocket) {
+                    console.log('执行3')
+                    this.websocketMess();
+                } else {
+                    setTimeout(() => {
+                        console.log('执行4')
+                        this.websocketMess();
+                    }, 1000);
+                }
+            }, 1000);
+        }
+    },
+    mounted() {
       const timer = setInterval(() => {
         // this.getInitData();
         this.requestDialysisSchedules()
@@ -277,8 +345,140 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       this.$once('hook:beforeDestroy', () => {
         clearInterval(timer)
       })
+
+      this.timers = setInterval(() => {
+        let obj = {
+            cmd: "queue/join",
+            data: {type:3,page:0,size:0},
+        };
+        this.websocketSend(obj)
+      }, 1000*50);
+    },
+    beforeDestroy(){
+      clearInterval(this.timers);　　// 清除定时器
+      this.timers = null
+
+      let unObj = {
+          cmd: "queue/unjoin",
+          data: {type:3},
+      };
+      this.websocketSend(unObj)
     },
     methods: {
+      websocketSend(data) {
+        try {
+          this.websocket.send(JSON.stringify(data))
+            
+        } catch (error) {
+          this.showError = true;
+          this.showIndex = 4;
+          this.errorInfo = "网络异常，请稍后退出重试！";
+        }
+      },
+      websocketMess() {
+        console.log('执行',this.websocket)
+        this.websocket.onmessage = e => {
+          let res = JSON.parse(e.data);
+          // let res = re.data;
+          console.log('res3333333333',res)
+          if(res.channel == 'queue/join'){
+            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')
+              }
+            }
+            this.queueConfig = res.data.queueConfig
+            this.fisrtQueueInfo = res.data.fisrtQueueInfo
+            let arr = res.data.patientQueueList.data
+            let waitingCalledArr = []
+            let calledArr = []
+            arr.map(item => {
+                if(item.status == 1){
+                    // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                    waitingCalledArr.push(item)
+                }else if(item.status == 2){
+                    // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                    calledArr.push(item)
+                }
+            })
+            console.log('waitingCalledArr待叫号',waitingCalledArr)
+            console.log('waitingCalledArr以较好',calledArr)
+            this.waitingCalled = waitingCalledArr
+            this.called = calledArr
+          }else if(res.channel == 'allQueueList'){
+            let arr = res.data.queue_list.data
+            let waitingCalledArr = []
+            let calledArr = []
+            arr.map(item => {
+                if(item.status == 1){
+                  // item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                  waitingCalledArr.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.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
+          }
+        }
+      },
+      call(patient_id){
+        if(patient_id == undefined || patient_id == ""){
+          this.$message.error('已经是最后一位了');
+          return
+        }
+        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/callpatient?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+            console.log(res)
+            // let patientArr = res.data.queue_list.data
+            // this.patientArr = patientArr
+            // this.$emit('child-event',this.patientArr)
+            if(res.data.code == 200){
+                this.$message({
+                    message: res.data.msg,
+                    type: 'success'
+                });
+            }
+        })
+      },
+      next(patient_id){
+          if(patient_id == undefined || patient_id == ""){
+            this.$message.error('已经是最后一位了');
+            return
+          }
+          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 => {
+              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'
+                  });
+              }
+              
+          })
+      },
+      handleCallChange: function(index) {
+        this.callVal = index
+        // this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
+        this.search_keyword = this.search_input = ''
+        this.getData()
+      },
       // handletimeType: function(index) {
       //   this.schedule_type_selected = index
       //   this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
@@ -416,6 +616,11 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.getData()
       },
       getData(){
+        let newobj = {
+          cmd: "queue/join",
+          data: {type:3,page:0,size:0},
+        };
+        this.websocketSend(newobj)
 
         let patientArr = []
         patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
@@ -590,6 +795,52 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         }else{
           this.allPatient = arr4
         }
+        // let arr5 = JSON.parse(JSON.stringify(this.allPatient))
+
+        
+        // if(this.callVal == 1){
+        //   let arr = []
+        //   arr = JSON.parse(JSON.stringify(arr5))
+        //   for (let i = 0; i < arr.length; i++) {
+        //     for (let j = 0; j < arr[i].schedules.length; j++) {
+        //       // console.log(this.waitingCalled)
+        //       let a = []
+        //       this.waitingCalled.map(item => {
+        //         a.push(parseInt(item.patient_id))
+        //       })
+        //       console.log(6666666666,a)
+        //       console.log(2222,arr[i].schedules[j].patient_id)
+        //       if (a.indexOf(arr[i].schedules[j].patient_id) == -1) {
+        //         // 删除元素后改变i的值
+        //         console.log('下标值',a.indexOf(arr[i].schedules[j].patient_id))
+        //         arr[i].schedules.splice(j--, 1);
+        //       }
+        //     }
+        //   }
+        //   console.log('arr111111111111',arr)
+        // }else if(this.callVal == 2) {
+        //   let arr = []
+        //   arr = JSON.parse(JSON.stringify(arr5))
+        //   for (let i = 0; i < arr.length; i++) {
+        //     for (let j = 0; j < arr[i].schedules.length; j++) {
+        //       // console.log(this.waitingCalled)
+        //       let a = []
+        //       this.called.map(item => {
+        //         a.push(parseInt(item.patient_id))
+        //       })
+        //       console.log(6666666666,a)
+        //       console.log(2222,arr[i].schedules[j].patient_id)
+        //       if (a.indexOf(arr[i].schedules[j].patient_id) == -1) {
+        //         // 删除元素后改变i的值
+        //         console.log('下标值',a.indexOf(arr[i].schedules[j].patient_id))
+        //         arr[i].schedules.splice(j--, 1);
+        //       }
+        //     }
+        //   }
+        //   console.log('arr222222222',arr)
+        // }
+        
+        
       },
       compare(property){
         return function(a,b){
@@ -666,5 +917,31 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     }
   }
+  .smallWidth{
+    width:88%;
+  }
+  .nowCalling{
+    height: 313px;
+    border: 1px solid #e5e5ee;
+    // flex: 1;
+    width: 12%;
+    text-align: center;
+    .nowCallingTitle{
+        font-size: 20px;
+        font-weight: 600;
+        margin-top: 20px;
+        text-align: center;
+    }
+    .nowCallingName{
+        color: #338AFB;
+        font-size: 18px;
+        margin-top: 10px;
+        font-weight: 600;
+    }
+    .nowCallingTime{
+        font-size: 16px;
+        margin-top: 30px;
+    }
+}
 </style>
 

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -265,6 +265,24 @@
                          
                       </div>
                     </td>
+                    <td width="50">方向:</td>
+                    <td width="130">
+                      <div>
+                        <label-box :isChecked="predialysis.puncture_way.indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.puncture_way.indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
+                    <td width="50">导管:</td>
+                    <td width="130">
+                      <div>
+                        <label-box :isChecked="predialysis.catheter.indexOf('通畅') > -1 ? true : false" showValue="通畅"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.catheter.indexOf('对调') > -1 ? true : false" showValue="对调"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
 
                     <td></td>
                   </tr>
@@ -459,7 +477,7 @@
                     </td>
                     <td width="35">min</td>
                     <td width="20"></td>
-                    <td width="100">实际治疗时间:</td>
+                    <td width="100">机面治疗时间:</td>
                     <td width="40">
                       <div class="under-line">
                         &nbsp;{{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}
@@ -740,10 +758,13 @@
             <td width="80" style="height:20px;line-height:20px">血压<br />mmHg</td>
             <td width="40" style="height:20px;line-height:20px">脉搏<br />次/分</td>
             <td width="40" style="height:20px;line-height:20px">呼吸<br />次/分</td>
+            <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
             <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
             <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
             <td width="60" style="height:20px;line-height:20px">电导度<br />mS/cm</td>
             <td width="60" style="height:20px;line-height:20px">血流量<br />ml/分</td>
+            <td width="40" style="height:20px;line-height:20px">液温<br />℃</td>
+            <td width="60" style="height:20px;line-height:20px">钠浓度<br />mmol/L</td>
             <td width="">特殊记录</td>
           </tr>
 
@@ -758,10 +779,13 @@
             </td>
             <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : '' }}</td>
             <td>&nbsp;{{ monitor.breathing_rate ? monitor.breathing_rate : '' }}</td>
+            <td>&nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
+            <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
+            <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td style="text-align:left;padding-left:10px;">
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>
@@ -807,12 +831,10 @@
                       <td width="160">
                         <label-box :isChecked="afterdialysis.sealing_fluid_dispose.indexOf('常规（肝素/NS）1:1')>-1?true:false" showValue="常规（肝素/NS）1:1"></label-box>&nbsp;
                       </td>
-                      <td width="30"></td>
                       <td width="40">特殊:</td>
                       <td width="140">
                         <div class="under-line">&nbsp;<span v-if="afterdialysis.sealing_fluid_dispose.indexOf('特殊')>-1">{{ afterdialysis.sealing_fluid_special ? afterdialysis.sealing_fluid_special : '' }}</span></div>
                       </td>
-                      <td width="30"></td>
                       <td width="50">封管量:</td>
                       <td width="30">A端</td>
                       <td width="50">
@@ -824,6 +846,16 @@
                           <div class="under-line">&nbsp;{{ afterdialysis.cvc_v ? afterdialysis.cvc_v : '' }}</div>
                       </td>
                       <td width="20">ml</td>
+                      <td width="40">打折:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.catheter.indexOf('打折-无')>-1?true:false" showValue="无"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.catheter.indexOf('打折-有')>-1?true:false" showValue="有"></label-box>&nbsp;
+                      </td>
+                      <td width="40">吸壁:</td>
+                      <td width="90">
+                        <label-box :isChecked="afterdialysis.catheter.indexOf('吸壁-无')>-1?true:false" showValue="无"></label-box>&nbsp;
+                        <label-box :isChecked="afterdialysis.catheter.indexOf('吸壁-有')>-1?true:false" showValue="有"></label-box>&nbsp;
+                      </td>
                       <td></td>
                   </tr>
                 </tbody>
@@ -856,7 +888,28 @@
                   </tr>
                 </tbody>
               </table>
-
+              <table class="table-box">
+                <tbody>
+                  <tr>
+                    <td width="55">并发症:</td>
+                    <td width="400">
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('无') > -1 ? true : false" showValue="无"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('头晕') > -1 ? true : false" showValue="头晕"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('头痛') > -1 ? true : false" showValue="头痛"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('抽搐') > -1 ? true : false" showValue="抽搐"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('低血压') > -1 ? true : false" showValue="低血压"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('出血') > -1 ? true : false" showValue="出血"></label-box>&nbsp;
+                      <label-box :isChecked="afterdialysis.complication&&afterdialysis.complication.indexOf('呕吐') > -1 ? true : false" showValue="呕吐"></label-box>
+                    </td>
+                    <td width='40'>其他</td>
+                    <td>
+                      <div class="under-line" style="text-align:left;">
+                        &nbsp;{{ afterdialysis.complication ? getComplication(afterdialysis.complication) : '' }}
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
 
               <table class="table-box" style="margin-bottom:130px;">
                 <tbody>
@@ -1139,6 +1192,25 @@ export default {
     }
   },
   methods: {
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['无','头晕','头痛','抽搐','低血压','出血','呕吐'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['无','头晕','头痛','抽搐','低血压','出血','呕吐'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','头晕','头痛','抽搐','低血压','出血','呕吐'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     getPunctureWay: function(val) {
       let puncture_method_name = '/'
       const puncture_method = getDataConfig("hemodialysis", "puncture_method")

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -417,7 +417,10 @@
               <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
               <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td>
               <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:''}}</td>
-              <td> <span v-if="monitor.symptom || monitor.dispose || monitor.result"> {{ monitor.symptom + "，" + monitor.dispose + "，" + monitor.result }} </span>
+              <td>
+                 <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
+                 <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>
+                 <span v-if="monitor.result"> {{ "  " + monitor.result }} </span>
               </td>
             </tr>
         </tbody>

src/xt_pages/sign/calling.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="app-container">
             <el-tabs v-model="activeName">
-                <el-tab-pane label="透前叫号" name="first">
+                <el-tab-pane label="接诊叫号" name="first">
                     <before-dialysis-calling v-if="activeName == 'first'"></before-dialysis-calling>
                 </el-tab-pane>
                 <el-tab-pane label="上机叫号" name="second">
@@ -13,10 +13,10 @@
                 </el-tab-pane>
                 <!-- <el-tab-pane label="诊台配置" name="third">
                     <treatment-configure></treatment-configure>
-                </el-tab-pane>
+                </el-tab-pane> -->
                 <el-tab-pane label="叫号配置" name="fourth">
                     <calling-configure></calling-configure>
-                </el-tab-pane> -->
+                </el-tab-pane>
             </el-tabs>
         </div>
     </div>

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -16,11 +16,11 @@
             </div>
             <div class="nowCalling" v-if="patientStateVal == 0">
                 <p class="nowCallingTitle">当前叫号</p>
-                <p class="nowCallingName">{{ fisrtQueueInfo.patient_name }}</p>
-                <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo.create_time }}</p>
-                <el-button type="primary" @click="call(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.patient_id)">下一位</el-button>
+                <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
+                <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</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>
+                <!-- <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 : '')">下一位</el-button>
             </div>
         </div>
     </div>
@@ -46,7 +46,9 @@ export default {
             patientStateVal: 0,
             waitingCalled:[],
             called:[],
-            fisrtQueueInfo:{}
+            fisrtQueueInfo:{},
+            timer:null,
+
         }
     },
     computed: {
@@ -62,8 +64,44 @@ export default {
         this.websocketSend(this.initData)
     },
     beforeMount() {
-        console.log('beforeMountbeforeMount')
-        this.websocketMess();
+        if (this.websocket) {
+            if (this.websocket.readyState == 1) {
+                this.websocketMess();
+            } else {
+                setTimeout(() => {
+                    this.websocketMess();
+                }, 1000);
+            }
+        } else {
+            setTimeout(() => {
+                if (this.websocket.readyState == 1) {
+                    this.websocketMess();
+                } else {
+                    setTimeout(() => {
+                        this.websocketMess();
+                    }, 1000);
+                }
+            }, 1000);
+        }
+    },
+    mounted(){
+        this.timer = setInterval(() => {
+            let obj = {
+                cmd: "queue/join",
+                data: {type:3,page:0,size:0},
+            };
+            this.websocketSend(obj)
+        }, 1000*50);
+    },
+    beforeDestroy(){
+        clearInterval(this.timer);　　// 清除定时器
+        this.timer = null
+
+        let unObj = {
+            cmd: "queue/unjoin",
+            data: {type:3},
+        };
+        this.websocketSend(unObj)
     },
     methods:{
         websocketSend(data) {
@@ -77,12 +115,18 @@ export default {
             }
         },
         websocketMess() {
+            console.log('执行',this.websocket)
             this.websocket.onmessage = e => {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res3333333333',res)
                 if(res.channel == 'queue/join'){
-                    res.data.fisrtQueueInfo.create_time = moment(res.data.fisrtQueueInfo.create_time * 1000).format('HH:mm')
+                    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')
+                        }
+                        
+                    }
                     this.fisrtQueueInfo = res.data.fisrtQueueInfo
                     let arr = res.data.patientQueueList.data
                     let waitingCalledArr = []
@@ -116,7 +160,7 @@ export default {
                     this.waitingCalled = waitingCalledArr
                     this.called = calledArr
                 }else if(res.channel == 'patientCallInfo'){
-                    res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
+                    res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
                     this.fisrtQueueInfo = res.data.patientInfo
                 }
             }
@@ -125,6 +169,10 @@ export default {
             this.patientStateVal = index
         },
         call(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
             let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
@@ -142,6 +190,10 @@ export default {
             })
         },
         next(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
             let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
@@ -150,6 +202,10 @@ export default {
                 // 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,

src/xt_pages/sign/components/called.vue

@@ -16,7 +16,7 @@
                     </p>
                 </div>
             </div>
-            <div class="calledOneRight" v-if="index == 1" @click="call(item.patient_id)">
+            <div class="calledOneRight" v-if="index == 1" @click="call(item.patient_id)" style="display: none;">
                 <img src="../../../assets/img/volume.png" alt="">
             </div>
         </div>

src/xt_pages/sign/components/callingConfigure.vue

@@ -3,126 +3,86 @@
         <div class="cell clearfix">
             就诊状态显示屏幕切换屏幕时长配置(秒) : 
             <div class="time ">
-                <el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number>
+                <el-input-number v-model="form.qhsj" :min="1"></el-input-number>
             </div>
         </div>
         <div style="display:flex;">
             <div class="configureBox">
                 <div class="configureBoxTitle">接诊叫号</div>
                 <div class="configureBoxMain">
-                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
-                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="form.jzdcbbcs" :min="1"></el-input-number></div>
                     <div style="margin-bottom:10px;">
-                        <p style="width:50px;display: inline-block;">请</p>
-                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
-                            <el-option
-                            v-for="item in typeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
+                        语音播报声音：
+                        <el-radio-group v-model="form.jzbbsy">
+                            <el-radio :label="1">男生</el-radio>
+                            <el-radio :label="2">女生</el-radio>
+                        </el-radio-group>
                     </div>
-                    <div style="margin-bottom:10px;">
-                        <p style="width:50px;display: inline-block;">到</p>
-                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
-                            <el-option
-                            v-for="item in stateOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
-                    <div style="margin-bottom:10px;" v-if="state == 2">
-                        <p style="width:50px;display: inline-block;"></p>
-                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    <div>
+                        隐藏接诊叫号区域：
+                        <el-radio-group v-model="form.jzjhyc">
+                            <el-radio :label="0">是</el-radio>
+                            <el-radio :label="1">否</el-radio>
+                        </el-radio-group>
                     </div>
-                    <div>就诊</div>
                 </div>
                 
             </div>
             <div class="configureBox" style="border-left:none;">
                 <div class="configureBoxTitle">上机叫号</div>
                 <div class="configureBoxMain">
-                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="num" @change="handleChange" :min="1"></el-input-number></div>
-                    <div style="margin-bottom:10px;">叫号语音内容设置：</div>
-                    <div style="margin-bottom:10px;">
-                        <p style="width:50px;display: inline-block;">请</p>
-                        <el-select style="width:140px;" v-model="type" placeholder="请选择">
-                            <el-option
-                            v-for="item in typeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </div>
+                    <div style="margin-bottom:10px;">单次叫号语音播报次数：<el-input-number v-model="form.sjdcbbcs" :min="1"></el-input-number></div>
                     <div style="margin-bottom:10px;">
-                        <p style="width:50px;display: inline-block;">到</p>
-                        <el-select style="width:140px;" v-model="state" placeholder="请选择">
-                            <el-option
-                            v-for="item in stateOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                            </el-option>
-                        </el-select>
+                        语音播报声音：
+                        <el-radio-group v-model="form.sjbbsy">
+                            <el-radio :label="1">男生</el-radio>
+                            <el-radio :label="2">女生</el-radio>
+                        </el-radio-group>
                     </div>
-                    <div style="margin-bottom:10px;" v-if="state == 2">
-                        <p style="width:50px;display: inline-block;"></p>
-                        <el-input style="width:200px;" v-model="input" placeholder="请输入内容"></el-input>
+                    <div style="width:480px;">
+                        隐藏上机叫号区域：
+                        <el-radio-group v-model="form.sjjhyc">
+                            <el-radio :label="0">是</el-radio>
+                            <el-radio :label="1">否</el-radio>
+                        </el-radio-group>
                     </div>
-                    <div>上机</div>
                 </div>
                 
             </div>
         </div>
         <div style="display:flex;margin-top:10px;">
             <div style="width:480px;">
-                语音播报声音：
-                <el-radio-group v-model="radio">
-                    <el-radio :label="1">男生</el-radio>
-                    <el-radio :label="2">女生</el-radio>
-                </el-radio-group>
-            </div>
-            <div style="width:480px;">
-                隐藏接诊叫号区域：
-                <el-radio-group v-model="radio">
-                    <el-radio :label="1">是</el-radio>
-                    <el-radio :label="2">否</el-radio>
-                </el-radio-group>
-            </div>
-        </div>
-        <div style="display:flex;margin-top:10px;">
-            <div style="width:480px;">
-                隐藏上机叫号区域：
-                <el-radio-group v-model="radio">
-                    <el-radio :label="1">是</el-radio>
-                    <el-radio :label="2">否</el-radio>
+                是否在透析管理页面显示排队叫号：
+                <el-radio-group v-model="form.txglsyxs">
+                    <el-radio :label="1">显示</el-radio>
+                    <el-radio :label="0">不显示</el-radio>
                 </el-radio-group>
             </div>
-            <div style="width:480px;">
-                是否在透析管理页面显示排队叫号：
-                <el-radio-group v-model="radio">
+            <div style="width:480px;margin-bottom:10px;">
+                是否在透析记录详情页面显示排队叫号：
+                <el-radio-group v-model="form.txxqyxs">
                     <el-radio :label="1">显示</el-radio>
-                    <el-radio :label="2">不显示</el-radio>
+                    <el-radio :label="0">不显示</el-radio>
                 </el-radio-group>
             </div>
+            
         </div>
         <div style="display:flex;margin-top:10px;">
             <div style="width:480px;">
-                是否在透析记录详情页面显示排队叫号：
-                <el-radio-group v-model="radio">
-                    <el-radio :label="1">显示</el-radio>
-                    <el-radio :label="2">不显示</el-radio>
-                </el-radio-group>
+            </div>
+            <div style="width:480px;margin-bottom:10px;">
+                <el-button @click="changeQueue" type="primary" style="float:right;">修改</el-button>
             </div>
         </div>
+        
+        
     </div>
 </template>
 
 <script>
+import {
+  getQueue,changeQueue
+} from '@/api/call'
 export default {
     data(){
         return{
@@ -132,7 +92,69 @@ export default {
             stateOptions:[{ value: 1, label: '智能匹配诊台'},{ value: 2, label: '自定义内容'}],
             state: 1,
             input:'',
-            radio:1
+            radio:1,
+
+
+            form:{
+                qhsj:10,
+                jzdcbbcs:3,
+                jzbbsy:1,
+                jzjhyc:0,
+                sjdcbbcs:3,
+                sjbbsy:1,
+                sjjhyc:0,
+                txxqyxs:0,
+                txglsyxs:0
+
+
+
+
+            }
+        }
+    },
+    created(){
+        this.getQueue()
+    },
+    methods:{
+        getQueue(){
+            getQueue().then(res => {
+                console.log('peizhi',res)
+                let queue_config = res.data.data.queue_config
+
+                this.form.qhsj = queue_config.qhsj
+                this.form.jzdcbbcs = queue_config.jzdcbbcs
+                this.form.jzbbsy = queue_config.jzbbsy
+                this.form.jzjhyc = queue_config.jzjhyc
+                this.form.sjdcbbcs = queue_config.sjdcbbcs
+                this.form.sjbbsy = queue_config.sjbbsy
+                this.form.sjjhyc = queue_config.sjjhyc
+                this.form.txxqyxs = queue_config.txxqyxs
+                this.form.txglsyxs = queue_config.txglsyxs
+            })
+        },
+        changeQueue(){
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
+            let params = {
+                org_id:org_id,
+                jzbbsy:this.form.jzbbsy,
+                jzdcbbcs:this.form.jzdcbbcs,
+                jzjhyc: this.form.jzjhyc,
+                qhsj: this.form.qhsj,
+                sjbbsy: this.form.sjbbsy,
+                sjdcbbcs:this.form.sjdcbbcs,
+                sjjhyc: this.form.sjjhyc,
+                txxqyxs: this.form.txxqyxs,
+                txglsyxs: this.form.txglsyxs,
+
+            }
+            changeQueue(params).then(res => {
+                if(res.data.state == 1){
+                    this.$message({
+                        message: "修改成功",
+                        type: 'success'
+                    });
+                }
+            })
         }
     }
 }

src/xt_pages/sign/components/computerCalling.vue

@@ -16,10 +16,10 @@
             </div>
             <div class="nowCalling" v-if="patientStateVal == 0">
                 <p class="nowCallingTitle">当前叫号</p>
-                <p class="nowCallingName">{{ fisrtQueueInfo.patient_name }}</p>
-                <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo.create_time }}</p>
-                <p><el-button type="primary" @click="call(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.patient_id)">下一位</el-button>
+                <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
+                <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>
             </div>
         </div>
     </div>
@@ -42,7 +42,9 @@ export default {
             patientStateVal: 0,
             waitingCalled:[],
             called:[],
-            fisrtQueueInfo:{}
+            fisrtQueueInfo:{},
+            timer:null,
+
         }
     },
     computed: {
@@ -60,6 +62,24 @@ export default {
     beforeMount() {
         this.websocketMess();
     },
+    mounted(){
+        this.timer = setInterval(() => {
+            let obj = {
+                cmd: "queue/join",
+                data: {type:4,page:0,size:0},
+            };
+            this.websocketSend(obj)
+        }, 1000*50);
+    },
+    beforeDestroy(){
+        clearInterval(this.timer);　　// 清除定时器
+        this.timer = null
+        let unObj = {
+            cmd: "queue/unjoin",
+            data: {type:4},
+        };
+        this.websocketSend(unObj)
+    },
     methods:{
         websocketSend(data) {
             try {
@@ -77,7 +97,11 @@ export default {
                 // let res = re.data;
                 console.log('res',res)
                 if(res.channel == 'queue/join'){
-                    res.data.fisrtQueueInfo.create_time = moment(res.data.fisrtQueueInfo.create_time * 1000).format('HH:mm')
+                    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')
+                        }
+                    }
                     this.fisrtQueueInfo = res.data.fisrtQueueInfo
                     let arr = res.data.patientQueueList.data
                     let waitingCalledArr = []
@@ -120,10 +144,14 @@ export default {
             this.patientStateVal = index
         },
         call(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
             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/callpatient?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+            axios.get('/api/index/upcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
                 console.log(res)
                 // let patientArr = res.data.queue_list.data
                 // this.patientArr = patientArr
@@ -137,6 +165,10 @@ export default {
             })
         },
         next(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
             let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
@@ -145,6 +177,10 @@ export default {
                 // 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,

src/xt_pages/sign/components/waitingCalled.vue

@@ -8,7 +8,7 @@
                     <p>签到时间：{{ item.create_time }}</p>
                 </div>
             </div>
-            <div class="waitingOneRight" @click="call(item.patient_id)">
+            <div class="waitingOneRight" @click="call(item.patient_id)" style="display: none;">
                 <img src="../../../assets/img/volume.png" alt="">
             </div>
         </div>

src/xt_pages/sign/lineUp.vue

@@ -64,13 +64,13 @@
                                     <span v-if="item.status == 4">透析中</span>
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
-                                <p style="width:14%">{{ item.start_time ? item.start_time : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? item.end_time : '--' }}</p>
+                                <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div> 
                     <div class="callingBox">
-                        <div class="callingBoxLeft">
+                        <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                             <div style="flex: 1;">
                                 <div class="callingTop" style="margin-bottom:10px;">
@@ -89,7 +89,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="callingBoxLeft">
+                        <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
                             <div style="flex: 1;">
                                 <div class="callingTop" style="margin-bottom:10px;">
@@ -143,13 +143,13 @@
                                     <span v-if="item.status == 4">透析中</span>
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
-                                <p style="width:14%">{{ item.start_time ? item.start_time : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? item.end_time : '--' }}</p>
+                                <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div> 
                     <div class="callingBox">
-                        <div class="callingBoxLeft">
+                        <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                             <div style="flex: 1;">
                                 <div class="callingTop" style="margin-bottom:10px;">
@@ -168,7 +168,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="callingBoxLeft">
+                        <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
                             <div style="flex: 1;">
                                 <div class="callingTop" style="margin-bottom:10px;">
@@ -215,6 +215,9 @@ export default {
             count:0,
             page:1,
             timer:null,
+            queueConfig:{
+                qhsj:10,
+            },
             receivingPatient:[],
             waitDoctorList:[],
             upPatientList:[],
@@ -226,7 +229,8 @@ export default {
             voiceTime:null,
 
             voice:true,
-            a:1
+            a:1,
+            
         }
     },
     computed: {
@@ -247,9 +251,33 @@ export default {
         this.websocketSend(newobj)
     },
     beforeMount() {
-        this.websocketMess();
+        if (this.websocket) {
+            if (this.websocket.readyState == 1) {
+                console.log('执行1')
+                this.websocketMess();
+            } else {
+                setTimeout(() => {
+                    console.log('执行2')
+                    this.websocketMess();
+                }, 1000);
+            }
+        } else {
+            setTimeout(() => {
+                if (this.websocket.readyState == 1) {
+                    console.log('执行3')
+                    this.websocketMess();
+                } else {
+                    setTimeout(() => {
+                        console.log('执行4')
+                        this.websocketMess();
+                    }, 1000);
+                }
+            }, 1000);
+        }
+        // this.websocketMess();
     },
     mounted(){
+        
         this.timer = setInterval(() => {
             if(this.page < Math.ceil(this.count / 6)){
                 console.log('执行',Math.ceil(this.count / 6),this.page)
@@ -259,16 +287,24 @@ export default {
                     data: {page:this.page,size:6}
                 };
                 this.websocketSend(obj)
+                setTimeout(() => {
+                    this.websocketMess();
+                }, 1000);
             }else{
                 console.log('执行22223333')
                 this.page = 1
-                let obj = {
+                let a = {
                     cmd: "queue/queuelist",
                     data: {page:this.page,size:6}
                 };
-                this.websocketSend(obj)
+                this.websocketSend(a)
+                setTimeout(() => {
+                    this.websocketMess();
+                }, 1000);
+                
             }
-        }, 5000);
+            console.log('切换时间',this.queueConfig)
+        }, 1000 * parseInt(this.queueConfig.qhsj));
         this.timerID = setInterval(() => {
             this.updateTime()
         }, 1000);
@@ -278,13 +314,17 @@ export default {
         this.timer = null
         clearInterval(this.timerID);
         this.timerID = null;　　// 清除定时器
+        let unObj = {
+            cmd:'queue/unjoin',
+            data:{type:2}
+        }
+        this.websocketSend(unObj)
         // this.timer = null;
         // let obj = {
         //     cmd: "queue/join",
         //     data: {type:1},
         // };
         // this.websocketSend(obj)
-        console.log('hhhhhhhhhhhhhhhhhhhhhh',this.timerID)
     },
     methods:{
         websocketSend(data) {
@@ -298,33 +338,35 @@ export default {
             }
         },
         websocketMess() {
+            console.log('测试')
             this.websocket.onmessage = e => {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
                 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')
-                    })
+                    // 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
-                    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(item.start_time != null){
-                            item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
-                        }
-                        if(item.status == 4){
-                            item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
-                        }
-                    })
+                    // 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(item.start_time != null){
+                    //         item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
+                    //     }
+                    //     if(item.status == 5 || item.end_time){
+                    //         item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
+                    //     }
+                    // })
                 }else if(res.channel == 'patientCallInfo'){
                     console.log(999999999999,res.data)
                     
@@ -336,7 +378,13 @@ export default {
                         // let time1 = null
                         this.voicePrompt(res.data.callVolUrl)
                         this.voiceTime = setInterval(() => {
-                            if(this.voiceNum < 3){
+                            let num = null
+                            if(res.data.patientInfo.status == 2){
+                                num = parseInt(this.queueConfig.jzdcbbcs)
+                            }else if(res.data.patientInfo.status == 3){
+                                num = parseInt(this.queueConfig.sjdcbbcs)
+                            }
+                            if(this.voiceNum < num){
                                 this.voiceNum++
                                 this.voicePrompt(res.data.callVolUrl)
                             }else{
@@ -352,10 +400,10 @@ export default {
                             }
                         },6000)
                     }else {
-                        this.$message({
-                            message: '警告哦，这是一条警告消息',
-                            type: 'warning'
-                        });
+                        // this.$message({
+                        //     message: '警告哦，这是一条警告消息',
+                        //     type: 'warning'
+                        // });
                     }
                 }else if(res.channel == 'updateCallList'){
                     this.receivingPatient = res.data.queue_list
@@ -379,7 +427,6 @@ export default {
         updateTime() {
             var cd = new Date();
             var week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-            console.log(1111111)
             this.time = this.zeroPadding(cd.getHours(), 2) + ':' + this.zeroPadding(cd.getMinutes(), 2) + ':' + this.zeroPadding(cd.getSeconds(), 2) + ' （' + week[cd.getDay()] + "）";
             this.newdate = this.zeroPadding(cd.getFullYear(), 4) + '-' + this.zeroPadding(cd.getMonth() + 1, 2) + '-' + this.zeroPadding(cd.getDate(), 2);
         },
@@ -418,6 +465,9 @@ export default {
                 this.showSetting = false;
             }
         },
+        getDates(time){
+            return moment(time * 1000).format('HH:mm:ss')
+        }
     }
 }
 </script>
@@ -493,23 +543,29 @@ export default {
             height: 100%;
             display: flex;
             justify-content: space-between;
-            .callingTitle{
-                width: 130px;
-                height: 100%;
-                border-radius: 15px 0 0 15px;
-                font-size: 66px;
-                font-weight:600;
-                text-align: center;
-                color: #fff;
-                background: #1A82BF;
-                display: flex;
-                align-items: center;
-                margin-right: 5px;
-            }
-            .newCallingTitle{
-                background: #1aa680;
-            }
-        } 
+        }
+        .callingBoxLeft1{
+            width: 99.5%;
+            height: 100%;
+            display: flex;
+            justify-content: space-between;
+        }
+        .callingTitle{
+            width: 130px;
+            height: 100%;
+            border-radius: 15px 0 0 15px;
+            font-size: 66px;
+            font-weight:600;
+            text-align: center;
+            color: #fff;
+            background: #1A82BF;
+            display: flex;
+            align-items: center;
+            margin-right: 5px;
+        }
+        .newCallingTitle{
+            background: #1aa680;
+        }
         .callingTop{
             height: 210px;
             border-radius: 0 15px 0 0;

src/xt_pages/sign/signIn.vue

@@ -152,28 +152,7 @@ export default {
         this.websocketSend(this.initData)
     },
     beforeMount() {
-        // if (this.websocket) {
-        //     if (this.websocket.readyState == 1) {
-        //         this.websocketMess();
-        //     } else {
-        //         setTimeout(() => {
-        //             this.websocketMess();
-        //             }, 1000);
-        //         }
-        //     } else {
-        //     setTimeout(() => {
-        //         if (this.websocket.readyState == 1) {
-        //             this.websocketMess();
-        //         } else {
-        //             setTimeout(() => {
-        //                 this.websocketMess();
-        //             }, 1000);
-        //         }
-        //     }, 1000);
-        // }
-        // setTimeout(() => {s
-            this.websocketMess();
-        // }, 1000);
+        this.websocketMess();
     },
     mounted(){
         this.timer = setInterval(() => {
@@ -188,11 +167,11 @@ export default {
             }else{
                 console.log('执行2222')
                 this.page = 1
-                let obj = {
+                let newobj = {
                     cmd: "queue/queuelist",
                     data: {page:this.page,size:10}
                 };
-                this.websocketSend(obj)
+                this.websocketSend(newobj)
             }
         }, 5000);
         
@@ -206,7 +185,7 @@ export default {
         clearInterval(this.timerID);　　// 清除定时器
         this.timer = null;
         let obj = {
-            cmd: "queue/join",
+            cmd: "queue/unjoin",
             data: {type:1},
         };
         this.websocketSend(obj)