Merge branch 'master' of http://223.93.170.82:10080/zhouna/preliminary into his/shaoyifu

# Conflicts:
#	src/components/Department.vue
#	src/components/Symptom.vue
#	src/utils/tools.js

src/components/Department.vue

@@ -55,8 +55,8 @@
         },
         created(){
             let query = this.$route.query;
-            let type = query.patientInfoType,name = query.patientName,value = query.patientInfo,code=query.hospitalCode,sonHospitalCode=query.sonHospitalCode,sonHospitalName=query.sonHospitalName,patientInfoNo=query.patientInfoNo;
-            if(value&&name&&type&&code&&patientInfoNo){//带信息直接跳转列表页面
+            let type = query.patientInfoType,name = query.patientName,value = query.patientInfo,code=query.hospitalCode,sonHospitalCode=query.sonHospitalCode,sonHospitalName=query.sonHospitalName,interId=query.interId;
+            if(value&&name&&type&&code){//带信息直接跳转列表页面
                 this.getSysConfig(code)
                 const param = {
                     patientInfo: value,
@@ -65,7 +65,7 @@
                     patientName:name,
                     sonHospitalCode: sonHospitalCode||'',
                     sonHospitalName: sonHospitalName||'',
-                    patientInfoNo: patientInfoNo
+                    interId: interId
                 };
                 this.signInStr(param);
             }else{