电话统计

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.163",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/fuwutai/fuwutai.component.html

@@ -787,7 +787,7 @@
       </div>
       <div class="fixedMenu">
         <div class="menuItems">
-          <div class="others" [ngStyle]="{ height: showLastItems ? mainRole ? 35 * 6 + 'px' : 35 * 5 + 'px' : 0 }">
+          <div class="others" [ngStyle]="{ height: showLastItems ? mainRole ? 35 * 5 + 'px' : 35 * 4 + 'px' : 0 }">
             <div [ngClass]="{ item: true, checked: fixedTab == 'orderScope' }" (click)="showOrderScope()">
               工单范围
             </div>
@@ -797,9 +797,9 @@
             <div [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }" (click)="checkFixedTab('nucleicAcidPrinting')" *ngIf="isShowNucleicAcidPrinting">
               核酸打印
             </div>
-            <div [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }" (click)="checkFixedTab('queueNum')">
+            <!-- <div [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }" (click)="checkFixedTab('queueNum')">
               叫号信息
-            </div>
+            </div> -->
             <div [ngClass]="{ item: true, checked: fixedTab == 'toSystem' }" *ngIf="mainRole" (click)="checkFixedTab('toSystem')">
               返回系统
             </div>

src/app/views/new-statistics/components/phone-search-more/phone-search-more.component.html

@@ -4,54 +4,13 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
-        <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
-          <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
-              <ng-container *ngFor="let option of groupList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-
-        <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
-          <nz-form-label [nzSpan]="6" nzFor="userId">人<span style="visibility: hidden;">囧囧</span>员</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting(true)">
-              <ng-container *ngFor="let option of userList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-
-        <nz-form-item [hidden]="!fieldConfig.config.statisticsType">
-          <nz-form-label [nzSpan]="6" nzFor="statisticsTypeId">统计分类</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择统计分类!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="statisticsTypeId" nzPlaceHolder="请选择统计分类">
-              <ng-container *ngFor="let option of statisticsTypeList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
 
-        <nz-form-item [hidden]="!fieldConfig.config.taskType">
-          <nz-form-label [nzSpan]="6" nzFor="taskTypeId">任务类型</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeTaskTypeInp($event)" formControlName="taskTypeId" nzPlaceHolder="请选择任务类型" (nzOpenChange)="openChangeTaskType($event)" (ngModelChange)="setIsSelecting(true)">
-              <ng-container *ngFor="let option of taskTypeList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosId.hosName + '-' + option.taskName" [nzValue]="option.id"></nz-option>
+        <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
+          <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="changeBuilding($event)">
+              <ng-container *ngFor="let option of buildingList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -60,12 +19,12 @@
           </nz-form-control>
         </nz-form-item>
 
-        <nz-form-item [hidden]="!fieldConfig.config.building">
-          <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="setIsSelecting(true)">
-              <ng-container *ngFor="let option of buildingList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+        <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
+          <nz-form-label [nzSpan]="6" nzFor="floorId">楼<span style="visibility: hidden;">囧囧</span>层</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼层!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of floorList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
               </ng-container>
               <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -77,7 +36,7 @@
         <nz-form-item [hidden]="!fieldConfig.config.dept">
           <nz-form-label [nzSpan]="6" nzFor="deptId">科<span style="visibility: hidden;">囧囧</span>室</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of deptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -87,6 +46,20 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+
+				<nz-form-item [hidden]="!fieldConfig.config.deptType">
+				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="deptTypeId" nzPlaceHolder="请选择科室类型" (nzOpenChange)="openChangeDeptType($event)">
+				      <ng-container *ngFor="let option of deptTypeList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

src/app/views/new-statistics/components/phone-search-more/phone-search-more.component.ts

@@ -1,6 +1,6 @@
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
-import { ToolService } from '../../../../services/tool.service';
+import { ToolService } from './../../../../services/tool.service';
 import { Component, OnInit, Output, Input } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { EventEmitter } from '@angular/core';
@@ -33,7 +33,6 @@ export class PhoneSearchMoreComponent implements OnInit {
       fun.call(this, v[1]);
     });
     this.initForm();
