1

src/xt_pages/dialysis/schedualPatient.vue

@@ -466,11 +466,18 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             return
           }
           let schedule_type = null
-          if(new Date().getHours() < 11){
+          if(this.schedule_type_selected == 0){
+            if(new Date().getHours() < 11){
+              schedule_type = 1
+            }else {
+              schedule_type = 2
+            }
+          }else if(this.schedule_type_selected == 1){
             schedule_type = 1
-          }else {
+          }else if(this.schedule_type_selected == 2){
             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"));

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -254,11 +254,17 @@ export default {
                 }
             })
         },
-        next(patient_id,schedule_type){
+        next(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 == 0){
+                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"));

src/xt_pages/sign/components/computerCalling.vue

@@ -20,7 +20,7 @@
                 <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 : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
             </div>
         </div>
     </div>
@@ -228,12 +228,18 @@ export default {
                 }
             })
         },
-        next(patient_id,schedule_type){
+        next(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 == 0){
+                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).then(res => {