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

app/recover/html/new_recover.html

@@ -356,8 +356,8 @@
                				}
                				vm.orderHospital(0)
                			}else{
//              				vm.diagnosisInfo = [{orgName:'无'}]
//              				vm.orderHospital(0)
                				vm.diagnosisInfo = [{orgName:'无'}]
                				vm.orderHospital(0)
                				showErrorMessage(res.msg);
                			}
                		})
@@ -797,6 +797,7 @@
                		this.pati = pati
                		this.getPatientInfo()
                		this.findTemplateList()
                		this.diagnosisQuery()
                	},
                	// 添加模板
                	addMuban: function(oId) {