Merge branch 'master' of huhongkun/PC-application into master

app/recover/html/new_recover.html

@@ -337,8 +337,8 @@
                		var vm = this;
                		loadding = layer.load(0, {shade: false});
                		params = {
//              			patient: this.pati.patient,
                			patient:"3b26a7905e034c36a5ba8e65bdc0dc7f",
                			patient: this.pati.patient,
//              			patient:"3b26a7905e034c36a5ba8e65bdc0dc7f",
							type: '2',
							page: 1,
							pageSize: 50,
@@ -368,10 +368,10 @@
                		vm.indexOrder = index
                		loadding = layer.load(0, {shade: false});
                		var sec_params = {
//              			patient: vm.pati.patient,
//							event:vm.diagnosisInfo[index].id || "",
							patient:"3b26a7905e034c36a5ba8e65bdc0dc7f",
							event:"26eec2df-caa9-4b7e-9993-0ad7ae8d0a15",
                			patient: vm.pati.patient,
							event:vm.diagnosisInfo[index].id || "",
//							patient:"3b26a7905e034c36a5ba8e65bdc0dc7f",
//							event:"26eec2df-caa9-4b7e-9993-0ad7ae8d0a15",
							catalog:'0213',
							serial:"1"
		                	}