Merge branch 'discuss-wjdc-all-0423' into release

src/views/report/reportSet.vue

@@ -103,7 +103,7 @@ export default {
 			}
 			if(index == 2){
 				this.$message({
-				  message: '姓名、doctorId不能重复！',
+				  message: 'doctorId已存在',
 				  type: 'warning'
 				});
 				return;
@@ -169,7 +169,7 @@ export default {
 			let index  = null,hash = [],r = /^[1-9]+\d*$/;
 			for(let i=0;i<d.length;i++){
 				
-				let parm = d[i].userName + String(d[i].doctorId)
+				let parm =  String(d[i].doctorId)
 				if(d[i].doctorId == '' || d[i].userName == '' || d[i].email == ''){
 					index = 1
 					break;