-    this.getSourceList();
   }
   // 隐藏模态框
   hideModal() {
@@ -41,21 +40,17 @@ export class PhoneSearchMoreComponent implements OnInit {
   }
   // 初始化form表单
   initForm() {
-    this.groupList = this.fieldConfig.fields.groupDTO ? [this.fieldConfig.fields.groupDTO] : [];
-    this.userList = this.fieldConfig.fields.userDTO ? [this.fieldConfig.fields.userDTO] : [];
-    this.statisticsTypeList = this.fieldConfig.fields.statisticsTypeDTO ? [this.fieldConfig.fields.statisticsTypeDTO] : [];
     this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
-    this.taskTypeList = this.fieldConfig.fields.taskTypeDTO ? [this.fieldConfig.fields.taskTypeDTO] : [];
+    this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
     this.deptList = this.fieldConfig.fields.deptDTO ? [this.fieldConfig.fields.deptDTO] : [];
+		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
 
     this.validateForm = this.fb.group({
-      groupId: [this.fieldConfig.fields.groupId || null],
-      userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
-      statisticsTypeId: [this.fieldConfig.fields.statisticsTypeId || null],
       buildingId: [this.fieldConfig.fields.buildingId || null],
-      taskTypeId: [this.fieldConfig.fields.taskTypeDTO ? this.fieldConfig.fields.taskTypeDTO.id  : null],
+      floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
       deptId: [this.fieldConfig.fields.deptDTO ? this.fieldConfig.fields.deptDTO.id  : null],
-    });
+			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
+		});
   }
   // 表单提交
   submitForm(): void {
@@ -66,29 +61,21 @@ export class PhoneSearchMoreComponent implements OnInit {
     if (this.validateForm.invalid) return;
 
     let fields:any = {}
-    if(this.fieldConfig.config.groupAndUser){
-      fields.groupId = this.validateForm.value.groupId;
-      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
-      fields.userId = this.validateForm.value.userId;
-      fields.userDTO = this.userList.find(item => item.id == this.validateForm.value.userId);
-    }
-
-    if(this.fieldConfig.config.statisticsType){
-      fields.statisticsTypeId = this.validateForm.value.statisticsTypeId;
-      fields.statisticsTypeDTO = this.statisticsTypeList.find(item => item.id == this.validateForm.value.statisticsTypeId);
-    }
-    if(this.fieldConfig.config.building){
+    if(this.fieldConfig.config.buildingAndFloor){
       fields.buildingId = this.validateForm.value.buildingId;
       fields.buildingDTO = this.buildingList.find(item => item.id == this.validateForm.value.buildingId);
-    }
-    if(this.fieldConfig.config.taskType){
-      fields.taskTypeId = this.validateForm.value.taskTypeId;
-      fields.taskTypeDTO = this.taskTypeList.find(item => item.id == this.validateForm.value.taskTypeId);
+      fields.floorId = this.validateForm.value.floorId;
+      fields.floorDTO = this.floorList.find(item => item.id == this.validateForm.value.floorId);
     }
     if(this.fieldConfig.config.dept){
       fields.deptId = this.validateForm.value.deptId;
       fields.deptDTO = this.deptList.find(item => item.id == this.validateForm.value.deptId);
     }
+		if(this.fieldConfig.config.deptType){
+		  fields.deptTypeId = this.validateForm.value.deptTypeId;
+		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
+		}
+
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -114,95 +101,24 @@ export class PhoneSearchMoreComponent implements OnInit {
     this.isSelecting = flag; // 设置标志
   }
 
-  // =================分组===================
-
-  // 分组搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
-  }
-
-  // 获取分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?){
-    let postData: any = {
-      idx: 0,
-      sum: 20,
-      group2: {
-        statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 1,
-      },
-    };
-    this.isLoading = true;
-    this.mainService.getFetchDataList("simple/data", "group2", postData).subscribe(result => {
-      this.isLoading = false;
-      if(result.status == 200){
-        this.groupList = result.list || [];
-      }else{
-        this.groupList = [];
-      }
-    });
-  }
-  openChangeGroup(flag){
-    flag && this.setIsSelecting(false);
-    flag && this.getGroupList();
-  }
-
-  changeGroup(id){
-    this.setIsSelecting(true);
-    this.userList = [];
-    this.validateForm.controls.userId.setValue(null);
-    this.getUserList();
-  }
+	// =================科室类型===================
 
-  // =================人员===================
+	// 科室类型
+	openChangeDeptType(flag){
+	  flag && this.getDeptTypeList();
+	}
 
-  // 人员搜索
-  changeUserInp(e) {
-    this.searchTimer(this.getUserList, e);
-  }
-
-  // 获取人员列表
-  userList:any[] = [];
-  getUserList(keyword = ''){
-    if(!this.validateForm.value.groupId){
-      this.isLoading = false;
-      this.userList = [];
-      return;
-    }
-    let postData: any = {
-      idx: 0,
-      sum: 20,
-      user: {
-        name: keyword,
-        simpleQuery: true,
-        groupdata: { id: this.validateForm.value.groupId },
-      },
-    };
-    this.isLoading = true;
-    this.mainService.getFetchDataList("simple/data", "user", postData).subscribe(result => {
-      this.isLoading = false;
-      if(result.status == 200){
-        this.userList = result.list || [];
-      }else{
-        this.userList = [];
-      }
-    });
-  }
-  openChangeUser(flag){
-    flag && this.setIsSelecting(false);
-    flag && this.getUserList();
-  }
-
-  // =================统计分类===================
-
-  // 获取统计分类列表
-  statisticsTypeList:any[] = [];
-  getSourceList(){
-    this.mainService.getDictionary("list", "statistics_date_type").subscribe(result => {
-      this.statisticsTypeList = result;
-    });
-  }
+	// 获取科室类型列表
+	deptTypeList:any[] = [];
+	getDeptTypeList(keyword?) {
+	  this.isLoading = true;
+	  this.mainService
+	    .getDictionary("list", "dept_type")
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.deptTypeList = data;
+	    });
+	}
 
   // =================楼栋===================
 
