Merge branch 'master' into lmm

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1316,5 +1316,6 @@
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 是否需要医护陪同检查模态框 -->
 <app-dialog-delete [delModal]="accompanyModal" (hideDelModalEvent)="hideAccompanyModal($event)"
-  [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading" (confirmDelEvent)="confirmAccompany()"
-  confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？"></app-dialog-delete>
+  (cancelDelEvent)="hideAccompanyModal($event)" [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading"
+  (confirmDelEvent)="confirmAccompany()" confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？">
+</app-dialog-delete>