院区设置BUG修复

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

@@ -11,7 +11,7 @@ import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 
 @Component({
   selector: "app-hospital-config",
@@ -171,7 +171,7 @@ export class HospitalConfigComponent implements OnInit {
                 fbGroup[item.key] = [];
                 item.required = false;
               } else {
-                if(item.show){
+                if (item.show) {
                   fbGroup[item.key] = [null, [Validators.required]];
                   item.required = true;
                 }
@@ -180,52 +180,54 @@ export class HospitalConfigComponent implements OnInit {
             this.validateForm = this.fb.group(fbGroup);
             //赋值
             this.hospitalConfigList.forEach((config) => {
-              //默认角色,默认组
-              if (
-                config.key === "autoCreateUserRoleId" ||
-                config.key === "rebackPatientTypeId" ||
-                config.key === "transDeptTypeId" ||
-                config.key === "autoCreateUserGroupId"
-              ) {
-                this.validateForm.controls[config.key].setValue(
-                  config.value - 0
-                );
-              } else if (config.key === "autoCreateUserDeptId") {
-                //默认科室
-                let flag = this.deptList.some(
-                  (item) => item.id == config.value
-                );
-                console.log(this.deptList);
-                if (!flag) {
-                  this.getDeptById(config.value).subscribe((item) => {
-                    this.isLoading = false;
-                    if (item.status == 200) {
-                      if (item.data.hospital.id == this.hosId) {
-                        console.log(this.deptList);
-                        this.deptList.unshift(item.data);
+              if (config.show) {
+                //默认角色,默认组
+                if (
+                  config.key === "autoCreateUserRoleId" ||
+                  config.key === "rebackPatientTypeId" ||
+                  config.key === "transDeptTypeId" ||
+                  config.key === "autoCreateUserGroupId"
+                ) {
+                  this.validateForm.controls[config.key].setValue(
+                    config.value - 0
+                  );
+                } else if (config.key === "autoCreateUserDeptId") {
+                  //默认科室
+                  let flag = this.deptList.some(
+                    (item) => item.id == config.value
+                  );
+                  console.log(this.deptList);
+                  if (!flag) {
+                    this.getDeptById(config.value).subscribe((item) => {
+                      this.isLoading = false;
+                      if (item.status == 200) {
+                        if (item.data.hospital.id == this.hosId) {
+                          console.log(this.deptList);
+                          this.deptList.unshift(item.data);
+                        }
                       }
-                    }
+                    });
+                  } else {
+                    this.isLoading = false;
+                  }
+                  this.validateForm.controls[config.key].setValue(
+                    config.value - 0
+                  );
+                } else if (config.key === "rushNoticeShift") {
+                  let arr = config.value ? config.value.split(",") : [];
+                  this.classesList.forEach((item) => {
+                    item.checked = arr.includes(item.value + "");
                   });
+                  this.validateForm.controls[config.key].setValue(
+                    this.classesList
+                  );
+                } else if (config.key === "repairSpecimenStatusCheckDeptIds") {
+                  this.validateForm.controls[config.key].setValue(
+                    config.value ? config.value.split(",").map(Number) : []
+                  );
                 } else {
-                  this.isLoading = false;
+                  this.validateForm.controls[config.key].setValue(config.value);
                 }
-                this.validateForm.controls[config.key].setValue(
-                  config.value - 0
-                );
-              } else if (config.key === "rushNoticeShift") {
-                let arr = config.value ? config.value.split(",") : [];
-                this.classesList.forEach((item) => {
-                  item.checked = arr.includes(item.value + "");
-                });
-                this.validateForm.controls[config.key].setValue(
-                  this.classesList
-                );
-              } else if (config.key === "repairSpecimenStatusCheckDeptIds") {
-                this.validateForm.controls[config.key].setValue(
-                  config.value ? config.value.split(",").map(Number) : []
-                );
-              } else {
-                this.validateForm.controls[config.key].setValue(config.value);
               }
             });
           } else {
@@ -328,7 +330,7 @@ export class HospitalConfigComponent implements OnInit {
    * @returns
    */
   getGroupList(hosId) {
-    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId,type:1 } };
+    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId, type: 1 } };
     return this.mainService
       .getFetchDataList("data", "group2", postData)
       .toPromise();