用户管理显示支助人员、服务台人员

src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -146,6 +146,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
 
   // 获取相应的院区
   getAllHospital() {
+    this.loading1 = true;
     let topLevelParentHosList$ = this.mainService.apiPostAll("topLevelParentHosList", {});
     let topLevelParentHos$ = this.mainService.apiPostAll("topLevelParentHos", {hosId: this.tool.getCurrentHospital().id});
     forkJoin(topLevelParentHosList$, topLevelParentHos$).subscribe((dataArray:any[]) => {
@@ -154,6 +155,8 @@ export class ClinicalUsersManagementComponent implements OnInit {
       this.hosId = data2.topHospital ? data2.topHospital.id : null;
       this.changeHosp1(this.hosId);
       this.getList();
+    }, err => {
+      this.loading1 = false;
     })
   }
 

src/app/views/users-management/users-management.component.ts

@@ -42,7 +42,7 @@ export class UsersManagementComponent implements OnInit {
   hosId: any; //院区（搜索）
   userGroup; //所属组
   userGroup1; //所属组(搜索)
-  userTypes: Array<any>; //所有用户类型
+  userTypes: Array<any> = []; //所有用户类型
   alldepart: any = []; //所有所属科室
   alldepart1: any = []; //所有所属科室(搜索)
   allUserGroup: Array<any>; //所有用户组
@@ -68,7 +68,6 @@ export class UsersManagementComponent implements OnInit {
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
-    this.getAllHospital();
     this.getAllRole();
     this.getUserTypes();
     this.getGender();
@@ -105,6 +104,7 @@ export class UsersManagementComponent implements OnInit {
         account: this.num || "",
         groupdata: { id: this.userGroup1 || "" },
         hospital: { id: this.hosId || "" },
+        userTypeIds: String(this.userTypes.map(v => v.id))
       },
     };
     if (!data.user.dept || !data.user.dept.id) {
@@ -131,9 +131,9 @@ export class UsersManagementComponent implements OnInit {
 
   // 获取所有用户类型
   getUserTypes() {
-    var that = this;
-    that.mainService.getDictionary("list", "usertype").subscribe((data) => {
-      that.userTypes = data;
+    this.mainService.getDictionary("list", "usertype").subscribe((data) => {
+      this.userTypes = data.filter(v => (v.value == 2 || v.value == 3));
+      this.getAllHospital();
     });
   }