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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1954,36 +1954,11 @@
               this.doctorValue = info.doctor_id
               this.departmentValue = info.departments
             } else {
-              if (hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
-                this.doctorValue = hisPatientInfo.doctor
-                this.departmentValue = hisPatientInfo.department
-              } else {
-                if (admin_info.user_type == 2) {
-                  this.doctorValue = admin_info.admin_user_id
-                  if (admin_info.department_id == 0) {
-                    if (this.department.length > 0) {
-                      if (department && department.length > 0) {
-                        this.departmentValue = department[0].id
-
-                      } else {
-
-                        this.departmentValue = ''
+              this.doctorValue = this.doctors[0].id
+              this.departmentValue = this.department[0].id
 
-                      }
-                    } else {
-                      this.departmentValue = ''
-                    }
-                  } else {
-                    this.departmentValue = admin_info.department_id
-                  }
-                } else {
-                  this.doctorValue = doctors[0].admin_user_id
-                }
-                if (this.doctorValue == 0) {
-                  this.doctorValue = ''
-                }
-              }
             }
+
             if (info.register_type == 0) {
               for (let i = 0; i < this.register.length; i++) {
                 this.register_type = this.register[0].value
@@ -1993,7 +1968,6 @@
             }
             this.diagnose = []
 
-
             if(info.id == 0){
               if(last_info.diagnosis.length == 0){
                 this.diagnose = []
@@ -2011,7 +1985,6 @@
                   this.diagnose.push(parseInt(info.diagnosis.split(",")[i]))
 
                 }
-                // this.diagnose = info.diagnosis.split(",")
 
               }