1

src/xt_pages/dialysis/details/index.vue

@@ -1696,13 +1696,36 @@ export default {
         // 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')
+          let timeType = null
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
             }
           }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+          if(res.data.fisrtQueueInfo != null){
+              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 = []
@@ -1737,6 +1760,34 @@ export default {
         }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(res.channel == 'fisrtQueueInfo'){
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
+            }
+          }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.patientInfo
+          if(res.data.patientInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.patientInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.patientInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
         }
       }
     },

src/xt_pages/dialysis/schedualPatient.vue

@@ -388,10 +388,16 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             let timeType = null
-            if(new Date().getHours() < 11){
+            if(this.schedule_type_selected == 1){
               timeType = 1
-            }else if(new Date().getHours() >= 11){
+            }else if(this.schedule_type_selected == 2){
               timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
             }
             let fisrtQueueInfo = []
             this.newFisrtQueueInfo = res.data.fisrtQueueInfo
@@ -445,6 +451,34 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }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(res.channel == 'fisrtQueueInfo'){
+            if(this.schedule_type_selected == 1){
+              timeType = 1
+            }else if(this.schedule_type_selected == 2){
+              timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.patientInfo
+            if(res.data.patientInfo != null){
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.patientInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.patientInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
           }
         }
       },