@@ -238,50 +154,61 @@ export class PhoneSearchMoreComponent implements OnInit {
     flag && this.getBuildingList();
   }
 
-  // =================任务类型===================
+  changeBuilding(id){
+    this.setIsSelecting(true);
+    this.floorList = [];
+    this.validateForm.controls.floorId.setValue(null);
+    this.getFloorList();
+  }
+
+  // =================楼层===================
 
-  // 任务类型搜索
-  changeTaskTypeInp(e) {
-    this.searchTimer(this.getTaskTypeList, e);
+  // 楼层搜索
+  changeFloorInp(e) {
+    this.searchTimer(this.getFloorList, e);
   }
 
-  // 获取任务类型列表
-  taskTypeList:any[] = [];
-  getTaskTypeList(keyword?){
+  // 获取楼层列表
+  floorList:any[] = [];
+  getFloorList(keyword = ''){
+    if(!this.validateForm.value.buildingId){
+      this.isLoading = false;
+      this.floorList = [];
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 20,
-      taskType: {
-        simpleQuery: true,
-        taskName: keyword,
-        statisticalHosId: this.getHosId,
+      floor: {
+        floorName: keyword,
+        buildId : this.validateForm.value.buildingId,
       },
     };
     this.isLoading = true;
-    this.mainService.getFetchDataList("simple/data", "taskType", postData).subscribe(result => {
+    this.mainService.getFetchDataList("simple/data", "floor", postData).subscribe(result => {
       this.isLoading = false;
       if(result.status == 200){
-        this.taskTypeList = result.list || [];
+        this.floorList = result.list || [];
       }else{
-        this.taskTypeList = [];
+        this.floorList = [];
       }
     });
   }
-  openChangeTaskType(flag){
+  openChangeFloor(flag){
     flag && this.setIsSelecting(false);
-    flag && this.getTaskTypeList();
+    flag && this.getFloorList();
   }
 
   // =================科室===================
 
   // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
   }
 
   // 获取科室列表
   deptList:any[] = [];
-  getRepairDeptList(keyword?){
+  getDeptList(keyword?){
     let postData: any = {
       idx: 0,
       sum: 20,
@@ -301,8 +228,8 @@ export class PhoneSearchMoreComponent implements OnInit {
       }
     });
   }
-  openChangeRepairDept(flag){
+  openChangeDept(flag){
     flag && this.setIsSelecting(false);
-    flag && this.getRepairDeptList();
+    flag && this.getDeptList();
   }
 }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -107,6 +107,15 @@ const routes: Routes = [
 			    title: '配-业务分类统计'
 			  }
 			},
+			{
+			  // 任务类型质控统计
+			  path: 'taskTypeQualityControlStatistics',
+			  loadChildren: () => import('./taskType-quality-control-statistics/taskType-quality-control-statistics.module').then(m => m.TaskTypeQualityControlStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-任务类型质控统计'
+			  }
+			},
     ]
   }
 ];

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { TaskTypeQualityControlStatisticsComponent } from './taskType-quality-control-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: TaskTypeQualityControlStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TaskTypeQualityControlStatisticsRoutingModule { }

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.html

@@ -0,0 +1,81 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
+    <div class="searchDataItem">
+      <span class="label">任务类型</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeTaskTypeInp($event)" nzAllowClear nzPlaceHolder="请选择任务类型" [(ngModel)]="taskTypeId" (nzOpenChange)="openChangeTaskType($event)">
+        <ng-container *ngFor="let option of taskTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosId.hosName + '-' + option.taskName" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%">任务类型名称</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.taskName }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
+      <td>{{ data.aveper }}</td>
+      <td>{{ data.total_time }}</td>
+      <td>{{ data.five_count }}</td>
+      <td>{{ data.special_close }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.taskName }}</td>
+        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%">{{ data.totalGrade }}</td>
+        <td style="width: 10%">{{ data.response_time_num }}</td>
+        <td style="width: 10%">{{ data.arrive_time_num }}</td>
+        <td style="width: 10%">{{ data.execution_time_num }}</td>
+        <td style="width: 10%">{{ data.aveper }}</td>
+        <td style="width: 10%">{{ data.total_time }}</td>
+        <td style="width: 10%">{{ data.five_count }}</td>
+        <td style="width: 10%">{{ data.special_close }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.less

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts

@@ -0,0 +1,276 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
+@Component({
+  selector: "app-taskType-quality-control-statistics",
+  templateUrl: "./taskType-quality-control-statistics.component.html",
+  styleUrls: ["./taskType-quality-control-statistics.component.less"],
+})
+export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  taskTypeId;//任务类型id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			taskTypeId: this.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "taskTypeTransOrderQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			taskTypeId: this.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "taskTypeTransOrderQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.taskTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 任务类型搜索
+  changeTaskTypeInp(e) {
+    this.searchTimer(this.getTaskTypeList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeTaskType(flag){
+    flag && this.getTaskTypeList();
+  }
+
+  // 获取任务类型列表
+  taskTypeList:any[] = [];
+  getTaskTypeList(keyword?) {
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      taskType: {
+        simpleQuery: true,
+        taskName: keyword,
+        statisticalHosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.taskTypeList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, dept: true, building: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.module.ts

@@ -0,0 +1,23 @@
+import { TaskTypeQualityControlStatisticsComponent } from './taskType-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TaskTypeQualityControlStatisticsRoutingModule } from './taskType-quality-control-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
+
+
+@NgModule({
+  declarations: [
+    TaskTypeQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    TaskTypeQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class TaskTypeQualityControlStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div>
+    <app-custom-change-date #customChangeDate [isShowType]="true"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
-import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-incident-statistics",
   templateUrl: "./incident-statistics.component.html",
   styleUrls: ["./incident-statistics.component.less"],
 })
 export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -156,19 +160,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   // 日期选择
-  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
-  changeDate(result?): void {
-    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
-    this.dateRange = result;
-  }
-
-  onCalendarChangeDate(dateArr){
-    console.log(dateArr)
-    if(dateArr.length == 2){
-      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -177,8 +169,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -220,9 +212,10 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.dateRange = []
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.module.ts

@@ -6,6 +6,7 @@ import { IncidentStatisticsRoutingModule } from './incident-statistics-routing.m
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     ShareModule,
     VirtualScrollerModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class IncidentStatisticsModule { }

src/app/views/new-statistics/phone-statistics/date-phone-statistics/date-phone-statistics.component.html

@@ -2,10 +2,10 @@
   <div class="searchData">
     <app-custom-change-date #customChangeDate [isShowType]="true"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">统计分类</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
-        <ng-container *ngFor="let option of statisticsTypeList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+      <span class="label">科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" (nzOpenChange)="openChangeDept($event)">
+        <ng-container *ngFor="let option of deptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -20,52 +20,38 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
-  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
-  <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+<div class="moreFilter" *ngIf="fieldConfig.fields.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptTypeDTO">
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
-  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="intoCount" [(nzSort)]="sortCurrent.intoCount">来电量</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="intoTime" [(nzSort)]="sortCurrent.intoTime">来电时长</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="outCount" [(nzSort)]="sortCurrent.outCount">去电量</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="outTime" [(nzSort)]="sortCurrent.outTime">去电时长</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
       <td>{{ data.date }}</td>
-      <td>{{ data.totalCount }}</td>
-      <td>{{ data.totalGrade }}</td>
-      <td>{{ data.response_time_num }}</td>
-      <td>{{ data.execution_time_num }}</td>
-      <td>{{ data.aveper }}</td>
-      <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td>{{ data.intoCount }}</td>
+      <td>{{ data.intoTime }}</td>
+      <td>{{ data.outCount }}</td>
+      <td>{{ data.outTime }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.date }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.totalGrade }}</td>
-        <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.execution_time_num }}</td>
-        <td style="width: 11%">{{ data.aveper }}</td>
-        <td style="width: 11%">{{ data.total_time }}</td>
-        <td style="width: 11%">{{ data.five_count }}</td>
-        <td style="width: 11%">{{ data.special_close }}</td>
+        <td style="width: 20%">{{ data.date }}</td>
+        <td style="width: 20%">{{ data.intoCount }}</td>
+        <td style="width: 20%">{{ data.intoTime }}</td>
+        <td style="width: 20%">{{ data.outCount }}</td>
+        <td style="width: 20%">{{ data.outTime }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/phone-statistics/date-phone-statistics/date-phone-statistics.component.ts

@@ -1,4 +1,6 @@
 import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
@@ -24,9 +26,16 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  statisticsTypeId;//统计分类id
+  deptId;//科室id
 
-  ngOnInit() {}
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
 
   ngAfterViewInit(){
     this.initSessionData();
@@ -56,7 +65,7 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.deptTypeDTO;
     return flag ? 37 : 0;
   }
 
@@ -108,22 +117,21 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      dateType: this.customChangeDateComponent.dateType,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
-      statisticsTypeId: this.statisticsTypeId || undefined,
-      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-      userId: this.fieldConfig.fields.userId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      deptId: this.deptId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      deptId: this.fieldConfig.fields.deptId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "dateTransOrderQc", postData)
+      .postCustom("itsm/report", "phoneDate", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -158,21 +166,20 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      dateType: this.customChangeDateComponent.dateType,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
-      statisticsTypeId: this.statisticsTypeId || undefined,
-      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-      userId: this.fieldConfig.fields.userId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      deptId: this.deptId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      deptId: this.fieldConfig.fields.deptId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/exportMergeTitle", "dateTransOrderQc", postData)
+      .postExportCustom("itsm/export", "phoneDate", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -200,35 +207,53 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.statisticsTypeId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
   // 防抖
   isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
 
-  openChangeStatisticsType(flag){
-    flag && this.getStatisticsTypeList();
+  openChangeDept(flag){
+    flag && this.getDeptList();
   }
 
-  // 获取统计分类列表
-  statisticsTypeList:any[] = [];
-  getStatisticsTypeList(keyword?) {
+  // 获取科室列表
+  deptList:any[] = [];
+  getDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
     this.isLoading = true;
     this.mainService
-      .getDictionary("list", "statistics_date_type")
+      .getFetchDataList("data", "department", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.statisticsTypeList = data;
+        this.deptList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined},
-    config: {groupAndUser: true, taskType: true, building: true, dept: true},
+    fields: {buildingId: undefined, floorId: undefined, deptTypeId: undefined},
+    config: {buildingAndFloor: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/phone-statistics/department-phone-statistics/department-phone-statistics.component.html

@@ -1,15 +1,11 @@
 <div class="searchDataWrap">
   <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div>
-    <div class="searchDataItem">
-      <span class="label">统计分类</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
-        <ng-container *ngFor="let option of statisticsTypeList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+      <span class="label">科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" (nzOpenChange)="openChangeDept($event)">
+        <ng-container *ngFor="let option of deptList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,52 +20,41 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
-  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
-  <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+<div class="moreFilter" *ngIf="fieldConfig.fields.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptTypeDTO">
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
-  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+  <span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
+      <th nzWidth="16%">号码</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="intoCount" [(nzSort)]="sortCurrent.intoCount">来电量</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="intoTime" [(nzSort)]="sortCurrent.intoTime">来电时长</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="outCount" [(nzSort)]="sortCurrent.outCount">去电量</th>
+      <th nzWidth="16%" nzShowSort nzSortKey="outTime" [(nzSort)]="sortCurrent.outTime">去电时长</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.date }}</td>
-      <td>{{ data.totalCount }}</td>
-      <td>{{ data.totalGrade }}</td>
-      <td>{{ data.response_time_num }}</td>
-      <td>{{ data.execution_time_num }}</td>
-      <td>{{ data.aveper }}</td>
-      <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
+      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+      <td>{{ data.deptPhone }}</td>
+      <td>{{ data.intoCount }}</td>
+      <td>{{ data.intoTime }}</td>
+      <td>{{ data.outCount }}</td>
+      <td>{{ data.outTime }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.date }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.totalGrade }}</td>
-        <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.execution_time_num }}</td>
-        <td style="width: 11%">{{ data.aveper }}</td>
-        <td style="width: 11%">{{ data.total_time }}</td>
-        <td style="width: 11%">{{ data.five_count }}</td>
-        <td style="width: 11%">{{ data.special_close }}</td>
+        <td style="width: 20%">{{ data.deptCode }}</td>
+        <td style="width: 16%">{{ data.deptPhone }}</td>
+        <td style="width: 16%">{{ data.intoCount }}</td>
+        <td style="width: 16%">{{ data.intoTime }}</td>
+        <td style="width: 16%">{{ data.outCount }}</td>
+        <td style="width: 16%">{{ data.outTime }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/phone-statistics/department-phone-statistics/department-phone-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }
@@ -68,4 +68,4 @@
     justify-content: flex-end;
     align-items: center;
   }
-}
+}

