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

app/recover/html/new_recover.html

@@ -442,6 +442,7 @@
					editdiagnosis:function(){
						var  vm = this;
						vm.edit = !vm.edit;
						vm.nodata = false
						vm.subsidiaryInfo.data.department = $('#department').find('input').val()
						vm.subsidiaryInfo.data.attendingDoctor = $('#attendingDoctor').find('input').val()
						vm.subsidiaryInfo.data.admissionDiagnosis = $('#department').find('input').val()