Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/recover/html/select-patient.html

@@ -154,11 +154,17 @@
						})
                	},
                	getPatientInfoByDoctor: function(label) {
                		if(!label && !this.keyword) {
							this.selectIndex = null
							this.isSearch = false
							this.isLabel = true
							return false
						}
			    		var vm = this,
			    			loadding = layer.load(0, {shade: false}),
			    			params = {
			    				doctor: doctorCode,
								patientInfo: this.keyword == "" ? null : this.keyword, // 居民身份证或者姓名
								patientInfo: this.keyword, // 居民身份证或者姓名
								disease: label ? label.label : "",
								page: vm.page,
								size: 50
@@ -171,10 +177,6 @@
									vm.isSearch = true
									vm.isLabel = false
								}
								if(!vm.keyword) {
									vm.isSearch = false
									vm.isLabel = true
								}
							} else {
								showErrorMessage(res.msg);
							}