src/app/views/new-statistics/phone-statistics/department-phone-statistics/department-phone-statistics.component.ts

@@ -1,15 +1,18 @@
 import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
-import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-department-phone-statistics",
   templateUrl: "./department-phone-statistics.component.html",
   styleUrls: ["./department-phone-statistics.component.less"],
 })
 export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -23,15 +26,23 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  statisticsTypeId;//统计分类id
+  deptId;//科室id
+
+  searchTimerSubject = new Subject();
 
   ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -49,11 +60,12 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.deptTypeDTO;
     return flag ? 37 : 0;
   }
 
@@ -105,22 +117,20 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
-      statisticsTypeId: this.statisticsTypeId || undefined,
-      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-      userId: this.fieldConfig.fields.userId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      deptId: this.deptId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      deptId: this.fieldConfig.fields.deptId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "dateTransOrderQc", postData)
+      .postCustom("itsm/report", "phoneDept", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
@@ -146,19 +156,7 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
   }
 
   // 日期选择
-  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
-  changeDate(result?): void {
-    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
-    this.dateRange = result;
-  }
-
-  onCalendarChangeDate(dateArr){
-    console.log(dateArr)
-    if(dateArr.length == 2){
-      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -167,21 +165,19 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
-      statisticsTypeId: this.statisticsTypeId || undefined,
-      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-      userId: this.fieldConfig.fields.userId || undefined,
-      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      deptId: this.deptId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
-      deptId: this.fieldConfig.fields.deptId || undefined,
+      placeId: this.fieldConfig.fields.floorId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
     }
     this.mainService
-      .postExportCustom("itsm/exportMergeTitle", "dateTransOrderQc", postData)
+      .postExportCustom("itsm/export", "phoneDept", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -208,35 +204,54 @@ export class DepartmentPhoneStatisticsComponent implements OnInit, AfterViewInit
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.statisticsTypeId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
+    this.dateRange = []
+    this.deptId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, deptTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
   // 防抖
   isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
 
-  openChangeStatisticsType(flag){
-    flag && this.getStatisticsTypeList();
+  openChangeDept(flag){
+    flag && this.getDeptList();
   }
 
-  // 获取统计分类列表
-  statisticsTypeList:any[] = [];
-  getStatisticsTypeList(keyword?) {
+  // 获取科室列表
+  deptList:any[] = [];
+  getDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
     this.isLoading = true;
     this.mainService
-      .getDictionary("list", "statistics_date_type")
+      .getFetchDataList("data", "department", data)
       .subscribe((data) => {
         this.isLoading = false;
-        this.statisticsTypeList = data;
+        this.deptList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined},
-    config: {groupAndUser: true, taskType: true, building: true, dept: true},
+    fields: {buildingId: undefined, floorId: undefined, deptTypeId: undefined},
+    config: {buildingAndFloor: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/phone-statistics/department-phone-statistics/department-phone-statistics.module.ts

@@ -4,7 +4,9 @@ import { CommonModule } from '@angular/common';
 
 import { DepartmentPhoneStatisticsRoutingModule } from './department-phone-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
+import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { PhoneSearchMoreModule } from '../../components/phone-search-more/phone-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -15,7 +17,9 @@ import { PhoneSearchMoreModule } from '../../components/phone-search-more/phone-
     CommonModule,
     DepartmentPhoneStatisticsRoutingModule,
     ShareModule,
+    VirtualScrollerModule,
     PhoneSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentPhoneStatisticsModule { }