Merge branch 'lmm' into develop

src/app/views/task-type-management/task-type-management.component.html

@@ -1098,7 +1098,7 @@
   </div>
   <!-- 删除模态框 -->
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmDel()" content="您确认要删除此任务类型吗？"></app-dialog-delete>
+    (confirmDelEvent)="confirmDel()" content="您确认要删除此任务类型吗？" tips="会影响已绑定的工作分配和轮巡计划"></app-dialog-delete>
 </div>
 
 <!-- 操作成功/失败提示框 -->

src/app/views/wechat-config/wechat-config.component.ts

@@ -171,6 +171,8 @@ export class WechatConfigComponent implements OnInit {
   //修改默认院区
   hospitalChange(hosId) {
     this.hosId = hosId;
+    this.validateForm.controls.defaultDept.setValue(null);
+    this.validateForm.controls.defaultGroup.setValue(null);
     this.getGroupList(hosId).subscribe((result) => {
       if (result.status == 200) {
         this.groupList = result.list;