优化

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

@@ -316,7 +316,8 @@
                     nzAllowClear
                     nzPlaceHolder="请选择验证检验科室范围"
                     nzServerSearch
-                    [formControlName]="config.key"
+                    [formControlName]="config.key" 
+                    (nzOnSearch)="onSearchInspectionDepartmentScope($event)"
                   >
                     <ng-container *ngFor="let o of deptList2">
                       <nz-option

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

@@ -31,6 +31,7 @@ export class HospitalConfigComponent implements OnInit {
   deptList2 = []; //科室列表
   groupList = []; //组列表
   onSearchSubject = new Subject(); //搜索防抖
+  onSearchInspectionDepartmentScopeSubject = new Subject(); //搜索防抖
   coopBtns: any = {};
   repairSpecimenStatus = "0"; //是否执行标本验证机制
   repairSpecimenStatusMinute = 0; //验证时间
@@ -58,6 +59,14 @@ export class HospitalConfigComponent implements OnInit {
         }
       });
     });
+    this.onSearchInspectionDepartmentScopeSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getDeptList2(this.hosId, v).then((result) => {
+        this.searchLoading = false;
+        if (result.status == 200) {
+          this.deptList2 = result.list;
+        }
+      });
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getInit();
   }
@@ -222,9 +231,26 @@ export class HospitalConfigComponent implements OnInit {
                     this.classesList
                   );
                 } else if (config.key === "repairSpecimenStatusCheckDeptIds") {
-                  this.validateForm.controls[config.key].setValue(
-                    config.value ? config.value.split(",").map(Number) : []
-                  );
+                  let arr = config.value ? config.value.split(",").map(Number) : [];
+                  arr.forEach(v => {
+                    let flag = this.deptList2.some(
+                      (item) => item.id == v
+                    );
+                    console.log(this.deptList2);
+                    if (!flag) {
+                      this.getDeptById(v).subscribe((item) => {
+                        this.isLoading = false;
+                        if (item.status == 200) {
+                          if (item.data.hospital.id == this.hosId) {
+                            this.deptList2.unshift(item.data);
+                          }
+                        }
+                      });
+                    } else {
+                      this.isLoading = false;
+                    }
+                  })
+                  this.validateForm.controls[config.key].setValue(arr);
                 } else {
                   this.validateForm.controls[config.key].setValue(config.value);
                 }
@@ -311,12 +337,13 @@ export class HospitalConfigComponent implements OnInit {
    * @param dept 模糊搜索
    * @returns
    */
-  getDeptList2(hosId) {
+  getDeptList2(hosId, dept: any = "") {
     let postData = {
       idx: 0,
       sum: 10,
       department: {
         hospital: { id: hosId },
+        dept,
         type: { id: "282" },
       },
     };
@@ -341,6 +368,12 @@ export class HospitalConfigComponent implements OnInit {
     this.onSearchSubject.next(e);
   }
 
+  //验证检验科室范围
+  onSearchInspectionDepartmentScope(e){
+    this.searchLoading = true;
+    this.onSearchInspectionDepartmentScopeSubject.next(e);
+  }
+
   // 保存
   submitForm(): void {
     for (const i in this.validateForm.controls) {

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

@@ -69,7 +69,7 @@ export class OrderManagementComponent implements OnInit {
   checkOptionsOne: Array<any> = [
     { label: "超时工单", value: "0", checked: false },
     { label: "异常工单", value: "1", checked: false },
-    { label: "24小时未完成", value: "2", checked: false },
+    // { label: "24小时未完成", value: "2", checked: false },
   ]; //工单异常状态
 
   // 初始化工单异常状态选中状态
@@ -198,7 +198,7 @@ export class OrderManagementComponent implements OnInit {
         specialCloseFlag: that.specialCloseFlag,
         createDept: that.department,
         hosId: that.hospital,
-        abnormityType: that.checkOptionsOne[1].checked ? 1 : 0,
+        abnormityType: that.checkOptionsOne[1].checked ? 1 : undefined,
         timeOut: that.checkOptionsOne[0].checked ? 1 : 0,
       },
     };
@@ -387,7 +387,7 @@ export class OrderManagementComponent implements OnInit {
         gdState: { id: that.gdState },
         createDept: that.department,
         hosId: that.hospital,
-        abnormityType: that.checkOptionsOne[1].checked ? 1 : 0,
+        abnormityType: that.checkOptionsOne[1].checked ? 1 : undefined,
         timeOut: that.checkOptionsOne[0].checked ? 1 : 0,
       },
     };