SHA1
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -25,6 +25,8 @@ export class AppComponent {
 
				     }
			
 
				     console.log(hosId);
			
 
				     this.tool.getSysNameAndLogoAsync(hosId).subscribe(result => {
			
 
				+      // 系统颜色设置
			
 
				+      this.tool.setUIColor(result.ui_colour);
			
 
				       let marking = result.project || '';
			
 
				       let logoTitle = result.sysName || '';
			
 
				       let logoUrl = location.origin + '/file' + result.logo || '';
			
--- a/src/app/services/tool.service.ts
+++ b/src/app/services/tool.service.ts
@@ -12,34 +12,34 @@ export class ToolService {
 
				 	changeInpSubject:any;
			
 
				 	allSubject = new Subject();
			
 
				 	allEndSubject = new Subject();
			
 
				-	 
			
 
				+
			
 
				 	// 提供方法来触发事件
			
 
				 	triggerEvent(data: any) {
			
 
				 		this.allSubject.next(data);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 提供方法来触发事件
			
 
				 	triggerEndEvent(data: any) {
			
 
				 		this.allEndSubject.next(data);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 提供方法来订阅事件
			
 
				 	getEventObservable() {
			
 
				 		return this.allSubject.asObservable();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 提供方法来订阅事件
			
 
				 	getEventEndObservable() {
			
 
				 		return this.allEndSubject.asObservable();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   // 附件类型
			
 
				   // word，excel，pdf，txt，ppt
			
 
				   attachmentsTypes:string = 'text/plain,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.ms-excel,application/msword,application/vnd.openxmlformats-officedocument.presentationml.presentation';
			
 
				 
			
 
				   constructor(private mainService: MainService) {}
			
 
				-	
			
 
				-	
			
 
				+
			
 
				+
			
 
				   // 获取logoUrl和logoTitle
			
 
				   getSysNameAndLogoAsync(hosId = ''){
			
 
				     return this.mainService.getSysNameAndLogo(hosId);
			
@@ -60,6 +60,51 @@ export class ToolService {
 
				     this.faviconUrl = faviconUrl;
			
 
				   }
			
 
				 
			
 
				+  // 系统颜色设置
			
 
				+  setUIColor(color){
			
 
				+    // 移除样式
			
 
				+    if(document.getElementById('dsThemeId')){
			
 
				+      document.getElementById('dsThemeId').remove();
			
 
				+    }
			
 
				+    // 创建一个新的 <style> 元素
			
 
				+    var style = document.createElement('style');
			
 
				+
			
 
				+    // 设置 style 元素的类型
			
 
				+    style.id = 'dsThemeId';
			
 
				+    style.type = 'text/css';
			
 
				+
			
 
				+    // 添加 CSS 规则
			
 
				+    style.innerHTML = `
			
 
				+      .ant-table-thead tr{
			
 
				+        background-image:none!important;
			
 
				+        background-color:${color}!important;
			
 
				+      }
			
 
				+      #ds-menu .mainMenuOne.mainMenuSelected{
			
 
				+        background-color:${color}!important;
			
 
				+      }
			
 
				+      #ds-menu .mainMenu.menuTwoSelected{
			
 
				+        border-left-color: ${color}!important;
			
 
				+      }
			
 
				+      #sidebar-logo .title{
			
 
				+        color: ${color}!important;
			
 
				+      }
			
 
				+      #app-header .left > .icon_transport,
			
 
				+      #app-header .left .icon_transport.green{
			
 
				+        color: ${color}!important;
			
 
				+      }
			
 
				+      #fuwutai .lists_box .right_bots .top_bot{
			
 
				+        background-color: ${color}!important;
			
 
				+        border-color: ${color}!important;
			
 
				+      }
			
 
				+      #fuwutai .lists_box .no_data{
			
 
				+        color: ${color}!important;
			
 
				+      }
			
 
				+    `;
			
 
				+
			
 
				+    // 将 <style> 元素添加到 <head> 中
			
 
				+    document.head.appendChild(style);
			
 
				+  }
			
 
				+
			
 
				   // 获取权限中的院区
			
 
				   getHospitalList() {
			
 
				     return (
			
@@ -382,7 +427,7 @@ export class ToolService {
 
				 				case "collect":
			
 
				 					coopBtns.collect = true; //设置核收
			
 
				 					break;
			
 
				-				
			
 
				+
			
 
				       }
			
 
				     });
			
 
				     console.log(coopBtns);
			
@@ -485,4 +530,32 @@ export class ToolService {
 
				   generateNumberArray(start, end){
			
 
				     return Array.from(new Array(end + 1).keys()).slice(start);
			
 
				   }
			
 
				+
			
 
				+  /**
			
 
				+   * @description sessionStorage缓存新增,修改
			
 
				+   * @param {number} key 名称
			
 
				+   * @param {number} value 值
			
 
				+   * @return {array}
			
 
				+   */
			
 
				+  setSessionStorage(key, value){
			
 
				+    sessionStorage.setItem(key, JSON.stringify(value));
			
 
				+  }
			
 
				+
			
 
				+  /**
			
 
				+   * @description sessionStorage缓存获取
			
 
				+   * @param {number} key 名称
			
 
				+   * @return {array}
			
 
				+   */
			
 
				+  getSessionStorage(key){
			
 
				+    return JSON.parse(sessionStorage.getItem(key));
			
 
				+  }
			
 
				+
			
 
				+  /**
			
 
				+   * @description sessionStorage缓存删除
			
 
				+   * @param {number} key 名称
			
 
				+   * @return {array}
			
 
				+   */
			
 
				+  removeSessionStorage(key){
			
 
				+    sessionStorage.removeItem(key);
			
 
				+  }
			
 
				 }
			
--- a/src/app/share/allocation-worker/allocation-worker.component.less
+++ b/src/app/share/allocation-worker/allocation-worker.component.less
@@ -68,7 +68,7 @@
 
				           to right,
			
 
				           @bg-start,
			
 
				           @bg-end 100%
			
 
				-        ) !important;
			
 
				+        );
			
 
				 
			
 
				         th {
			
 
				           color: #fff !important;
			
--- a/src/app/share/appraise-detail/appraise-detail.component.less
+++ b/src/app/share/appraise-detail/appraise-detail.component.less
@@ -197,12 +197,12 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				             background-image: -ms-linear-gradient(
			
 
				               top,
			
 
				               @bg-start,
			
 
				               @bg-end
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -218,7 +218,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
--- a/src/app/share/batch-orders/batch-orders.component.less
+++ b/src/app/share/batch-orders/batch-orders.component.less
@@ -259,7 +259,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 100%
			
 
				-              ) !important;
			
 
				+              );
			
 
				 
			
 
				               th {
			
 
				                 color: #fff !important;
			
@@ -275,7 +275,7 @@
 
				                   to right,
			
 
				                   @bg-start,
			
 
				                   @bg-end 50%
			
 
				-                ) !important;
			
 
				+                );
			
 
				               }
			
 
				             }
			
 
				 
			
@@ -435,7 +435,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 100%
			
 
				-              ) !important;
			
 
				+              );
			
 
				 
			
 
				               th {
			
 
				                 color: #fff !important;
			
--- a/src/app/share/detail-drug/detail-drug.component.less
+++ b/src/app/share/detail-drug/detail-drug.component.less
@@ -155,7 +155,7 @@
 
				             to right,
			
 
				             @bg-start,
			
 
				             @bg-end 50%
			
 
				-          ) !important;
			
 
				+          );
			
 
				 
			
 
				           th {
			
 
				             color: #fff !important;
			
--- a/src/app/share/inspection-execute-detail/inspection-execute-detail.component.less
+++ b/src/app/share/inspection-execute-detail/inspection-execute-detail.component.less
@@ -241,7 +241,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -257,7 +257,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
@@ -418,7 +418,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
--- a/src/app/share/order-detail/order-detail.component.less
+++ b/src/app/share/order-detail/order-detail.component.less
@@ -208,13 +208,13 @@ img{
 
				           min-height: 160px;
			
 
				           background: #fff;
			
 
				           border-radius: 5px;
			
 
				-					
			
 
				+
			
 
				           .thead {
			
 
				             background-image: repeating-linear-gradient(
			
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -230,7 +230,7 @@ img{
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
@@ -391,7 +391,7 @@ img{
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
--- a/src/app/share/outgoing-record-detail/outgoing-record-detail.component.less
+++ b/src/app/share/outgoing-record-detail/outgoing-record-detail.component.less
@@ -206,7 +206,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -222,7 +222,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
@@ -383,7 +383,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
--- a/src/app/views/fuwutai/fuwutai.component.html
+++ b/src/app/views/fuwutai/fuwutai.component.html
@@ -1,4 +1,4 @@
 
				-<div class="fuwutai">
			
 
				+<div class="fuwutai" id="fuwutai">
			
 
				   <div class="top" id="top" *ngIf="hurseInfoHiding != 1 && hsmsData.hsmsSwitch">
			
 
				     <!-- 头部Tab -->
			
 
				     <div class="tabBox">
			
@@ -2080,7 +2080,7 @@
 
				 	  cancelTxt="否"
			
 
				 	  (cancelDelEvent)="hideRepeatModal()"
			
 
				 	></app-dialog-delete>
			
 
				-	
			
 
				+
			
 
				 	<!-- 一键派单 -->
			
 
				 	<app-dialog-delete
			
 
				 	  [delModal]="sendModal"
			
@@ -2089,7 +2089,7 @@
 
				 	  (confirmDelEvent)="confirmSecd()"
			
 
				 	  content="您确认一键派单吗？系统会根据工作分配方案自动派单给指定人员"
			
 
				 	></app-dialog-delete>
			
 
				-	
			
 
				+
			
 
				 	<!-- 是否限制业务发起时间模态框 -->
			
 
				 	<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="limitTimeLoading"
			
 
				 	(confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>
			
--- a/src/app/views/home/home.component.less
+++ b/src/app/views/home/home.component.less
@@ -210,7 +210,7 @@
 
				                 .thead {
			
 
				                   th {
			
 
				                     background: transparent;
			
 
				-                    color: #333;
			
 
				+                    color: #fff;
			
 
				                     text-align: center;
			
 
				                     font-size: 12px;
			
 
				                     padding: 8px;
			
@@ -346,6 +346,10 @@
 
				                 .box {
			
 
				                   height: 100%;
			
 
				 
			
 
				+                  th{
			
 
				+                    color: #fff;
			
 
				+                  }
			
 
				+
			
 
				                   th,
			
 
				                   td {
			
 
				                     text-align: center;
			
@@ -421,12 +425,12 @@
 
				                   width: 100%;
			
 
				                   padding: 16px 16px 8px 16px;
			
 
				                   font-size: 12px;
			
 
				-									
			
 
				+
			
 
				 									.flex{
			
 
				 										display: flex;
			
 
				 										justify-content: space-between;
			
 
				 									}
			
 
				-									
			
 
				+
			
 
				                   .title {
			
 
				                     color: #333;
			
 
				 
			
@@ -450,7 +454,7 @@
 
				                     &.noOver {
			
 
				                       -webkit-line-clamp: unset;
			
 
				                     }
			
 
				-										
			
 
				+
			
 
				                   }
			
 
				 
			
 
				                   .up {
			
--- a/src/app/views/hushijiandan/hushijiandan.component.html
+++ b/src/app/views/hushijiandan/hushijiandan.component.html
@@ -182,7 +182,8 @@
 
				             <div class="updateTipsForNurses red">{{ updateTipsForNurses }}</div>
			
 
				             <div class="queuingInformation" *ngIf="!updateTipsForNurses && inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检：<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中：<span class="red">{{queuingInformationList[1]}}</span></div>
			
 
				           </div>
			
 
				-          <div class="right">
			
 
				+          <div class="right nurseMenu">
			
 
				+            <i class="icon_transport transport-tongji-2 green" *ngIf="coopBtns.newStatisticsNurse && newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>
			
 
				             <div class="userInfo dropdown">
			
 
				               <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
			
 
				                 <img src="../../assets/images/icon_keshi.png" alt="">
			
--- a/src/app/views/hushijiandan/hushijiandan.component.less
+++ b/src/app/views/hushijiandan/hushijiandan.component.less
@@ -5,6 +5,17 @@
 
				   height: 100%;
			
 
				   display: flex;
			
 
				 
			
 
				+  .nurseMenu{
			
 
				+    & > .icon_transport{
			
 
				+      margin-left: 24px;
			
 
				+      cursor: pointer;
			
 
				+      font-size: 20px;
			
 
				+      height: 48px;
			
 
				+      line-height: 48px;
			
 
				+      display: inline-block;
			
 
				+    }
			
 
				+  }
			
 
				+
			
 
				   .transport-chaoshi{
			
 
				     font-size: 16px;
			
 
				     margin-right: 4px;
			
--- a/src/app/views/hushijiandan/hushijiandan.component.ts
+++ b/src/app/views/hushijiandan/hushijiandan.component.ts
@@ -295,6 +295,12 @@ export class HushijiandanComponent implements OnInit {
 
				 
			
 
				   getCoopBtns(){
			
 
				     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
			
 
				+    menu.forEach(v => {
			
 
				+      if (v.type == "newStatistics") {
			
 
				+        this.newStatisticsRole = true;
			
 
				+        console.log("新版统计");
			
 
				+      }
			
 
				+    })
			
 
				     let coopBtns:any = {};
			
 
				     let nurseMenu = menu.find(v => v.link === 'nurse');
			
 
				     let nurseMenuChildren = nurseMenu.childrens || [];
			
@@ -321,6 +327,9 @@ export class HushijiandanComponent implements OnInit {
 
				         case "buildOrdersForOtherTasks":
			
 
				           coopBtns.buildOrdersForOtherTasks = true; //其他任务建单
			
 
				           break;
			
 
				+        case "newStatisticsNurse":
			
 
				+          coopBtns.newStatisticsNurse = true; //护士端新版统计权限
			
 
				+          break;
			
 
				       }
			
 
				     });
			
 
				     this.coopBtns = coopBtns;
			
@@ -5827,4 +5836,13 @@ export class HushijiandanComponent implements OnInit {
 
				 			  });
			
 
				 		}
			
 
				   }
			
 
				+
			
 
				+  // 统计
			
 
				+  newStatisticsRole: boolean = false; //新版统计权限
			
 
				+  toNewStatistics(): void {
			
 
				+    this.tool.setSessionStorage('newStatisticsFrom', 'nurse');//统计来源标识
			
 
				+    let menus = JSON.parse(localStorage.getItem("menu"));
			
 
				+    let firstMenu = menus.find((item) => item.type == "newStatistics");
			
 
				+    this.router.navigateByUrl(`newStatistics/${firstMenu.link}/${firstMenu.childrens[0].link}`);
			
 
				+  }
			
 
				 }
			
--- a/src/app/views/inspect-active-detail/inspect-active-detail.component.less
+++ b/src/app/views/inspect-active-detail/inspect-active-detail.component.less
@@ -187,7 +187,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -203,7 +203,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
@@ -363,7 +363,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
--- a/src/app/views/inspect-active-order-list/inspect-active-order-list.component.less
+++ b/src/app/views/inspect-active-order-list/inspect-active-order-list.component.less
@@ -187,7 +187,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
@@ -203,7 +203,7 @@
 
				                 to right,
			
 
				                 @bg-start,
			
 
				                 @bg-end 50%
			
 
				-              ) !important;
			
 
				+              );
			
 
				             }
			
 
				           }
			
 
				 
			
@@ -363,7 +363,7 @@
 
				               to right,
			
 
				               @bg-start,
			
 
				               @bg-end 100%
			
 
				-            ) !important;
			
 
				+            );
			
 
				 
			
 
				             th {
			
 
				               color: #fff !important;
			
--- a/src/app/views/inspect-search/inspect-search.component.ts
+++ b/src/app/views/inspect-search/inspect-search.component.ts
@@ -26,6 +26,7 @@ export class InspectSearchComponent implements OnInit {
 
				   checkOptionsOne: Array<any> = [
			
 
				     { label: "未标记检查科室", value: "0", checked: false },
			
 
				     { label: "无预约时间检查", value: "1", checked: false },
			
 
				+    { label: "入库时间排序", value: "0", checked: false },
			
 
				   ];
			
 
				 
			
 
				   dateRange: any = []; //入库时间区间
			
@@ -46,7 +47,7 @@ export class InspectSearchComponent implements OnInit {
 
				   listLength: number = 10; //表格总数据量
			
 
				   changeInpSubject = new Subject();
			
 
				 	hosId:any = this.tool.getCurrentHospital().id; //当前院区
			
 
				-	
			
 
				+
			
 
				   ngOnInit() {
			
 
				 		this.getTaskType();
			
 
				     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
			
@@ -103,7 +104,7 @@ export class InspectSearchComponent implements OnInit {
 
				     this.allHospital = [this.tool.getCurrentHospital()];
			
 
				     this.searchCriteria.hospital = this.tool.getCurrentHospital().id;
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	//获取任务类型
			
 
				 	 tasktype:any = {};// 任务类型
			
 
				 	getTaskType() {
			
@@ -130,7 +131,7 @@ export class InspectSearchComponent implements OnInit {
 
				 	      }
			
 
				 	    });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	 // 获取配置
			
 
				 	 configs:any = {};
			
 
				 	 getConfig() {
			
@@ -155,7 +156,7 @@ export class InspectSearchComponent implements OnInit {
 
				 	       }
			
 
				 	     });
			
 
				 	 }
			
 
				-	 
			
 
				+
			
 
				   // 查看标本历史记录
			
 
				   historyPromptModalShow = false; //标本历史记录弹窗开关
			
 
				   scode = ""; //查看历史记录携带
			
@@ -224,6 +225,7 @@ export class InspectSearchComponent implements OnInit {
 
				       createEndTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
			
 
				       noneEndDept: this.checkOptionsOne[0].checked ? true : undefined,
			
 
				       noneYytime: this.checkOptionsOne[1].checked ? true : undefined,
			
 
				+      sortType: this.checkOptionsOne[2].checked ? true : undefined,
			
 
				       queryInspect: 1,//带检查项目
			
 
				     };
			
 
				     this.loading1 = true;
			
--- a/src/app/views/login/login.component.ts
+++ b/src/app/views/login/login.component.ts
@@ -152,7 +152,7 @@ export class LoginComponent implements OnInit {
 
				       remember: [Boolean(localStorage.getItem("remember"))],
			
 
				 			code: [null, [Validators.required]]
			
 
				     });
			
 
				-		
			
 
				+
			
 
				 		if(this.isSingleSignOn){
			
 
				 			this.validateForm.removeControl('code');
			
 
				 		}else{
			
@@ -163,7 +163,7 @@ export class LoginComponent implements OnInit {
 
				 	resetCode(){
			
 
				 		this.getCode()
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取系统安全配置
			
 
				 	verificationCode:any;
			
 
				 	getSysConfig(){
			
@@ -174,7 +174,7 @@ export class LoginComponent implements OnInit {
 
				 			}
			
 
				 		})
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取验证码
			
 
				 	loginImg:any;
			
 
				 	captchaId:any;
			
@@ -186,7 +186,7 @@ export class LoginComponent implements OnInit {
 
				 			}
			
 
				 		})
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   // enter触发
			
 
				   enterUp(e): void {
			
 
				     let keyCode = e.which || e.keyCode || 0;
			
@@ -254,6 +254,9 @@ export class LoginComponent implements OnInit {
 
				         console.log(data.user);
			
 
				         let hosId = data.user.user.currentHospital ? data.user.user.currentHospital.id : ''
			
 
				         this.tool.getSysNameAndLogoAsync(hosId).subscribe(result => {
			
 
				+          // 系统颜色设置
			
 
				+          this.tool.setUIColor(result.ui_colour);
			
 
				+
			
 
				 					// this.verificationCode = result.verificationCode;
			
 
				           let marking = result.project || '';
			
 
				           let logoTitle = result.sysName || '';
			
--- a/src/app/views/main/main.component.html
+++ b/src/app/views/main/main.component.html
@@ -1,6 +1,6 @@
 
				 <nz-layout class="app-layout display_flex flex_auto ant-layout-has-sider">
			
 
				   <overlay-scrollbars #osComponentRef1 class="menu-sidebar">
			
 
				-    <div class="sidebar-logo display_flex align-items_center justify-content_flex-center">
			
 
				+    <div class="sidebar-logo display_flex align-items_center justify-content_flex-center" id="sidebar-logo">
			
 
				       <div class="display_flex align-items_center justify-content_flex-center logoTitle">
			
 
				         <div class="title ellipsis-multiline" nz-tooltip nzTooltipTitle="{{tool.logoTitle}}">{{tool.logoTitle}}</div>
			
 
				       </div>
			
@@ -28,7 +28,7 @@
 
				   </overlay-scrollbars>
			
 
				   <nz-layout style="background:#fff;display: flex;flex-direction: column;position: relative;">
			
 
				     <nz-header>
			
 
				-      <div class="app-header display_flex justify-content_space-between align-items_center">
			
 
				+      <div class="app-header display_flex justify-content_space-between align-items_center" id="app-header">
			
 
				         <div class="left">
			
 
				 					<!-- <i class="icon_transport transport-xiaoxi green" (click)="toMessage()" nz-tooltip nzTooltipTitle="个人消息通知"></i> -->
			
 
				           <div class="dropdown">
			
@@ -316,7 +316,7 @@
 
				 											</nz-option>
			
 
				 										</nz-select>
			
 
				 									</div>
			
 
				-									
			
 
				+
			
 
				 									<div class="col">
			
 
				 										<span class="name required">故障现象：</span>
			
 
				 										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">
			
@@ -640,7 +640,7 @@
 
				 </div>
			
 
				 
			
 
				 <!-- 查询范围 -->
			
 
				-<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
			
 
				+<app-query-range sign="largeScreen" [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" [hiddenDefaultDate]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
			
 
				 
			
 
				 <!-- 知识库查看 -->
			
 
				 <app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>
			
--- a/src/app/views/main/main.component.ts
+++ b/src/app/views/main/main.component.ts
@@ -585,7 +585,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 	searchPatientListSubject = new Subject();
			
 
				 	inspectSubject = new Subject();
			
 
				 	changeAssetInpSubject = new Subject();
			
 
				-	
			
 
				+
			
 
				 	// 运维相关
			
 
				 	incidentModel:any = {};
			
 
				 	incidentMsg:any = {};
			
@@ -1092,7 +1092,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 	      }
			
 
				 	    });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 引入知识库
			
 
				 	importKnowage(item){
			
 
				 	  console.log(item)
			
@@ -1105,11 +1105,11 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 	  this.coopData = data || {};
			
 
				 	  this.isShowKnowledge = true;
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	cancelKnowledgeModal(flag) {
			
 
				 	  this.isShowKnowledge = false;
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取患者信息
			
 
				 	searchPatientList(id, searchWords) {
			
 
				 	  this.searchPatientListSubject.next([id, searchWords]);
			
@@ -3951,11 +3951,11 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 		    this.getPatientByResidenceNo(v[1]);
			
 
				 		  }
			
 
				 		});
			
 
				-		
			
 
				+
			
 
				 		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				 		  this.getAssetData(v);
			
 
				 		});
			
 
				-		
			
 
				+
			
 
				 		this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				 		  this.getTasktypeByPhone(v);
			
 
				 		});
			
@@ -4026,7 +4026,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 									}else{
			
 
				 										this.cmdbRepair = false
			
 
				 									}
			
 
				-									break;	
			
 
				+									break;
			
 
				 							}
			
 
				 						});
			
 
				 						if(this.eventData){
			
@@ -4048,7 +4048,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 							}
			
 
				 							this.searchApplicationBuilding()
			
 
				 						}
			
 
				-						
			
 
				+
			
 
				 						if(this.cmdbRepair && this.hospitalModel==1){
			
 
				 							this.getAssetData()
			
 
				 						}
			
@@ -4056,11 +4056,11 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 				}
			
 
				 			});
			
 
				 	 }
			
 
				-	
			
 
				+
			
 
				 	changeAsset(e){
			
 
				 		this.changeAssetInpSubject.next(e);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   // 获取资产列表
			
 
				 	assetData:any = [];
			
 
				 	getAssetData(name?){
			
@@ -4075,7 +4075,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 		    name: name
			
 
				 		  },
			
 
				 		};
			
 
				-		
			
 
				+
			
 
				 		this.mainService
			
 
				 		  .getFetchDataList("simple/data", "asset", data)
			
 
				 		  .subscribe((data) => {
			
@@ -4084,7 +4084,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 		    }
			
 
				 		  });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 新增报修
			
 
				 	speedinessAdd(): void {
			
 
				 		this.addOrder();
			
@@ -4159,6 +4159,7 @@ export class MainComponent implements OnInit, OnDestroy {
 
				 	}
			
 
				   // 统计
			
 
				   toNewStatistics(): void {
			
 
				+    this.tool.setSessionStorage('newStatisticsFrom', 'main');//统计来源标识
			
 
				     let menus = JSON.parse(localStorage.getItem("menu"));
			
 
				     let firstMenu = menus.find((item) => item.type == "newStatistics");
			
 
				     this.router.navigateByUrl(`newStatistics/${firstMenu.link}/${firstMenu.childrens[0].link}`);
			
--- a/src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.ts
+++ b/src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.ts
@@ -82,29 +82,20 @@ export class CustomChangeDateComponent implements OnInit, OnDestroy {
 
				 		//     }
			
 
				 		//   });
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	ngOnDestroy(){
			
 
				-		// this.dateData1 = null 
			
 
				+		// this.dateData1 = null
			
 
				 		// this.dateData2 = null
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   // 根据时间区间重置
			
 
				   resetByDate(){
			
 
				-		setTimeout(_=>{
			
 
				-			// console.log(2222,this.dateData1, this.dateData2)
			
 
				-			// if(this.dateData1 && this.dateData2){
			
 
				-			// 	this.dateRange = [this.dateData1, this.dateData2]
			
 
				-			// }else{
			
 
				-			// 	this.dateType = 'day';
			
 
				-			// 	this.changeDateType(this.dateType, 6);
			
 
				-			// }
			
 
				-			this.dateType = 'day';
			
 
				-			this.changeDateType(this.dateType, 6);
			
 
				-		})
			
 
				+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				+		this.initByDate(newStatistics.defaultDate)
			
 
				   }
			
 
				 
			
 
				   // 根据时间区间初始化
			
 
				-  initByDate(dateRange:any[], dateNum:any= 6){
			
 
				+  initByDate(dateRange:any[], dateNum:any = null){
			
 
				     setTimeout(() => {
			
 
				       this.dateType = 'day';
			
 
				       this.dateRange = dateRange;
			
--- a/src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html
+++ b/src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html
@@ -91,7 +91,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]="17" nzErrorTip="请选择科室!">
			
 
				-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
			
 
				+            <nz-select [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($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>
			
@@ -101,7 +101,7 @@
 
				             </nz-select>
			
 
				           </nz-form-control>
			
 
				         </nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.source">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="sourceId">来<span style="visibility: hidden;">囧囧</span>源</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择来源!">
			
@@ -112,7 +112,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.minute">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="minuteClose">分钟内关单</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入分钟内关单!">
			
@@ -127,7 +127,7 @@
 
				 						 ></nz-input-number>
			
 
				 					</nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.special">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="specialId">特殊关闭</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择特殊关闭!">
			
@@ -138,7 +138,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.overtime">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择超时工单!">
			
@@ -149,7 +149,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item> -->
			
 
				-				
			
 
				+
			
 
				 			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.abnormal">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="abnormalId">异常工单</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择异常工单!">
			
@@ -160,7 +160,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item> -->
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评<span style="visibility: hidden;">囧囧</span>价</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择评价!">
			
@@ -174,7 +174,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.executeUser">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="executeUserId">执行人</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
			
@@ -188,7 +188,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.timeFrame">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="timeFrameId">时<span style="visibility: hidden;">囧囧</span>段</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
			
@@ -199,13 +199,24 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.code">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单<span style="visibility: hidden;">囧囧</span>号</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入单号!">
			
 
				 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				+
			
 
				+        <nz-form-item [hidden]="!fieldConfig.config.emergencyType">
			
 
				+				  <nz-form-label [nzSpan]="6" nzFor="emergencyTypeId">是否加急</nz-form-label>
			
 
				+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择是否加急!">
			
 
				+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="emergencyTypeId" nzPlaceHolder="请选择是否加急">
			
 
				+				      <ng-container *ngFor="let option of emergencyTypeList">
			
 
				+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
			
 
				+				      </ng-container>
			
 
				+				    </nz-select>
			
 
				+				  </nz-form-control>
			
 
				+				</nz-form-item>
			
 
				       </form>
			
 
				     </div>
			
 
				     <div class="display_flex justify-content_flex-center">
			
--- a/src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.ts
+++ b/src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.ts
@@ -27,12 +27,16 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				     private tool: ToolService,
			
 
				     private mainService: MainService,
			
 
				   ) { }
			
 
				-	
			
 
				+
			
 
				 	minuteClose:any;
			
 
				 	specialList:any = [
			
 
				 		{name:'是',id:1},
			
 
				 		{name:'否',id:0}
			
 
				 	]
			
 
				+  emergencyTypeList:any = [
			
 
				+		{name:'是',id:1},
			
 
				+		{name:'否',id:0}
			
 
				+	]
			
 
				 	overtimeList:any = [
			
 
				 		{name:'是',id:1},
			
 
				 		{name:'否',id:0}
			
@@ -67,12 +71,13 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				     this.deptList = this.fieldConfig.fields.deptDTO ? [this.fieldConfig.fields.deptDTO] : [];
			
 
				 		this.sourceList = this.fieldConfig.fields.sourceDTO ? [this.fieldConfig.fields.sourceDTO] : [];
			
 
				 		this.specialList = [{name:'是',id:1},{name:'否',id:0}];
			
 
				+		this.emergencyTypeList = [{name:'是',id:300},{name:'否',id:299}];//后端要求写死，是否加急，是-300，否-299
			
 
				 		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
			
 
				 		this.abnormalList = [{name:'是',id:1},{name:'否',id:0}];
			
 
				 		this.evaluateList = this.fieldConfig.fields.evaluateDTO ? [this.fieldConfig.fields.evaluateDTO] : [];
			
 
				 		this.executeUserList =  this.fieldConfig.fields.executeUserDTO ? [this.fieldConfig.fields.executeUserDTO] : [];
			
 
				 		this.timeFrameList = this.fieldConfig.fields.timeFrameDTO ? [this.fieldConfig.fields.timeFrameDTO] : [];
			
 
				-		
			
 
				+
			
 
				 		this.validateForm = this.fb.group({
			
 
				       groupId: [this.fieldConfig.fields.groupId || null],
			
 
				       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
			
@@ -83,6 +88,7 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 			sourceId: [this.fieldConfig.fields.sourceId || null],
			
 
				 			minuteClose: [this.fieldConfig.fields.minuteClose || null],
			
 
				 			specialId: [this.fieldConfig.fields.specialDTO ? this.fieldConfig.fields.specialDTO.id  : null],
			
 
				+			emergencyTypeId: [this.fieldConfig.fields.emergencyTypeDTO ? this.fieldConfig.fields.emergencyTypeDTO.id  : null],
			
 
				 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
			
 
				 			abnormalId: [this.fieldConfig.fields.abnormalDTO ? this.fieldConfig.fields.abnormalDTO.id  : null],
			
 
				 			evaluateId: [this.fieldConfig.fields.evaluateId || null],
			
@@ -90,32 +96,32 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 			codeNum: [this.fieldConfig.fields.codeNum || null],
			
 
				 			timeFrameId: [this.fieldConfig.fields.timeFrameDTO ? this.fieldConfig.fields.timeFrameDTO.id  : null],
			
 
				 		});
			
 
				-		
			
 
				-		
			
 
				+
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.taskTypeId){
			
 
				 			this.getTaskTypeList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.deptId){
			
 
				 			this.getRepairDeptList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.sourceId){
			
 
				 			this.getSourceList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.evaluateId){
			
 
				 			this.getWorkHourEvaluateList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.executeUserId){
			
 
				 			this.getExecuteUserList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.timeFrameId){
			
 
				 			this.getTimeFrameList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				   }
			
 
				   // 表单提交
			
 
				   submitForm(): void {
			
@@ -166,6 +172,10 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 		  fields.specialId = this.validateForm.value.specialId;
			
 
				 		  fields.specialDTO = this.specialList.find(item => item.id == this.validateForm.value.specialId);
			
 
				 		}
			
 
				+    if(this.fieldConfig.config.emergencyType){
			
 
				+		  fields.emergencyTypeId = this.validateForm.value.emergencyTypeId;
			
 
				+		  fields.emergencyTypeDTO = this.emergencyTypeList.find(item => item.id == this.validateForm.value.emergencyTypeId);
			
 
				+		}
			
 
				 		if(this.fieldConfig.config.overtime){
			
 
				 		  fields.overtimeId = this.validateForm.value.overtimeId;
			
 
				 		  fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
			
@@ -190,7 +200,7 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 		  fields.timeFrameId = this.validateForm.value.timeFrameId;
			
 
				 		  fields.timeFrameDTO = this.timeFrameList.find(item => item.id == this.validateForm.value.timeFrameId);
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				     this.submitEvent.emit(fields);
			
 
				     this.hideModal();
			
 
				   }
			
@@ -414,9 +424,9 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				     flag && this.setIsSelecting(false);
			
 
				     flag && this.getRepairDeptList();
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// =================来源===================
			
 
				-	
			
 
				+
			
 
				 	// 获取来源列表
			
 
				 	sourceList:any[] = [];
			
 
				 	getSourceDataList(keyword?){
			
@@ -439,10 +449,10 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 			},
			
 
				 		]
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================评价===================
			
 
				-	
			
 
				-	// 获取评价列表 
			
 
				+
			
 
				+	// 获取评价列表
			
 
				 	evaluateList:any[] = [];
			
 
				 	getWorkHourEvaluateList(){
			
 
				 		this.isLoading = true;
			
@@ -453,14 +463,14 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 		    this.evaluateList = data;
			
 
				 		  });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================执行人===================
			
 
				-	
			
 
				+
			
 
				 	// 执行人搜索
			
 
				 	changeExecuteUserInp(e) {
			
 
				 	  this.searchTimer(this.getExecuteUserList, e);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取执行人列表
			
 
				 	executeUserList:any[] = [];
			
 
				 	getExecuteUserList(keyword?){
			
@@ -489,9 +499,9 @@ export class DistributionSearchMoreComponent implements OnInit {
 
				 	  flag && this.setIsSelecting(false);
			
 
				 	  flag && this.getExecuteUserList();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================时段===================
			
 
				-	
			
 
				+
			
 
				 	// 获取时段列表
			
 
				 	timeFrameList:any[] = [];
			
 
				 	getTimeFrameList(){
			
--- a/src/app/views/new-statistics/components/query-range/query-range.component.html
+++ b/src/app/views/new-statistics/components/query-range/query-range.component.html
@@ -8,10 +8,11 @@
 
				           <nz-form-label [nzSpan]="4" nzRequired nzFor="queryType">查询范围</nz-form-label>
			
 
				           <nz-form-control [nzSpan]="20" nzErrorTip="请选择查询范围!">
			
 
				             <nz-radio-group formControlName="queryType" (ngModelChange)="changeQueryType($event)">
			
 
				-              <label nz-radio [nzValue]="1">全院查询</label>
			
 
				-              <label nz-radio [nzValue]="2">院区查询</label>
			
 
				-              <label nz-radio [nzValue]="3">部门查询</label>
			
 
				-              <label nz-radio [nzValue]="4">垂直部门查询</label>
			
 
				+              <label nz-radio [nzValue]="1" *ngIf="sign !== 'nurse'">全院查询</label>
			
 
				+              <label nz-radio [nzValue]="2" *ngIf="sign !== 'nurse'">院区查询</label>
			
 
				+              <label nz-radio [nzValue]="3" *ngIf="sign !== 'nurse'">部门查询</label>
			
 
				+              <label nz-radio [nzValue]="4" *ngIf="sign !== 'nurse'">垂直部门查询</label>
			
 
				+              <label nz-radio [nzValue]="5" *ngIf="sign === 'nurse'">申请科室查询</label>
			
 
				             </nz-radio-group>
			
 
				           </nz-form-control>
			
 
				         </nz-form-item>
			
@@ -41,16 +42,26 @@
 
				               </nz-option>
			
 
				             </nz-select>
			
 
				           </nz-form-control>
			
 
				+        </nz-form-item>
			
 
				+        <nz-form-item [hidden]="validateForm.value.queryType != 5">
			
 
				+          <nz-form-label nzRequired [nzSpan]="4">申请科室</nz-form-label>
			
 
				+          <nz-form-control [nzSpan]="20">{{currentDept.dept}}</nz-form-control>
			
 
				         </nz-form-item>
			
 
				 				<nz-form-item class="mb0" [ngStyle]="{ visibility: !hiddenParent ? 'visible' : 'hidden'}" style="visibility: hidden;">
			
 
				-				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
			
 
				-				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
			
 
				+				  <nz-form-label [nzSpan]="6" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
			
 
				+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否显示父级科室!">
			
 
				 				    <nz-radio-group formControlName="parent">
			
 
				 				      <label nz-radio [nzValue]="1">是</label>
			
 
				 				      <label nz-radio [nzValue]="0">否</label>
			
 
				 				    </nz-radio-group>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				+				<nz-form-item class="mb0" [ngStyle]="{ visibility: !hiddenDefaultDate ? 'visible' : 'hidden'}" style="visibility: hidden;">
			
 
				+				  <nz-form-label [nzSpan]="4" nzRequired nzFor="defaultDate">默认时间</nz-form-label>
			
 
				+				  <nz-form-control [nzSpan]="20" nzErrorTip="请选择默认时间!">
			
 
				+            <nz-range-picker [nzAllowClear]="false" formControlName="defaultDate" [nzAllowClear]='false'></nz-range-picker>
			
 
				+				  </nz-form-control>
			
 
				+				</nz-form-item>
			
 
				       </form>
			
 
				     </div>
			
 
				     <div class="display_flex justify-content_flex-center">
			
--- a/src/app/views/new-statistics/components/query-range/query-range.component.less
+++ b/src/app/views/new-statistics/components/query-range/query-range.component.less
@@ -82,19 +82,18 @@
 
				   // 新增
			
 
				   &.add {
			
 
				     .modalBody {
			
 
				-      width: 578px;
			
 
				+      width: 700px;
			
 
				       padding: 0 24px;
			
 
				 
			
 
				       .content {
			
 
				         width: 100%;
			
 
				-        min-height: 166px;
			
 
				         padding: 10px 24px 0;
			
 
				         height: auto;
			
 
				         overflow-y: auto;
			
 
				 
			
 
				         .addForm {
			
 
				           .ant-form-item {
			
 
				-            margin-bottom: 14px;
			
 
				+            margin-bottom: 8px;
			
 
				             .ant-form-item-label {
			
 
				               text-align: left;
			
 
				             }
			
--- a/src/app/views/new-statistics/components/query-range/query-range.component.ts
+++ b/src/app/views/new-statistics/components/query-range/query-range.component.ts
@@ -3,6 +3,8 @@ import { Component, OnInit, Output, Input } from '@angular/core';
 
				 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
			
 
				 import { EventEmitter } from '@angular/core';
			
 
				 import { MainService } from 'src/app/services/main.service';
			
 
				+import { DateService } from 'src/app/services/date.service';
			
 
				+import { startOfDay, endOfDay, format } from 'date-fns';
			
 
				 
			
 
				 @Component({
			
 
				   selector: 'app-query-range',
			
@@ -13,18 +15,32 @@ export class QueryRangeComponent implements OnInit {
 
				   @Output() submitQueryRange = new EventEmitter();
			
 
				   @Output() cancelQueryRange = new EventEmitter();
			
 
				   @Input() queryType: number;
			
 
				+  @Input() realQueryType: number;
			
 
				   @Input() hospital: any;
			
 
				   @Input() duty: any;
			
 
				 	@Input() parent: any;
			
 
				+	@Input() defaultDate: any = [];
			
 
				+	@Input() currentDeptDTO;
			
 
				+  // sign = largeScreen 大屏
			
 
				+  // sign = main 管理端
			
 
				+  // sign = nurse 护士端
			
 
				+	@Input() sign: any = '';
			
 
				 	@Input() hiddenParent: any = false;
			
 
				+	@Input() hiddenDefaultDate: any = false;
			
 
				   validateForm: FormGroup;//表单
			
 
				+  currentDept:any = {};//当前登录人所在科室
			
 
				   constructor(
			
 
				     private fb: FormBuilder,
			
 
				     private tool: ToolService,
			
 
				     private mainService: MainService,
			
 
				+    private dateService: DateService,
			
 
				   ) { }
			
 
				 
			
 
				   ngOnInit() {
			
 
				+    this.currentDept = this.tool.getCurrentUserDept();
			
 
				+
			
 
				+    console.log('this.sign:', this.sign)
			
 
				+
			
 
				     this.getHospitalList();
			
 
				     this.queryType == 3 && this.getDutyList(this.hospital.id);
			
 
				     this.getDutyOneList();
			
@@ -36,12 +52,15 @@ export class QueryRangeComponent implements OnInit {
 
				   }
			
 
				   // 初始化新增form表单
			
 
				   initForm() {
			
 
				+    let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
			
 
				+    let lastmonthenddate = this.dateService.date().lastMonthEndDate;
			
 
				     this.validateForm = this.fb.group({
			
 
				       queryType: [this.queryType, [Validators.required]],
			
 
				       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
			
 
				       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
			
 
				       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
			
 
				-			parent :[this.parent?1:0, [Validators.required]]
			
 
				+			parent :[this.parent?1:0, [Validators.required]],
			
 
				+      defaultDate: [this.defaultDate.length ? this.defaultDate : [lastmonthstartdate, lastmonthenddate], [Validators.required]],
			
 
				     });
			
 
				   }
			
 
				   // 表单提交
			
@@ -53,6 +72,8 @@ export class QueryRangeComponent implements OnInit {
 
				     if (this.validateForm.invalid) return;
			
 
				     let queryType = this.validateForm.value.queryType;
			
 
				 		let parent = this.validateForm.value.parent;
			
 
				+		let defaultDate = this.validateForm.value.defaultDate;
			
 
				+    let currentDeptDTO;
			
 
				     let hospital;
			
 
				     let duty;
			
 
				     switch (queryType) {
			
@@ -69,8 +90,11 @@ export class QueryRangeComponent implements OnInit {
 
				         hospital = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne).parent;
			
 
				         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
			
 
				         break;
			
 
				+      case 5:
			
 
				+        currentDeptDTO = this.currentDept;
			
 
				+        break;
			
 
				     }
			
 
				-    this.submitQueryRange.emit({queryType, hospital, duty, parent});
			
 
				+    this.submitQueryRange.emit({queryType, hospital, duty, parent, defaultDate, currentDeptDTO});
			
 
				     this.hideModal();
			
 
				   }
			
 
				 
			
@@ -184,5 +208,4 @@ export class QueryRangeComponent implements OnInit {
 
				       }
			
 
				     });
			
 
				   }
			
 
				-
			
 
				 }
			
--- a/src/app/views/new-statistics/components/search-more/search-more.component.html
+++ b/src/app/views/new-statistics/components/search-more/search-more.component.html
@@ -17,7 +17,7 @@
 
				             </nz-select>
			
 
				           </nz-form-control>
			
 
				         </nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.workHourSmall">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="workHourSmallId">工时小类</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择工时小类!">
			
@@ -31,7 +31,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				         <nz-form-item [hidden]="!fieldConfig.config.group">
			
 
				           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
			
 
				           <nz-form-control [nzSpan]="16" nzErrorTip="请选择维修分组!">
			
@@ -175,7 +175,7 @@
 
				         <nz-form-item [hidden]="!fieldConfig.config.repairDept">
			
 
				           <nz-form-label [nzSpan]="6" nzFor="repairDeptId">报修科室</nz-form-label>
			
 
				           <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修科室!">
			
 
				-            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
			
 
				+            <nz-select [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="repairDeptId" nzPlaceHolder="请选择报修科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
			
 
				               <ng-container *ngFor="let option of repairDeptList">
			
 
				                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				               </ng-container>
			
@@ -185,7 +185,7 @@
 
				             </nz-select>
			
 
				           </nz-form-control>
			
 
				         </nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.repairUser">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="repairUserId">报修人</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择报修人!">
			
@@ -199,7 +199,7 @@
 
				 				    </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]="16" nzErrorTip="请选择科室类型!">
			
@@ -213,7 +213,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评价</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择评价!">
			
@@ -227,7 +227,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.consumable">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="consumableId">耗材</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择耗材!">
			
@@ -241,7 +241,7 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.isHang">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="isHangId">是否挂起</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否挂起!">
			
@@ -252,14 +252,14 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.code">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单号</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请输入单号!">
			
 
				 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				-				
			
 
				+
			
 
				 				<nz-form-item [hidden]="!fieldConfig.config.overtime">
			
 
				 				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
			
 
				 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择超时工单!">
			
@@ -270,6 +270,20 @@
 
				 				    </nz-select>
			
 
				 				  </nz-form-control>
			
 
				 				</nz-form-item>
			
 
				+
			
 
				+        <nz-form-item [hidden]="!fieldConfig.config.priority">
			
 
				+				  <nz-form-label [nzSpan]="6" nzFor="priorityId">优先级</nz-form-label>
			
 
				+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择优先级!">
			
 
				+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="priorityId" nzPlaceHolder="请选择优先级" (nzOpenChange)="openChangePriority($event)">
			
 
				+				      <ng-container *ngFor="let option of priorityList">
			
 
				+				        <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">
			
--- a/src/app/views/new-statistics/components/search-more/search-more.component.ts
+++ b/src/app/views/new-statistics/components/search-more/search-more.component.ts
@@ -27,7 +27,7 @@ export class SearchMoreComponent implements OnInit {
 
				     private tool: ToolService,
			
 
				     private mainService: MainService,
			
 
				   ) { }
			
 
				-	
			
 
				+
			
 
				 	isHangList:any = [
			
 
				 		{name:'是',id:1},
			
 
				 		{name:'否',id:0}
			
@@ -36,7 +36,7 @@ export class SearchMoreComponent implements OnInit {
 
				 		{name:'是',id:1},
			
 
				 		{name:'否',id:0}
			
 
				 	]
			
 
				-	
			
 
				+
			
 
				   ngOnInit() {
			
 
				     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				       let fun = v[0];
			
@@ -70,7 +70,8 @@ export class SearchMoreComponent implements OnInit {
 
				 		this.repairUserList = this.fieldConfig.fields.repairUserDTO ? [this.fieldConfig.fields.repairUserDTO] : [];
			
 
				 		this.isHangList = [{name:'是',id:1},{name:'否',id:0}];
			
 
				 		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
			
 
				-		
			
 
				+		this.priorityList = this.fieldConfig.fields.priorityDTO ? [this.fieldConfig.fields.priorityDTO] : [];
			
 
				+
			
 
				 		this.validateForm = this.fb.group({
			
 
				       groupId: [this.fieldConfig.fields.groupId || null],
			
 
				       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
			
@@ -91,41 +92,42 @@ export class SearchMoreComponent implements OnInit {
 
				 			isHangId: [this.fieldConfig.fields.isHangDTO ? this.fieldConfig.fields.isHangDTO.id  : null],
			
 
				 			codeNum: [this.fieldConfig.fields.codeNum || null],
			
 
				 			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
			
 
				+			priorityId: [this.fieldConfig.fields.priorityId || null],
			
 
				 		});
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.groupId){
			
 
				 			this.getGroupList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.userId){
			
 
				 			this.getUserList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.category1DTO){
			
 
				 			this.getCategory1List();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.category2DTO){
			
 
				 			this.getCategory2List();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.category3DTO){
			
 
				 			this.getCategory3List();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.buildingId){
			
 
				 			this.getBuildingList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.floorId){
			
 
				 			this.getFloorList();
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.going && this.fieldConfig.fields.companyId){
			
 
				 			this.getCompanyList();
			
 
				 		}
			
 
				-		
			
 
				-		
			
 
				+
			
 
				+
			
 
				   }
			
 
				   // 表单提交
			
 
				   submitForm(): void {
			
@@ -195,38 +197,42 @@ export class SearchMoreComponent implements OnInit {
 
				 		  fields.deptTypeId = this.validateForm.value.deptTypeId;
			
 
				 		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
			
 
				 		}
			
 
				-		
			
 
				+		if(this.fieldConfig.config.priority){
			
 
				+		  fields.priorityId = this.validateForm.value.priorityId;
			
 
				+		  fields.priorityDTO = this.priorityList.find(item => item.id == this.validateForm.value.priorityId);
			
 
				+		}
			
 
				+
			
 
				 		if(this.fieldConfig.config.evaluate){
			
 
				 			fields.evaluateId = this.validateForm.value.evaluateId;
			
 
				 			fields.evaluateDTO = this.evaluateList.find(item => item.id == this.validateForm.value.evaluateId);
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.fieldConfig.config.repairUser){
			
 
				 			fields.repairUserId = this.validateForm.value.repairUserId;
			
 
				 			fields.repairUserDTO = this.repairUserList.find(item => item.id == this.validateForm.value.repairUserId);
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.fieldConfig.config.consumable){
			
 
				 			fields.consumableId = this.validateForm.value.consumableId;
			
 
				 			fields.consumableDTO = this.consumableList.find(item => item.id == this.validateForm.value.consumableId);
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.fieldConfig.config.isHang){
			
 
				 			fields.isHangId = this.validateForm.value.isHangId;
			
 
				 			fields.isHangDTO = this.isHangList.find(item => item.id == this.validateForm.value.isHangId);
			
 
				 		}
			
 
				-		
			
 
				-		
			
 
				+
			
 
				+
			
 
				 		if(this.fieldConfig.config.code){
			
 
				 			fields.codeNum = this.validateForm.value.codeNum;
			
 
				 			fields.codeNumDTO = this.validateForm.value.codeNum;
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(this.fieldConfig.config.overtime){
			
 
				 			fields.overtimeId = this.validateForm.value.overtimeId;
			
 
				 			fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
			
 
				 		}
			
 
				-				
			
 
				+
			
 
				     this.submitEvent.emit(fields);
			
 
				     this.hideModal();
			
 
				   }
			
@@ -312,6 +318,32 @@ export class SearchMoreComponent implements OnInit {
 
				 	    });
			
 
				 	}
			
 
				 
			
 
				+  // =================优先级===================
			
 
				+
			
 
				+	// 优先级
			
 
				+	openChangePriority(flag){
			
 
				+	  flag && this.getPriorityList();
			
 
				+	}
			
 
				+
			
 
				+	// 获取优先级列表
			
 
				+	priorityList:any[] = [];
			
 
				+	getPriorityList(keyword?) {
			
 
				+    let postData: any = {
			
 
				+      idx: 0,
			
 
				+      sum: 99999,
			
 
				+      priority: {},
			
 
				+    };
			
 
				+    this.isLoading = true;
			
 
				+    this.mainService.getFetchDataList("simple/data", "priority", postData).subscribe(result => {
			
 
				+      this.isLoading = false;
			
 
				+      if(result.status == 200){
			
 
				+        this.priorityList = result.list || [];
			
 
				+      }else{
			
 
				+        this.priorityList = [];
			
 
				+      }
			
 
				+    });
			
 
				+	}
			
 
				+
			
 
				   // =================维修人员===================
			
 
				 
			
 
				   // 维修人员搜索
			
@@ -668,14 +700,14 @@ export class SearchMoreComponent implements OnInit {
 
				     flag && this.setIsSelecting(false);
			
 
				     flag && this.getWorkHourParentList();
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// =================工时小类===================
			
 
				-	
			
 
				+
			
 
				 	// 工时小类搜索
			
 
				 	changeWorkHourSmallInp(e) {
			
 
				 	  this.searchTimer(this.getWorkHourSmallList, e);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取工时小类列表
			
 
				 	workHourSmallList:any[] = [];
			
 
				 	getWorkHourSmallList(keyword?){
			
@@ -711,10 +743,10 @@ export class SearchMoreComponent implements OnInit {
 
				 	  flag && this.setIsSelecting(false);
			
 
				 	  flag && this.getWorkHourSmallList();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================评价===================
			
 
				-	
			
 
				-	// 获取评价列表 
			
 
				+
			
 
				+	// 获取评价列表
			
 
				 	evaluateList:any[] = [];
			
 
				 	getWorkHourEvaluateList(){
			
 
				 		this.isLoading = true;
			
@@ -725,14 +757,14 @@ export class SearchMoreComponent implements OnInit {
 
				 		    this.evaluateList = data;
			
 
				 		  });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================申请人员===================
			
 
				-	
			
 
				+
			
 
				 	// 申请人员搜索
			
 
				 	changerepairUserInp(e) {
			
 
				 	  this.searchTimer(this.getrepairUserList, e);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取申请人员列表
			
 
				 	repairUserList:any[] = [];
			
 
				 	getrepairUserList(keyword = ''){
			
@@ -759,14 +791,14 @@ export class SearchMoreComponent implements OnInit {
 
				 	  flag && this.setIsSelecting(false);
			
 
				 	  flag && this.getrepairUserList();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// =================耗材===================
			
 
				-	
			
 
				+
			
 
				 	// 耗材搜索
			
 
				 	changeConsumableInp(e) {
			
 
				 	  this.searchTimer(this.getConsumableList, e);
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 获取耗材列表
			
 
				 	consumableList:any[] = [];
			
 
				 	getConsumableList(keyword = ''){
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.html
@@ -19,21 +19,23 @@
 
				   <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="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				-			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_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>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭工单</th>
			
 
				     </tr>
			
 
				   </thead>
			
 
				   <tbody>
			
 
				     <tr *ngFor="let data of listOfData">
			
 
				       <td>{{ data.name }}</td>
			
 
				       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				       <td>{{ data.totalGrade }}</td>
			
 
				 			<td>{{ data.totalPrice }}</td>
			
 
				       <td>{{ data.response_time_num }}</td>
			
@@ -48,15 +50,16 @@
 
				     <table class="footTable">
			
 
				       <tr *ngFor="let data of listOfDataEnd">
			
 
				         <td style="width: 10%">{{ data.name }}</td>
			
 
				-        <td style="width: 10%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
			
 
				-        <td style="width: 10%">{{ data.totalGrade }}</td>
			
 
				-				<td style="width: 10%">{{ data.totalPrice }}</td>
			
 
				-        <td style="width: 10%">{{ data.response_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%" class="text-sign" (click)="viewDetail2(data,'all')">{{ data.five_count }}</td>
			
 
				-        <td style="width: 10%" class="text-sign" (click)="viewDetail3(data,'all')">{{ data.special_close }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data,'all')">{{ data.emergency_count }}</td>
			
 
				+        <td style="width: 9%">{{ data.totalGrade }}</td>
			
 
				+				<td style="width: 9%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 9%">{{ data.response_time_num }}</td>
			
 
				+        <td style="width: 9%">{{ data.execution_time_num }}</td>
			
 
				+        <td style="width: 9%">{{ data.aveper }}</td>
			
 
				+        <td style="width: 9%">{{ data.total_time }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data,'all')">{{ data.five_count }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data,'all')">{{ data.special_close }}</td>
			
 
				       </tr>
			
 
				     </table>
			
 
				   </ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts
@@ -46,7 +46,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -54,10 +54,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -71,10 +70,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -84,7 +82,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				}
			
 
				 			}
			
 
				 		}
			
 
				-	
			
 
				+
			
 
				 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				 		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				 		flag && this.tabService.deleteRouteSnapshot(path);
			
@@ -93,17 +91,16 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -119,10 +116,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -134,7 +130,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				}
			
 
				 			}
			
 
				 		}
			
 
				-	
			
 
				+
			
 
				 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				 		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				 		flag && this.tabService.deleteRouteSnapshot(path);
			
@@ -143,17 +139,16 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -172,10 +167,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -190,7 +184,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 				}
			
 
				 			}
			
 
				 		}
			
 
				-	
			
 
				+
			
 
				 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				 		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				 		flag && this.tabService.deleteRouteSnapshot(path);
			
@@ -199,7 +193,61 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				+  viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+		}else{
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+
			
 
				+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+		flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+		this.router.navigate([path], { replaceUrl: true });
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -219,13 +267,16 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -246,6 +297,35 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -350,7 +430,13 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts
@@ -46,7 +46,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -54,10 +54,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				deptId: this.fieldConfig.fields.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO,
			
 
				-					deptId: this.fieldConfig.fields.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -77,10 +76,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: data.date + ' ' + '00:00:00' || undefined,
			
 
				 				endDate: data.date + ' ' + '23:59:59' || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO,
			
 
				-					deptId: this.fieldConfig.fields.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -98,7 +96,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, sublevel, type){
			
 
				 		let query = null
			
@@ -107,10 +105,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
			
 
				+        deptId: this.fieldConfig.fields.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO,
			
 
				-					deptId: this.fieldConfig.fields.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -131,10 +128,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 				startDate: data.date + ' ' + '00:00:00' || undefined,
			
 
				 				endDate: data.date + ' ' + '23:59:59' || undefined,
			
 
				 				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
			
 
				+        deptId: this.fieldConfig.fields.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO,
			
 
				-					deptId: this.fieldConfig.fields.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -152,7 +148,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -172,13 +168,16 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -199,6 +198,35 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -210,7 +238,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				   loading1 = false;
			
 
				   dictionaryList: any[] = [];
			
 
				   getList(num?: number, field?: string, sort?: string) {
			
 
				-    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
			
 
				+    this.mainService.getDictionary('list', 'statistics_date_type', true).subscribe((data) => {
			
 
				       this.dictionaryList = data || [];
			
 
				       // this.dictionaryList = cloneDeep(dictionaryList);
			
 
				       let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
			
@@ -317,7 +345,13 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html
@@ -30,23 +30,25 @@
 
				 <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%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				-			<th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				+      <th nzWidth="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+			<th nzWidth="8%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				     </tr>
			
 
				   </thead>
			
 
				   <tbody>
			
 
				     <tr *ngFor="let data of listOfData">
			
 
				       <td>{{ data.date }}</td>
			
 
				       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				       <td>{{ data.totalGrade }}</td>
			
 
				 			<td>{{ data.totalPrice }}</td>
			
 
				       <td>{{ data.response_time_num }}</td>
			
@@ -61,17 +63,18 @@
 
				   <ng-template #footerTpl>
			
 
				     <table class="footTable">
			
 
				       <tr *ngFor="let data of listOfDataEnd">
			
 
				-        <td style="width: 10%">{{ data.date }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				-        <td style="width: 9%">{{ data.totalGrade }}</td>
			
 
				-				<td style="width: 9%">{{ data.totalPrice }}</td>
			
 
				-        <td style="width: 9%">{{ data.response_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.arrive_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.execution_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.aveper }}</td>
			
 
				-        <td style="width: 9%">{{ data.total_time }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				+        <td style="width: 12%">{{ data.date }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
			
 
				+        <td style="width: 8%">{{ data.totalGrade }}</td>
			
 
				+				<td style="width: 8%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 8%">{{ data.response_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.arrive_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.execution_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.aveper }}</td>
			
 
				+        <td style="width: 8%">{{ data.total_time }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				       </tr>
			
 
				     </table>
			
 
				   </ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts
@@ -46,7 +46,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -55,10 +55,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -81,10 +80,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -104,7 +102,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
@@ -112,10 +110,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -140,10 +137,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -165,7 +161,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
@@ -173,10 +169,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -204,10 +199,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -232,7 +226,72 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				+  viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange',  [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
			
 
				+			this.tabService.setQueryParams('defRange', null);
			
 
				+			sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -252,13 +311,16 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -279,6 +341,35 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -390,7 +481,14 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				     this.statisticsTypeId = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      taskTypeId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html
@@ -4,8 +4,8 @@
 
				 
			
 
				 		<div class="searchDataItem">
			
 
				 		  <span class="label">科室</span>：
			
 
				-		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-		    <ng-container *ngFor="let option of alldepart">
			
 
				+		  <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($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>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts
@@ -63,22 +63,21 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item,
			
 
				-					deptId: this.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -109,10 +108,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 				query = {
			
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 					endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+          deptId: data.deptId,
			
 
				 					searchQuery:{
			
 
				 						statusValue: 'close',
			
 
				-						deptDTO: item,
			
 
				-						deptId: data.deptId,
			
 
				 						groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 						userId: this.fieldConfig.fields.userId || undefined,
			
@@ -131,23 +129,22 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 			});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, sublevel, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
			
 
				+        deptId: this.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item,
			
 
				-					deptId: this.deptId,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 					userId: this.fieldConfig.fields.userId || undefined,
			
@@ -179,10 +176,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 					endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 					statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
			
 
				+          deptId: data.deptId,
			
 
				 					searchQuery:{
			
 
				 						statusValue: 'close',
			
 
				-						deptDTO: item,
			
 
				-						deptId: data.deptId,
			
 
				 						groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				 						groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				 						userId: this.fieldConfig.fields.userId || undefined,
			
@@ -201,7 +197,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 			});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -222,14 +218,17 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				   parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-  	this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -250,6 +249,35 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -262,7 +290,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				   dictionaryList: any[] = [];
			
 
				 	widthValue:any;
			
 
				   getList(num?: number, field?: string, sort?: string) {
			
 
				-    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
			
 
				+    this.mainService.getDictionary('list', 'statistics_date_type', true).subscribe((data) => {
			
 
				      this.dictionaryList = data || [];
			
 
				      // this.dictionaryList = cloneDeep(dictionaryList);
			
 
				      let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
			
@@ -374,7 +402,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrentValue = "descend";
			
 
				 		this.sortCurrent = {totalCount: 'descend'};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : undefined;
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
@@ -404,7 +433,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	deptList:any[] = [];
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 	    department: {
			
@@ -419,7 +448,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.deptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				     <div class="searchDataItem">
			
 
				       <span class="label">科室</span>：
			
 
				-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-        <ng-container *ngFor="let option of alldepart">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($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>
			
@@ -34,15 +34,16 @@
 
				 				<th nzWidth="12%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
			
 
				 				<th [nzWidth]="parent==1 ? '8%' : '10%'" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
			
 
				 				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				-        <th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				-				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				+				<th [nzWidth]="parent==1 ? '8%' : '9%'" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+				<th [nzWidth]="parent==1 ? '8%' : '8%'" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				+        <th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+				<th [nzWidth]="parent==1 ? '7%' : '8%'" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				 			</tr>
			
 
				 		</thead>
			
 
				 		<tbody>
			
@@ -50,6 +51,7 @@
 
				 				<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
			
 
				 				<td>{{ data.name }}</td>
			
 
				 				<td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+				<td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				 				<td>{{ data.totalGrade }}</td>
			
 
				 				<td>{{ data.totalPrice }}</td>
			
 
				 				<td>{{ data.response_time_num }}</td>
			
@@ -68,15 +70,16 @@
 
				 					<td style="width: 10%" *ngIf="parent==0">{{ data.name }}</td>
			
 
				 					<td style="width: 8%" *ngIf="parent==1"></td>
			
 
				 					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.totalGrade }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.totalPrice }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.response_time_num }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.arrive_time_num }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.execution_time_num }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.aveper }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}">{{ data.total_time }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				-					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '8%' : '9%'}" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '8%' : '8%'}">{{ data.totalGrade }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.totalPrice }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.response_time_num }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.arrive_time_num }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.execution_time_num }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.aveper }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}">{{ data.total_time }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				+					<td [ngStyle]="{width: parent==1 ? '7%' : '8%'}" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				 				</tr>
			
 
				 			</table>
			
 
				 		</ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts
@@ -60,23 +60,22 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+				deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -112,10 +111,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 			      	startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 			      	endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 			      	statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 			      		statusValue: 'close',
			
 
				-			      		deptDTO: item || undefined,
			
 
				-			      		deptId: data.deptId || undefined,
			
 
				 			      		taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 			      		taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 			      		groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -137,22 +135,21 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 			  });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -190,10 +187,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -217,22 +213,21 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -273,10 +268,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -303,7 +297,91 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				+	viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		let item = null
			
 
				+		if(this.deptId){
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				+		}
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			let arr = data.name.split('(')
			
 
				+			let postData: any = {
			
 
				+			  idx: 0,
			
 
				+			  sum: 20,
			
 
				+			  department: {
			
 
				+			    dept: arr[0],
			
 
				+			    searchType: 1,
			
 
				+			  },
			
 
				+			};
			
 
				+			this.mainService.getFetchDataList("simple/data", "department", postData)
			
 
				+				.subscribe((res) => {
			
 
				+					if (res.status == 200) {
			
 
				+						let item = res.list.find(i =>i.id == data.deptId)
			
 
				+						query = {
			
 
				+							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				+							searchQuery:{
			
 
				+								statusValue: 'close',
			
 
				+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				+								groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+								userId: this.fieldConfig.fields.userId || undefined,
			
 
				+								userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+								buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+								emergencyTypeId: 300,
			
 
				+								emergencyTypeDTO: {
			
 
				+									"name": "是",
			
 
				+									"id": 300
			
 
				+								},
			
 
				+							}
			
 
				+						}
			
 
				+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+						let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+						flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+						sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+						this.router.navigate([path], { replaceUrl: true });
			
 
				+					}
			
 
				+				});
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -324,14 +402,17 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				   parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-  	this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -352,6 +433,35 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -462,7 +572,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 		this.sortCurrentValue = "descend";
			
 
				 		this.sortCurrent = {totalCount: 'descend'};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : undefined;
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
@@ -492,7 +603,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	deptList:any[] = [];
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 	    department: {
			
@@ -507,7 +618,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.deptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				     <div class="searchDataItem">
			
 
				       <span class="label">科室</span>：
			
 
				-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-        <ng-container *ngFor="let option of alldepart">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($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>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts
@@ -58,23 +58,22 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -110,10 +109,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 			      	startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 			      	endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 			      	statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 			      		statusValue: 'close',
			
 
				-			      		deptDTO: item || undefined,
			
 
				-			      		deptId: data.deptId || undefined,
			
 
				 			      		taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 			      		taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 			      		groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -135,22 +133,21 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 			  });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: data.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: data.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -194,10 +191,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -227,22 +223,21 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -286,10 +281,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -319,22 +313,21 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -378,10 +371,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -411,22 +403,21 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail5(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -470,10 +461,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -503,22 +493,21 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail6(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -562,10 +551,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -615,14 +603,17 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				   parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-  	this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -643,6 +634,35 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -762,7 +782,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 		this.sortCurrentValue = "descend";
			
 
				 		this.sortCurrent = {totalCount: 'descend'};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : undefined;
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
@@ -781,7 +802,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	deptList:any[] = [];
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 	    department: {
			
@@ -796,7 +817,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.deptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				     <div class="searchDataItem">
			
 
				       <span class="label">科室</span>：
			
 
				-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-        <ng-container *ngFor="let option of alldepart">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($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>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts
@@ -60,22 +60,21 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+				deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: data.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -116,10 +115,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+							deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -146,22 +144,21 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -202,10 +199,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -232,22 +228,21 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -288,10 +283,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -318,22 +312,21 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
 
				 		if(this.deptId){
			
 
				-			item = this.alldepart.find(i => i.id == this.deptId)
			
 
				+			item = this.deptList.find(i => i.id == this.deptId)
			
 
				 		}
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: item || undefined,
			
 
				-					deptId: this.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -374,10 +367,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: data.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: item || undefined,
			
 
				-								deptId: data.deptId || undefined,
			
 
				 								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -404,7 +396,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -425,14 +417,17 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				   parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-  	this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -453,6 +448,35 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -563,7 +587,8 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-		this.deptId = undefined;
			
 
				+		this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : undefined;
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
@@ -582,7 +607,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	deptList:any[] = [];
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 	    department: {
			
@@ -597,7 +622,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.deptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts
@@ -125,6 +125,15 @@ const routes: Routes = [
 
				 			    title: '配-人员评价统计'
			
 
				 			  }
			
 
				 			},
			
 
				+			{
			
 
				+			  // 人员效能统计
			
 
				+			  path: 'distributionPersonnelEffectivenessStatistics',
			
 
				+			  loadChildren: () => import('./distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.module').then(m => m.DistributionPersonnelEffectivenessStatisticsModule),
			
 
				+			  data: {
			
 
				+			    reuse: true,
			
 
				+			    title: '配-人员效能统计'
			
 
				+			  }
			
 
				+			},
			
 
				       {
			
 
				 			  // 24小时质控统计
			
 
				 			  path: 'hourQualityControlStatistics',
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics-routing.module.ts
@@ -0,0 +1,14 @@
 
				+import { NgModule } from '@angular/core';
			
 
				+import { Routes, RouterModule } from '@angular/router';
			
 
				+import { DistributionPersonnelEffectivenessStatisticsComponent } from './distribution-personnel-effectiveness-statistics.component';
			
 
				+
			
 
				+
			
 
				+const routes: Routes = [
			
 
				+  { path: '', component: DistributionPersonnelEffectivenessStatisticsComponent }
			
 
				+];
			
 
				+
			
 
				+@NgModule({
			
 
				+  imports: [RouterModule.forChild(routes)],
			
 
				+  exports: [RouterModule]
			
 
				+})
			
 
				+export class DistributionPersonnelEffectivenessStatisticsRoutingModule { }
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.html
@@ -0,0 +1,70 @@
 
				+<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-input-number [(ngModel)]="matchUserCouont" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
			
 
				+    </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 || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
			
 
				+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
			
 
				+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
			
 
				+  <span>{{fieldConfig.fields.deptDTO?.dept}}</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.5%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总量</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总量</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总价格</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="countWorker" [(nzSort)]="sortCurrent.countWorker">总人数</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">人均单量</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgGrade" [(nzSort)]="sortCurrent.avgGrade">人均积分</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgPrice" [(nzSort)]="sortCurrent.avgPrice">人均费用</th>
			
 
				+    </tr>
			
 
				+  </thead>
			
 
				+  <tbody>
			
 
				+    <tr *ngFor="let data of listOfData">
			
 
				+      <td>{{ data.date }}</td>
			
 
				+      <td>{{ data.totalCount }}</td>
			
 
				+      <td>{{ data.totalGrade }}</td>
			
 
				+      <td>{{ data.totalPrice }}</td>
			
 
				+      <td>{{ data.countWorker }}</td>
			
 
				+      <td>{{ data.avgCount }}</td>
			
 
				+      <td>{{ data.avgGrade }}</td>
			
 
				+      <td>{{ data.avgPrice }}</td>
			
 
				+    </tr>
			
 
				+  </tbody>
			
 
				+  <ng-template #footerTpl>
			
 
				+    <table class="footTable">
			
 
				+      <tr *ngFor="let data of listOfDataEnd">
			
 
				+        <td style="width: 12.5%">{{ data.date }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalGrade }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.countWorker }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgCount }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgGrade }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgPrice }}</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>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.less
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-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;
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.ts
@@ -0,0 +1,285 @@
 
				+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-distribution-personnel-effectiveness-statistics",
			
 
				+  templateUrl: "./distribution-personnel-effectiveness-statistics.component.html",
			
 
				+  styleUrls: ["./distribution-personnel-effectiveness-statistics.component.less"],
			
 
				+})
			
 
				+export class DistributionPersonnelEffectivenessStatisticsComponent 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; //表格总数据量
			
 
				+
			
 
				+  matchUserCouont:number = 1;//排除异常人员
			
 
				+
			
 
				+  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 || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
			
 
				+    return flag ? 37 : 0;
			
 
				+  }
			
 
				+
			
 
				+  // 初始化缓存数据
			
 
				+  queryType:any;
			
 
				+  hosId:any;
			
 
				+  dutyId:any;
			
 
				+  parentDutyId:any;
			
 
				+  async initSessionData(){
			
 
				+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				+    let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				+    let hosId:any = newStatistics.hospitalId;
			
 
				+    let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+
			
 
				+    queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : 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;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 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,
			
 
				+			matchUserCouont: this.matchUserCouont || undefined,
			
 
				+			buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.getHosId,
			
 
				+      groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
			
 
				+    };
			
 
				+    if (field && sort) {
			
 
				+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.loading1 = true;
			
 
				+    this.mainService
			
 
				+      .postCustom("itsm/report", "dateUserTransOrder", 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 = {
			
 
				+			matchUserCouont: this.matchUserCouont || undefined,
			
 
				+			buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.getHosId,
			
 
				+      groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
			
 
				+    };
			
 
				+    if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.mainService
			
 
				+      .postExportCustom("itsm/exportMergeTitle", "dateUserTransOrder", 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 = "totalCount";
			
 
				+		this.sortCurrentValue = "descend";
			
 
				+		this.sortCurrent = {totalCount: 'descend'};
			
 
				+    this.dateRange = []
			
 
				+    this.matchUserCouont = 1;
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      taskTypeId: undefined,
			
 
				+      statisticsTypeId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				+    this.customChangeDateComponent.resetByDate();
			
 
				+    setTimeout(_=>{
			
 
				+    	this.search();
			
 
				+    })
			
 
				+  }
			
 
				+
			
 
				+  // 详细搜索
			
 
				+  fieldConfig:any = {
			
 
				+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined},
			
 
				+    config: {groupAndUser: true, dept: true, building: true, taskType: true, statisticsType: 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();
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.module.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.module.ts
@@ -0,0 +1,23 @@
 
				+import { DistributionPersonnelEffectivenessStatisticsComponent } from './distribution-personnel-effectiveness-statistics.component';
			
 
				+import { NgModule } from '@angular/core';
			
 
				+import { CommonModule } from '@angular/common';
			
 
				+
			
 
				+import { DistributionPersonnelEffectivenessStatisticsRoutingModule } from './distribution-personnel-effectiveness-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: [
			
 
				+    DistributionPersonnelEffectivenessStatisticsComponent,
			
 
				+  ],
			
 
				+  imports: [
			
 
				+    CommonModule,
			
 
				+    DistributionPersonnelEffectivenessStatisticsRoutingModule,
			
 
				+    ShareModule,
			
 
				+    DistributionSearchMoreModule,
			
 
				+    CustomChangeDateModule,
			
 
				+  ]
			
 
				+})
			
 
				+export class DistributionPersonnelEffectivenessStatisticsModule { }
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.html
@@ -2,13 +2,24 @@
 
				 	<div class="searchDataWrap">
			
 
				 		<div class="searchData">
			
 
				 			<app-custom-change-date #customChangeDate [isShowType]="true" name="选择日期"></app-custom-change-date>
			
 
				+      <div class="searchDataItem">
			
 
				+        <span class="label">科室</span>：
			
 
				+        <nz-select class="selectItem" [nzDisabled]="queryType == 5" [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> 搜索中...
			
 
				+          </nz-option>
			
 
				+        </nz-select>
			
 
				+      </div>
			
 
				 		</div>
			
 
				 		<div class="operation">
			
 
				 			<button nz-button class="btn default" (click)="search()">搜索</button>
			
 
				 			<button nz-button class="btn default ml8" (click)="reset()">重置</button>
			
 
				 		</div>
			
 
				 	</div>
			
 
				-  <ng-container *ngIf="!isLoading">
			
 
				+  <ng-container *ngIf="!isLoading1">
			
 
				     <div class="top1-statistics">
			
 
				       <div class="top-list">
			
 
				         <div class="special-box cursor" (click)="viewDetail1()">
			
@@ -164,6 +175,6 @@
 
				     </div>
			
 
				   </ng-container>
			
 
				 </div>
			
 
				-<div class="mask-style" *ngIf="isLoading">
			
 
				+<div class="mask-style" *ngIf="isLoading1">
			
 
				 	<nz-spin nzSimple class="spin-style"></nz-spin>
			
 
				 </div>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.less
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.less
@@ -26,7 +26,10 @@
 
				 			margin-bottom: 8px;
			
 
				 		  .searchData{
			
 
				 		    padding: 16px;
			
 
				+				display: flex;
			
 
				+      	align-items: center;
			
 
				 		    .searchDataItem{
			
 
				+					margin-right: 24px;
			
 
				 		      .label{
			
 
				 		        font-size: 16px;
			
 
				 		      }
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.ts
@@ -3,6 +3,8 @@ import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core";
 
				 import { MainService } from 'src/app/services/main.service';
			
 
				 import { TabService } from '../../services/tab.service';
			
 
				 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
			
 
				+import { debounceTime } from 'rxjs/operators';
			
 
				+import { Subject } from 'rxjs';
			
 
				 @Component({
			
 
				   selector: "app-distribution-synthesize-statistics",
			
 
				   templateUrl: "./distribution-synthesize-statistics.component.html",
			
@@ -16,7 +18,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				     public router: Router,
			
 
				   ) {}
			
 
				 
			
 
				-	isLoading:Boolean = false;
			
 
				+	isLoading1:Boolean = false;
			
 
				 	workData:any = []; //工单统计
			
 
				 	businessData:any = []; //业务统计
			
 
				   listOfData: any[] = []; //表格数据
			
@@ -61,14 +63,24 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			name:'王'
			
 
				 		}
			
 
				 	] //人员top5
			
 
				-  ngOnInit() {}
			
 
				-	
			
 
				+  deptId;//科室id
			
 
				+
			
 
				+  searchTimerSubject = new Subject();
			
 
				+
			
 
				+  ngOnInit() {
			
 
				+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				+      let fun = v[0];
			
 
				+      fun.call(this, v[1]);
			
 
				+    });
			
 
				+  }
			
 
				+
			
 
				 	/*========= 数据下钻 ========*/
			
 
				-	
			
 
				+
			
 
				 	// 汇总
			
 
				 	viewDetail1(){
			
 
				 		let query = {
			
 
				 			isGdId: true,
			
 
				+      deptId: this.deptId,
			
 
				 		}
			
 
				 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				 		let flag = this.tabService.tabs.some(v => v.path === path);
			
@@ -78,13 +90,14 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 差评
			
 
				 	viewDetail4(){
			
 
				 		let query = {
			
 
				 			isGdId: true,
			
 
				 			startDate: this.customChangeDateComponent.startDate,
			
 
				 			endDate: this.customChangeDateComponent.endDate,
			
 
				+      deptId: this.deptId,
			
 
				 			searchQuery:{
			
 
				 				evaluateId: 358,
			
 
				 				evaluateDTO: {
			
@@ -104,7 +117,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 科室top5
			
 
				 	viewMaintain1(data){
			
 
				 		let postData: any = {
			
@@ -121,7 +134,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			let query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate,
			
 
				 				endDate: this.customChangeDateComponent.endDate,
			
 
				-				repairDeptId: data.deptId,
			
 
				+				deptId: data.deptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					deptDTO: item,
			
@@ -137,12 +150,13 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		});
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 人员top5
			
 
				 	viewMaintain2(data){
			
 
				 		let query = {
			
 
				 			startDate: this.customChangeDateComponent.startDate,
			
 
				 			endDate: this.customChangeDateComponent.endDate,
			
 
				+      deptId: this.deptId,
			
 
				 			searchQuery:{
			
 
				 				statusValue: 'close',
			
 
				 				userDTO: {
			
@@ -160,7 +174,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   ngAfterViewInit(){
			
 
				     setTimeout(() => {
			
 
				       this.search();
			
@@ -181,6 +195,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'sourceCount',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 		this.mainService
			
 
				 		  .getReportData(postData)
			
@@ -258,6 +273,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 	    businessType: 'hsms',
			
 
				 	    dateType: this.activeIndex,
			
 
				       statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 		this.mainService
			
 
				 		  .getReportData(postData)
			
@@ -342,6 +358,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'statisticsDateTypeTop5',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 		this.mainService
			
 
				 		  .getReportData(postData)
			
@@ -424,6 +441,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'deptTop5',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 	  this.mainService
			
 
				 	    .getReportData(postData)
			
@@ -440,11 +458,12 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'userTop5',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 	  this.mainService
			
 
				 	    .getReportData(postData)
			
 
				 	    .subscribe((result:any) => {
			
 
				-				this.isLoading = false;
			
 
				+				this.isLoading1 = false;
			
 
				 	      this.userTopData = result.data || [];
			
 
				 	    });
			
 
				 	}
			
@@ -472,13 +491,16 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -499,9 +521,38 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				 
			
 
				-		this.isLoading = true
			
 
				+		this.isLoading1 = true
			
 
				     this.getStatisticsTypeList();
			
 
				 		this.getWorkData();
			
 
				 		// this.getBusinessData();
			
@@ -545,6 +596,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'headerCount',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 	  this.mainService
			
 
				 	    .getReportData(postData)
			
@@ -561,6 +613,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 			type: 'businessCount',
			
 
				 	    hosId: this.getHosId,
			
 
				 	    businessType: 'hsms',
			
 
				+      deptId: this.deptId || undefined,
			
 
				 	  };
			
 
				 	  this.mainService
			
 
				 	    .getReportData(postData)
			
@@ -571,6 +624,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 
			
 
				 	// 重置
			
 
				 	reset(){
			
 
				+    this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : [];
			
 
				 		this.dateRange = [];
			
 
				 		this.activeIndex = 'day';
			
 
				     this.customChangeDateComponent.resetByDate();
			
@@ -580,6 +635,43 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 
				 		})
			
 
				 	}
			
 
				 
			
 
				+  // 科室搜索
			
 
				+  changeDeptInp(e) {
			
 
				+    this.searchTimer(this.getDeptList, e);
			
 
				+  }
			
 
				+
			
 
				+  // 防抖
			
 
				+  isLoading = false;
			
 
				+  searchTimer(fun, e) {
			
 
				+    this.isLoading = true;
			
 
				+    this.searchTimerSubject.next([fun, e]);
			
 
				+  }
			
 
				+
			
 
				+  openChangeDept(flag){
			
 
				+    flag && this.getDeptList();
			
 
				+  }
			
 
				+
			
 
				+  // 获取科室列表
			
 
				+  deptList:any[] = [];
			
 
				+  getDeptList(keyword?) {
			
 
				+    let data = {
			
 
				+      department: {
			
 
				+        statisticalHosId: this.getHosId,
			
 
				+        dept: keyword,
			
 
				+        searchType: 1,
			
 
				+      },
			
 
				+      idx: 0,
			
 
				+      sum: 20,
			
 
				+    };
			
 
				+    this.isLoading = true;
			
 
				+    this.mainService
			
 
				+      .getFetchDataList("data", "department", data)
			
 
				+      .subscribe((data) => {
			
 
				+        this.isLoading = false;
			
 
				+        this.deptList = data.list;
			
 
				+      });
			
 
				+  }
			
 
				+
			
 
				   // 搜索
			
 
				   search() {
			
 
				 		this.initSessionData();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.ts
@@ -76,13 +76,16 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -103,6 +106,35 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -212,7 +244,14 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
 
				 		this.sortCurrent = {totalCount: 'descend'};
			
 
				     this.dateRange = []
			
 
				     this.userId = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      taskTypeId: undefined,
			
 
				+      statisticsTypeId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.html
@@ -30,23 +30,25 @@
 
				 <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%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				 			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				 			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				       <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				       <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				     </tr>
			
 
				   </thead>
			
 
				   <tbody>
			
 
				     <tr *ngFor="let data of listOfData">
			
 
				       <td>{{ data.date }}</td>
			
 
				       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				       <td>{{ data.avgCount }}</td>
			
 
				       <td>{{ data.totalGrade }}</td>
			
 
				       <td>{{ data.response_time_num }}</td>
			
@@ -61,17 +63,18 @@
 
				   <ng-template #footerTpl>
			
 
				     <table class="footTable">
			
 
				       <tr *ngFor="let data of listOfDataEnd">
			
 
				-        <td style="width: 10%">{{ data.date }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				-        <td style="width: 9%">{{ data.avgCount }}</td>
			
 
				-        <td style="width: 9%">{{ data.totalGrade }}</td>
			
 
				+        <td style="width: 8%">{{ data.date }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
			
 
				+        <td style="width: 8%">{{ data.avgCount }}</td>
			
 
				+        <td style="width: 8%">{{ data.totalGrade }}</td>
			
 
				         <td style="width: 9%">{{ data.response_time_num }}</td>
			
 
				         <td style="width: 9%">{{ data.arrive_time_num }}</td>
			
 
				         <td style="width: 9%">{{ data.execution_time_num }}</td>
			
 
				         <td style="width: 9%">{{ data.aveper }}</td>
			
 
				-        <td style="width: 9%">{{ data.total_time }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				-        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				+        <td style="width: 8%">{{ data.total_time }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				       </tr>
			
 
				     </table>
			
 
				   </ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.ts
@@ -49,7 +49,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -58,10 +58,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -77,10 +76,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -105,7 +103,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
@@ -113,10 +111,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -134,10 +131,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: data.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -164,7 +160,7 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		if(type=='all'){
			
@@ -172,10 +168,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -196,10 +191,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -229,7 +223,70 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				+  viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+		}else{
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.statisticsTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+					timeFrameId: data.date || undefined,
			
 
				+					timeFrameDTO:{
			
 
				+						"name": data.date,
			
 
				+						"id": data.date
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+		flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+		this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+		this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+		sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+		this.router.navigate([path], { replaceUrl: true });
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -249,13 +306,16 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -276,6 +336,35 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -385,7 +474,14 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				     this.statisticsTypeId = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      taskTypeId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.html
@@ -20,7 +20,7 @@
 
				     <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 || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.emergencyTypeDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
			
 
				 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				 	<span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				 	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
			
@@ -34,6 +34,7 @@
 
				 	<span>{{fieldConfig.fields.evaluateDTO?.name}}</span>
			
 
				 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
			
 
				 	<span>{{fieldConfig.fields.timeFrameDTO?.name}}</span>
			
 
				+	<span>{{fieldConfig.fields.emergencyTypeDTO?.name}}</span>
			
 
				 </div>
			
 
				 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
			
 
				   <thead>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.ts
@@ -28,27 +28,25 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   pageSize: number = 10; //表格每页展示条数
			
 
				   listLength: number = 0; //表格总数据量
			
 
				 
			
 
				-  repairDeptId;//报修科室id
			
 
				-
			
 
				   searchTimerSubject = new Subject();
			
 
				-	
			
 
				+
			
 
				   ngOnInit() {
			
 
				-		// 数据下钻搜索
			
 
				-		this.getRouteQuery()
			
 
				     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				       let fun = v[0];
			
 
				       fun.call(this, v[1]);
			
 
				     });
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	ngOnDestroy(){
			
 
				 		console.log(12122121)
			
 
				 		this.fieldConfig.fields = {}
			
 
				 		sessionStorage.removeItem('distributionData')
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   ngAfterViewInit(){
			
 
				     this.initSessionData();
			
 
				+    // 数据下钻搜索
			
 
				+		this.getRouteQuery()
			
 
				     this.onResize(0);
			
 
				   }
			
 
				 
			
@@ -60,16 +58,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	goingType:boolean = false;
			
 
				 	gdStateId:any = null;
			
 
				-	getRouteQuery(){
			
 
				+	async getRouteQuery(){
			
 
				 		let data = sessionStorage.getItem('distributionData')
			
 
				 		let query = null
			
 
				 		if(data){
			
 
				 			query = JSON.parse(data)
			
 
				 			console.log('query==========',query)
			
 
				-			setTimeout(_=>{
			
 
				+			// setTimeout(_=>{
			
 
				 				// 统计分类
			
 
				 				if(query.statisticsTypeId){
			
 
				 					this.getStatisticsTypeList();
			
@@ -77,6 +75,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 				}else{
			
 
				 					this.statisticsTypeId = undefined
			
 
				 				}
			
 
				+
			
 
				 				if(query.searchQuery){
			
 
				 					this.goingType = true
			
 
				 					this.fieldConfig.fields = query.searchQuery
			
@@ -84,21 +83,38 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 					this.goingType = false
			
 
				 					this.fieldConfig.fields = {}
			
 
				 				}
			
 
				+
			
 
				+        if(query.deptId){
			
 
				+          this.fieldConfig.fields.deptId = query.deptId
			
 
				+          let postData = {
			
 
				+            department: {
			
 
				+              id: query.deptId,
			
 
				+              searchType: 1,
			
 
				+            },
			
 
				+            idx: 0,
			
 
				+            sum: 1,
			
 
				+          };
			
 
				+          let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+          this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+        }else{
			
 
				+          this.fieldConfig.fields.deptId = undefined
			
 
				+        }
			
 
				+
			
 
				 				if(!query.isGdId){
			
 
				 					this.gdStateId = '73,74'
			
 
				 				}else{
			
 
				 					this.gdStateId = undefined;
			
 
				 				}
			
 
				 				this.getQueryParams(query);
			
 
				-			},50)
			
 
				+			// },50)
			
 
				 		}else{
			
 
				 			this.gdStateId = undefined;
			
 
				-			setTimeout(_=>{
			
 
				+			// setTimeout(_=>{
			
 
				 				this.getQueryParams('');
			
 
				-			},50)
			
 
				+			// },50)
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(query){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				 		console.log(43434343,queryParams)
			
@@ -121,11 +137,11 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   }
			
 
				 
			
 
				   get getMoreFilter(){
			
 
				-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || 
			
 
				-		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || 
			
 
				-		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  || 
			
 
				-		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
			
 
				-		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
			
 
				+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO ||
			
 
				+		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO ||
			
 
				+		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  ||
			
 
				+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO ||
			
 
				+		this.fieldConfig.fields.companyDTO;
			
 
				     return flag ? 37 : 0;
			
 
				   }
			
 
				 
			
@@ -134,13 +150,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -161,6 +180,35 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -190,6 +238,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 			sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				 			minutesClose: this.fieldConfig.fields.minuteClose || undefined,
			
 
				 			specialCloseFlag: this.fieldConfig.fields.specialId,
			
 
				+			emergencyType: this.fieldConfig.fields.emergencyTypeId,
			
 
				 			// timeout: this.fieldConfig.fields.overtimeId,
			
 
				 			// abnormityType: this.fieldConfig.fields.abnormalId,
			
 
				 			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
			
@@ -248,6 +297,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     	sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				     	minutesClose: this.fieldConfig.fields.minuteClose || undefined,
			
 
				     	specialCloseFlag: this.fieldConfig.fields.specialId,
			
 
				+    	emergencyType: this.fieldConfig.fields.emergencyTypeId,
			
 
				     	// timeout: this.fieldConfig.fields.overtimeId,
			
 
				     	// abnormityType: this.fieldConfig.fields.abnormalId,
			
 
				     	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
			
@@ -286,7 +336,15 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     this.dateRange = []
			
 
				     this.statisticsTypeId = undefined;
			
 
				 		this.gdStateId = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      categoryId: undefined,
			
 
				+      sourceId: undefined,
			
 
				+      hierarchy: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('distributionData');
			
 
				 		setTimeout(_=>{
			
@@ -301,7 +359,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     this.isLoading = true;
			
 
				     this.searchTimerSubject.next([fun, e]);
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 查看工单详情
			
 
				 	coopData:any;
			
 
				 	detailModalShow = false; //弹窗开关
			
@@ -327,7 +385,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   getStatisticsTypeList() {
			
 
				     this.isLoading = true;
			
 
				     this.mainService
			
 
				-      .getDictionary("list", "statistics_date_type")
			
 
				+      .getDictionary("list", "statistics_date_type", true)
			
 
				       .subscribe((data) => {
			
 
				 				this.statisticsTypeList = []
			
 
				         this.isLoading = false;
			
@@ -343,8 +401,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, overtimeId: undefined, abnormalId: undefined, evaluateId: undefined, codeNum: undefined, timeFrameId: undefined, groupId: undefined, userId: undefined, buildingId: undefined},
			
 
				-		config: { dept: true, taskType: true, source: true, minute: true, special: true, overtime: true, abnormal: true, evaluate: true, code: true, timeFrame: true, groupAndUser: true, building: true},
			
 
				+		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, emergencyTypeId: undefined, overtimeId: undefined, abnormalId: undefined, evaluateId: undefined, codeNum: undefined, timeFrameId: undefined, groupId: undefined, userId: undefined, buildingId: undefined},
			
 
				+		config: { dept: true, taskType: true, source: true, minute: true, special: true, emergencyType: true, overtime: true, abnormal: true, evaluate: true, code: true, timeFrame: true, groupAndUser: true, building: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.html
@@ -3,7 +3,7 @@
 
				     <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)="changeDeptInp($event)" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" (nzOpenChange)="openChangeDept($event)">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [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>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.ts
@@ -74,13 +74,16 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -101,6 +104,35 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.deptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -209,7 +241,8 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.deptId = this.queryType == 5 ? this.deptId : undefined;
			
 
				+    this.deptList = this.queryType == 5 ? this.deptList : undefined;
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.html
@@ -30,21 +30,23 @@
 
				   <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>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				+			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				     </tr>
			
 
				   </thead>
			
 
				   <tbody>
			
 
				     <tr *ngFor="let data of listOfData">
			
 
				       <td>{{ data.taskName }}</td>
			
 
				       <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				       <td>{{ data.totalGrade }}</td>
			
 
				       <td>{{ data.response_time_num }}</td>
			
 
				       <td>{{ data.arrive_time_num }}</td>
			
@@ -59,15 +61,16 @@
 
				     <table class="footTable">
			
 
				       <tr *ngFor="let data of listOfDataEnd">
			
 
				         <td style="width: 10%">{{ data.taskName }}</td>
			
 
				-        <td style="width: 10%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ 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%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				-        <td style="width: 10%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
			
 
				+        <td style="width: 9%">{{ data.totalGrade }}</td>
			
 
				+        <td style="width: 9%">{{ data.response_time_num }}</td>
			
 
				+        <td style="width: 9%">{{ data.arrive_time_num }}</td>
			
 
				+        <td style="width: 9%">{{ data.execution_time_num }}</td>
			
 
				+        <td style="width: 9%">{{ data.aveper }}</td>
			
 
				+        <td style="width: 9%">{{ data.total_time }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.five_count }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.special_close }}</td>
			
 
				       </tr>
			
 
				     </table>
			
 
				   </ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts
@@ -57,7 +57,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -69,10 +69,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.taskTypeId || undefined,
			
 
				 					taskTypeDTO: item,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -107,10 +106,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 			      query = {
			
 
				 			      	startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 			      	endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+              deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 			      	searchQuery:{
			
 
				 			      		statusValue: 'close',
			
 
				-			      		deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-			      		deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 			      		taskTypeId: data.taskTypeId || undefined,
			
 
				 			      		taskTypeDTO: item,
			
 
				 			      		groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -132,7 +130,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 			  });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
@@ -144,10 +142,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				taskTypeId: this.taskTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.taskTypeId || undefined,
			
 
				 					taskTypeDTO: item,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -184,10 +181,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 						query = {
			
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+              deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-								deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 								taskTypeId: data.taskTypeId || undefined,
			
 
				 								taskTypeDTO: item,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -211,7 +207,7 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
 
				 		let item = null
			
@@ -223,10 +219,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 				taskTypeId: this.taskTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				-					deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-					deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 					taskTypeId: this.taskTypeId || undefined,
			
 
				 					taskTypeDTO: item,
			
 
				 					groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -266,10 +261,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 						query = {
			
 
				 							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+              deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 							searchQuery:{
			
 
				 								statusValue: 'close',
			
 
				-								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
			
 
				-								deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				 								taskTypeId: data.taskTypeId || undefined,
			
 
				 								taskTypeDTO: item,
			
 
				 								groupId: this.fieldConfig.fields.groupId || undefined,
			
@@ -296,7 +290,90 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 				});
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				+	viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		let item = null
			
 
				+		if(this.taskTypeId){
			
 
				+			item = this.taskTypeList.find(i => i.id == this.taskTypeId)
			
 
				+		}
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				taskTypeId: this.taskTypeId || undefined,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.taskTypeId || undefined,
			
 
				+					taskTypeDTO: item,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			let arr = data.taskName.split('-');
			
 
				+			let postData = {
			
 
				+			  idx: 0,
			
 
				+			  sum: 10,
			
 
				+			  taskType: {
			
 
				+			    taskName: arr[arr.length-1],
			
 
				+			  },
			
 
				+			};
			
 
				+			this.mainService
			
 
				+				.getFetchDataList("configuration", "taskType", postData)
			
 
				+				.subscribe((res) => {
			
 
				+					if (res.status == 200) {
			
 
				+						let item = res.list.find(i =>i.id == data.taskTypeId)
			
 
				+						query = {
			
 
				+							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+              deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+							searchQuery:{
			
 
				+								statusValue: 'close',
			
 
				+								taskTypeId: data.taskTypeId || undefined,
			
 
				+								taskTypeDTO: item,
			
 
				+								groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+								userId: this.fieldConfig.fields.userId || undefined,
			
 
				+								userDTO: this.fieldConfig.fields.userDTO || undefined,
			
 
				+								buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+								emergencyTypeId: 300,
			
 
				+								emergencyTypeDTO: {
			
 
				+									"name": "是",
			
 
				+									"id": 300
			
 
				+								},
			
 
				+							}
			
 
				+						}
			
 
				+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+						let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+						flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+						sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+						this.router.navigate([path], { replaceUrl: true });
			
 
				+					}
			
 
				+				});
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -316,13 +393,16 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -343,6 +423,35 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -450,7 +559,13 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				     this.taskTypeId = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts
@@ -76,13 +76,16 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -103,6 +106,35 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -114,7 +146,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				   loading1 = false;
			
 
				   dictionaryList: any[] = [];
			
 
				   getList(num?: number, field?: string, sort?: string) {
			
 
				-    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
			
 
				+    this.mainService.getDictionary('list', 'statistics_date_type', true).subscribe((data) => {
			
 
				       let dictionaryList = data || [];
			
 
				       dictionaryList = cloneDeep(dictionaryList);
			
 
				       let flag = dictionaryList.some((item) => item.value === 'dateOther');
			
@@ -217,7 +249,12 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrent = {totalCount: 'descend'};
			
 
				     this.dateRange = []
			
 
				     this.userId = undefined;
			
 
				-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      buildingId: undefined,
			
 
				+      groupId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html
@@ -28,23 +28,25 @@
 
				 <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="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				-			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				+      <th nzWidth="12%">人员(编码)</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="emergency_count" [(nzSort)]="sortCurrent.emergency_count">加急工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
			
 
				+			<th nzWidth="8%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
			
 
				+      <th nzWidth="8%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
			
 
				     </tr>
			
 
				   </thead>
			
 
				   <tbody>
			
 
				     <tr *ngFor="let data of listOfData">
			
 
				       <td>{{ data.name }}</td>
			
 
				       <td>{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.emergency_count }}</td>
			
 
				       <td>{{ data.totalGrade }}</td>
			
 
				 			<td>{{ data.totalPrice }}</td>
			
 
				       <td>{{ data.response_time_num }}</td>
			
@@ -59,17 +61,18 @@
 
				   <ng-template #footerTpl>
			
 
				     <table class="footTable">
			
 
				       <tr *ngFor="let data of listOfDataEnd">
			
 
				-        <td style="width: 10%">{{ data.name }}</td>
			
 
				-        <td style="width: 9%">{{ data.totalCount }}</td>
			
 
				-        <td style="width: 9%">{{ data.totalGrade }}</td>
			
 
				-				<td style="width: 9%">{{ data.totalPrice }}</td>
			
 
				-        <td style="width: 9%">{{ data.response_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.arrive_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.execution_time_num }}</td>
			
 
				-        <td style="width: 9%">{{ data.aveper }}</td>
			
 
				-        <td style="width: 9%">{{ data.total_time }}</td>
			
 
				-        <td style="width: 9%">{{ data.five_count }}</td>
			
 
				-        <td style="width: 9%">{{ data.special_close }}</td>
			
 
				+        <td style="width: 12%">{{ data.name }}</td>
			
 
				+        <td style="width: 8%">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 8%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.emergency_count }}</td>
			
 
				+        <td style="width: 8%">{{ data.totalGrade }}</td>
			
 
				+				<td style="width: 8%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 8%">{{ data.response_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.arrive_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.execution_time_num }}</td>
			
 
				+        <td style="width: 8%">{{ data.aveper }}</td>
			
 
				+        <td style="width: 8%">{{ data.total_time }}</td>
			
 
				+        <td style="width: 8%">{{ data.five_count }}</td>
			
 
				+        <td style="width: 8%">{{ data.special_close }}</td>
			
 
				       </tr>
			
 
				     </table>
			
 
				   </ng-template>
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.less
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.less
@@ -5,6 +5,10 @@
 
				   right: 0;
			
 
				   bottom: 0;
			
 
				   left: 0;
			
 
				+  .text-sign{
			
 
				+		text-decoration: underline;
			
 
				+		cursor: pointer;
			
 
				+	}
			
 
				   ::ng-deep .ant-table-footer{
			
 
				     padding: 16px 0;
			
 
				     width: calc(100% - 15px);
			
--- a/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.ts
+++ b/src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.ts
@@ -4,7 +4,7 @@ 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 { ActivatedRoute, Router } from '@angular/router';
			
 
				 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
			
 
				 @Component({
			
 
				   selector: "app-user-quality-control-statistics",
			
@@ -18,6 +18,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				     private message: NzMessageService,
			
 
				     private route: ActivatedRoute,
			
 
				     private tabService: TabService,
			
 
				+    private router: Router,
			
 
				   ) {}
			
 
				 
			
 
				   listOfData: any[] = []; //表格数据
			
@@ -55,6 +56,90 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				     }, 0)
			
 
				   }
			
 
				 
			
 
				+  viewDetail4(data, type){
			
 
				+		let query = null
			
 
				+		let item = null
			
 
				+		if(this.userId){
			
 
				+			item = this.userList.find(i => i.id == this.userId)
			
 
				+		}
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+        deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO || undefined,
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+					userId: this.userId || undefined,
			
 
				+					userDTO: item || undefined,
			
 
				+					buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+					emergencyTypeId: 300,
			
 
				+					emergencyTypeDTO: {
			
 
				+						"name": "是",
			
 
				+						"id": 300
			
 
				+					},
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			let arr = data.name.split('(')
			
 
				+			let postData: any = {
			
 
				+			  idx: 0,
			
 
				+			  sum: 20,
			
 
				+			  department: {
			
 
				+			    dept: arr[0],
			
 
				+			    searchType: 1,
			
 
				+			  },
			
 
				+			};
			
 
				+			this.mainService.getFetchDataList("simple/data", "department", postData)
			
 
				+				.subscribe((res) => {
			
 
				+					if (res.status == 200) {
			
 
				+						let item = res.list.find(i =>i.id == data.deptId)
			
 
				+						query = {
			
 
				+							startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+							endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
			
 
				+              deptId: this.fieldConfig.fields.deptId || undefined,
			
 
				+							searchQuery:{
			
 
				+								statusValue: 'close',
			
 
				+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
			
 
				+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
			
 
				+								groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
			
 
				+								userId: data.userId || undefined,
			
 
				+								userDTO: item || undefined,
			
 
				+								buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+								buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
			
 
				+								emergencyTypeId: 300,
			
 
				+								emergencyTypeDTO: {
			
 
				+									"name": "是",
			
 
				+									"id": 300
			
 
				+								},
			
 
				+							}
			
 
				+						}
			
 
				+						let path = '/newStatistics/distributionInspectionStatistics/incidentList'
			
 
				+						let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+						flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+						this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+						sessionStorage.setItem('distributionData', JSON.stringify(query))
			
 
				+						this.router.navigate([path], { replaceUrl: true });
			
 
				+					}
			
 
				+				});
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -74,13 +159,16 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -101,6 +189,35 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.deptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.deptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -206,7 +323,12 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrent = {totalGrade: 'descend'};
			
 
				     this.dateRange = []
			
 
				     this.userId = undefined;
			
 
				-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      buildingId: undefined,
			
 
				+      groupId: undefined,
			
 
				+      deptId: this.queryType == 5 ? this.fieldConfig.fields.deptId : undefined,
			
 
				+      deptDTO: this.queryType == 5 ? this.fieldConfig.fields.deptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
--- a/src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.html
@@ -9,10 +9,11 @@
 
				     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
			
 
				   </div>
			
 
				 </div>
			
 
				-<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.repairDeptDTO">
			
 
				   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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>
			
--- a/src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts
@@ -63,13 +63,16 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -90,6 +93,35 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -113,6 +145,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (field && sort) {
			
 
				       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
@@ -161,6 +194,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
@@ -194,7 +228,11 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {category123: true};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      categoryId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
@@ -206,8 +244,8 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-    fields: {categoryId: undefined},
			
 
				-    config: {category123: true},
			
 
				+    fields: {categoryId: undefined, repairDeptId: undefined},
			
 
				+    config: {category123: true, repairDept: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts
@@ -45,7 +45,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -106,7 +106,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -177,7 +177,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -248,7 +248,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -320,7 +320,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 				}
			
 
				 			}
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		let path = '/newStatistics/maintenanceStatistics/incidentList'
			
 
				 		let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				 		flag && this.tabService.deleteRouteSnapshot(path);
			
@@ -329,7 +329,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -349,13 +349,16 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -376,13 +379,42 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
 
				   get getHosId(){
			
 
				     return this.parentDutyId || this.dutyId || this.hosId;
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 获取一级分类列表
			
 
				 	category1List:any[] = [];
			
 
				 	getCategory1List(keyword?) {
			
@@ -402,7 +434,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 	      this.category1List = data.data;
			
 
				 	    });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   // 表格数据
			
 
				   loading1 = false;
			
 
				   getList(num?: number, field?: string, sort?: string) {
			
@@ -512,7 +544,15 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      companyId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
 
				     setTimeout(_=>{
			
--- a/src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.html
@@ -9,7 +9,7 @@
 
				     <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.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.repairDeptDTO">
			
 
				   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				   <span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
@@ -17,6 +17,7 @@
 
				   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
			
 
				   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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>
			
--- a/src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts
@@ -63,13 +63,16 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -90,6 +93,35 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -117,6 +149,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				       buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				       placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (field && sort) {
			
 
				       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
@@ -169,6 +202,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				       buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				       placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
@@ -202,7 +236,15 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      categoryId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
@@ -214,8 +256,8 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined},
			
 
				-    config: {groupAndUser: true, category123: true, buildingAndFloor: true},
			
 
				+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined},
			
 
				+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, repairDept: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts
@@ -55,7 +55,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -145,7 +145,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else if(item1){
			
 
				 				let category1 = null
			
 
				 				let category2 = null
			
@@ -188,7 +188,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else{
			
 
				 				query = {
			
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
@@ -227,7 +227,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -323,7 +323,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else if(item1){
			
 
				 				let category1 = null
			
 
				 				let category2 = null
			
@@ -371,7 +371,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else{
			
 
				 				query = {
			
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
@@ -415,7 +415,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -511,7 +511,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else if(item1){
			
 
				 				let category1 = null
			
 
				 				let category2 = null
			
@@ -559,7 +559,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else{
			
 
				 				query = {
			
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
@@ -603,7 +603,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -709,7 +709,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else if(item1){
			
 
				 				let category1 = null
			
 
				 				let category2 = null
			
@@ -762,7 +762,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 						this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				 						sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 						this.router.navigate([path], { replaceUrl: true });
			
 
				-				});	
			
 
				+				});
			
 
				 			}else{
			
 
				 				query = {
			
 
				 					startDate: this.customChangeDateComponent.startDate || undefined,
			
@@ -811,7 +811,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -831,13 +831,16 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -858,6 +861,35 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -978,7 +1010,15 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
				     this.dateRange = []
			
 
				     this.category1Id = undefined;
			
 
				     this.category2Id = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      companyId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
 
				     setTimeout(_=>{
			
--- a/src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts
@@ -55,7 +55,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null;
			
@@ -63,7 +63,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 		if(this.category1Id){
			
 
				 		  item = this.category1List.find(item => item.id == this.category1Id);
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				 		if(type=='all'){
			
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
@@ -172,7 +172,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -303,7 +303,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -434,7 +434,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -580,7 +580,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -600,13 +600,16 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -627,6 +630,35 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -746,7 +778,15 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				     this.category1Id = undefined;
			
 
				-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      companyId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
 
				     setTimeout(_=>{
			
--- a/src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html
@@ -3,7 +3,7 @@
 
				     <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)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
			
 
				         <ng-container *ngFor="let option of repairDeptList">
			
 
				           <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				         </ng-container>
			
--- a/src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts
@@ -74,13 +74,16 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -101,6 +104,35 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -217,7 +249,8 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.repairDeptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				     <div class="searchDataItem">
			
 
				       <span class="label">科室</span>：
			
 
				-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-        <ng-container *ngFor="let option of alldepart">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="repairDeptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				+        <ng-container *ngFor="let option of repairDeptList">
			
 
				           <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				         </ng-container>
			
 
				         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts
@@ -31,7 +31,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				   listLength: number = 0; //表格总数据量
			
 
				 	hospital:any;
			
 
				 	deptTypeId;//科室类型id
			
 
				-	deptId;
			
 
				+	repairDeptId;
			
 
				 	searchTimerSubject = new Subject();
			
 
				 
			
 
				   ngOnInit() {
			
@@ -60,7 +60,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -68,7 +68,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -124,7 +124,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -132,7 +132,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20424,
			
@@ -208,7 +208,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -216,7 +216,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20423,
			
@@ -292,7 +292,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -300,7 +300,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20422,
			
@@ -376,7 +376,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail5(data, type){
			
 
				 		let query = null
			
@@ -384,7 +384,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20421,
			
@@ -460,7 +460,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail6(data, type){
			
 
				 		let query = null
			
@@ -468,7 +468,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId || undefined,
			
 
				+				repairDeptId: this.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20420,
			
@@ -517,7 +517,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -538,14 +538,17 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				 	parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-		this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -566,6 +569,35 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -590,7 +622,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				       endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				       hosId: this.hosId || undefined,
			
 
				       dutyId: this.dutyId || undefined,
			
 
				-      repairDeptId: this.deptId || undefined,
			
 
				+      repairDeptId: this.repairDeptId || undefined,
			
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				       deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
@@ -656,7 +688,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				       dutyId: this.dutyId || undefined,
			
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				       deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				-      repairDeptId: this.deptId || undefined,
			
 
				+      repairDeptId: this.repairDeptId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				       userId: this.fieldConfig.fields.userId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -696,7 +728,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
@@ -723,7 +756,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	repairDeptList:any;
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 	    department: {
			
@@ -738,7 +771,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.repairDeptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				 		<div class="searchDataItem">
			
 
				 		  <span class="label">科室</span>：
			
 
				-		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-		    <ng-container *ngFor="let option of alldepart">
			
 
				+		  <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="repairDeptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				+		    <ng-container *ngFor="let option of repairDeptList">
			
 
				 		      <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				 		    </ng-container>
			
 
				 		    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts
@@ -31,7 +31,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				   listLength: number = 0; //表格总数据量
			
 
				 	hospital:any;
			
 
				   deptTypeId;//科室类型id
			
 
				-	deptId;
			
 
				+	repairDeptId;
			
 
				 	searchTimerSubject = new Subject();
			
 
				 
			
 
				   ngOnInit() {
			
@@ -60,7 +60,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -68,7 +68,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId,
			
 
				+				repairDeptId: this.repairDeptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -124,7 +124,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -132,7 +132,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId,
			
 
				+				repairDeptId: this.repairDeptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					overtimeId: 1,
			
@@ -198,7 +198,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -206,7 +206,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId,
			
 
				+				repairDeptId: this.repairDeptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					isHangId: 1,
			
@@ -272,7 +272,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -280,7 +280,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				-				repairDeptId: this.deptId,
			
 
				+				repairDeptId: this.repairDeptId,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20424,
			
@@ -356,7 +356,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -377,14 +377,17 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				   dutyId:any;
			
 
				 	parent:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-		this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -405,6 +408,35 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -429,7 +461,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				       endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				       hosId: this.hosId || undefined,
			
 
				       dutyId: this.dutyId || undefined,
			
 
				-			repairDeptId: this.deptId || undefined,
			
 
				+			repairDeptId: this.repairDeptId || undefined,
			
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				       deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
@@ -495,7 +527,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				       dutyId: this.dutyId || undefined,
			
 
				       parentDutyId: this.parentDutyId || undefined,
			
 
				 			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				-			repairDeptId: this.deptId || undefined,
			
 
				+			repairDeptId: this.repairDeptId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				       userId: this.fieldConfig.fields.userId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -535,7 +567,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
@@ -562,7 +595,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 	}
			
 
				 
			
 
				 	// 获取所有科室
			
 
				-	alldepart:any;
			
 
				+	repairDeptList:any;
			
 
				 	getDeparts(dept?) {
			
 
				 	  let data = {
			
 
				 			department: {
			
@@ -577,7 +610,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
				 	    .getFetchDataList("data", "department", data)
			
 
				 	    .subscribe((data) => {
			
 
				 				this.isLoading = false;
			
 
				-	      this.alldepart = data.list;
			
 
				+	      this.repairDeptList = data.list;
			
 
				 	    });
			
 
				 	}
			
 
				 
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html
@@ -3,8 +3,8 @@
 
				     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				     <div class="searchDataItem">
			
 
				       <span class="label">科室</span>：
			
 
				-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				-        <ng-container *ngFor="let option of alldepart">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="repairDeptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
			
 
				+        <ng-container *ngFor="let option of repairDeptList">
			
 
				           <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				         </ng-container>
			
 
				         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
			
--- a/src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts
@@ -30,7 +30,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				 
			
 
				   hospital:any;
			
 
				   deptTypeId;//科室类型id
			
 
				-  deptId;
			
 
				+  repairDeptId;
			
 
				   searchTimerSubject = new Subject();
			
 
				 
			
 
				   ngOnInit() {
			
@@ -80,14 +80,17 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				 	parent:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				-		this.parent = newStatistics.parent;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+    this.parent = newStatistics.parent;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -108,6 +111,35 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -129,7 +161,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				       endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				 			hosId: this.hosId || undefined,
			
 
				 			dutyId: this.dutyId || undefined,
			
 
				-			repairDeptId: this.deptId || undefined,
			
 
				+			repairDeptId: this.repairDeptId || undefined,
			
 
				 			parentDutyId: this.parentDutyId || undefined,
			
 
				 			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
@@ -186,7 +218,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				 			dutyId: this.dutyId || undefined,
			
 
				 			parentDutyId: this.parentDutyId || undefined,
			
 
				 			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				-			repairDeptId: this.deptId || undefined,
			
 
				+			repairDeptId: this.repairDeptId || undefined,
			
 
				       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				       userId: this.fieldConfig.fields.userId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -226,7 +258,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.deptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
@@ -252,7 +285,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				   }
			
 
				 
			
 
				   // 获取所有科室
			
 
				-  alldepart:any;
			
 
				+  repairDeptList:any;
			
 
				   getDeparts(dept?) {
			
 
				     let data = {
			
 
				       department: {
			
@@ -267,7 +300,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
				       .getFetchDataList("data", "department", data)
			
 
				       .subscribe((data) => {
			
 
				   			this.isLoading = false;
			
 
				-        this.alldepart = data.list;
			
 
				+        this.repairDeptList = data.list;
			
 
				       });
			
 
				   }
			
 
				 
			
--- a/src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html
@@ -20,10 +20,11 @@
 
				     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
			
 
				   </div>
			
 
				 </div>
			
 
				-<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.repairDeptDTO">
			
 
				   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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>
			
--- a/src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts
@@ -74,13 +74,16 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -101,6 +104,35 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -125,6 +157,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				       buildingId: this.buildingId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (field && sort) {
			
 
				       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
@@ -174,6 +207,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				       buildingId: this.buildingId || undefined,
			
 
				       categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
@@ -208,7 +242,11 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				     this.buildingId = undefined;
			
 
				-    this.fieldConfig.fields = {categoryId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      categoryId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
@@ -254,8 +292,8 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-    fields: {categoryId: undefined},
			
 
				-    config: {category123: true},
			
 
				+    fields: {categoryId: undefined, repairDeptId: undefined},
			
 
				+    config: {category123: true, repairDept: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.html
@@ -9,12 +9,13 @@
 
				     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
			
 
				   </div>
			
 
				 </div>
			
 
				-<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.repairDeptDTO">
			
 
				   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category2DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
			
 
				   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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>
			
--- a/src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts
@@ -44,7 +44,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data, type){
			
 
				 		let query = null
			
@@ -52,6 +52,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
@@ -70,6 +71,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					groupId: data.groupId ? data.groupId : -1,
			
@@ -99,7 +101,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -107,6 +109,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					overtimeId: 1,
			
@@ -130,6 +133,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					groupId: data.groupId ? data.groupId : -1,
			
@@ -164,7 +168,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null
			
@@ -172,6 +176,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					isHangId: 1,
			
@@ -195,6 +200,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					groupId: data.groupId ? data.groupId : -1,
			
@@ -229,7 +235,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -237,6 +243,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					evaluateId: 20424,
			
@@ -265,6 +272,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 			query = {
			
 
				 				startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				 				endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				 				searchQuery:{
			
 
				 					statusValue: 'close',
			
 
				 					groupId: data.groupId ? data.groupId : -1,
			
@@ -304,7 +312,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				 		this.router.navigate([path], { replaceUrl: true });
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -324,13 +332,16 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -351,6 +362,35 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -376,6 +416,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				       buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				       placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (field && sort) {
			
 
				       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
@@ -426,6 +467,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				       buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				       placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				     };
			
 
				     if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
@@ -459,7 +501,13 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
			
 
				+    this.fieldConfig.fields = {
			
 
				+      categoryId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				     setTimeout(_=>{
			
 
				     	this.search();
			
@@ -471,8 +519,8 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-    fields: {categoryId: undefined, buildingId: undefined, floorId: undefined},
			
 
				-    config: {category123: true, buildingAndFloor: true},
			
 
				+    fields: {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined},
			
 
				+    config: {category123: true, buildingAndFloor: true, repairDept: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.html
@@ -3,7 +3,7 @@
 
				     <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)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
			
 
				         <ng-container *ngFor="let option of repairDeptList">
			
 
				           <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				         </ng-container>
			
@@ -20,9 +20,9 @@
 
				     <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.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || 
			
 
				-		fieldConfig.fields.companyDTO || fieldConfig.fields.workHourParentDTO || fieldConfig.fields.workHourSmallDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.repairUserDTO || fieldConfig.fields.consumableDTO || 
			
 
				-		fieldConfig.fields.isHangDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.deptTypeDTO">
			
 
				+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO ||
			
 
				+		fieldConfig.fields.companyDTO || fieldConfig.fields.workHourParentDTO || fieldConfig.fields.workHourSmallDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.repairUserDTO || fieldConfig.fields.consumableDTO ||
			
 
				+		fieldConfig.fields.isHangDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.deptTypeDTO || fieldConfig.fields.priorityDTO">
			
 
				   <span>{{fieldConfig.fields.workHourParentDTO?.workName}}</span>
			
 
				 	<span>{{fieldConfig.fields.workHourSmallDTO?.workName}}</span>
			
 
				 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
@@ -41,7 +41,8 @@
 
				 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
			
 
				 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
			
 
				 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
			
 
				-	
			
 
				+	<span>{{fieldConfig.fields.priorityDTO?.name}}</span>
			
 
				+
			
 
				 </div>
			
 
				 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
			
 
				   <thead>
			
--- a/src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.ts
@@ -33,31 +33,22 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   searchTimerSubject = new Subject();
			
 
				 	dateData1:any;
			
 
				 	dateData2:any;
			
 
				-	
			
 
				-  ngOnInit() {
			
 
				-		// 数据下钻搜索
			
 
				-		this.getRouteQuery()
			
 
				-		// this.router.events
			
 
				-		//   .pipe(filter(event => event instanceof NavigationEnd))
			
 
				-		//   .subscribe((event: NavigationEnd) => {
			
 
				-		//     if(event.urlAfterRedirects=='/newStatistics/maintenanceStatistics/incidentList'){
			
 
				-		// 			console.log('维修=================')
			
 
				-		// 			this.getRouteQuery()
			
 
				-		//     }
			
 
				-		//   });
			
 
				 
			
 
				+  ngOnInit() {
			
 
				     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
			
 
				       let fun = v[0];
			
 
				       fun.call(this, v[1]);
			
 
				     });
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	ngOnDestroy(){
			
 
				 		sessionStorage.removeItem('maintenanceData')
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   ngAfterViewInit(){
			
 
				     this.initSessionData();
			
 
				+    // 数据下钻搜索
			
 
				+		this.getRouteQuery()
			
 
				     this.onResize(0);
			
 
				   }
			
 
				 
			
@@ -68,37 +59,42 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 			this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - height - this.getMoreFilter + 14;
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	goingType:boolean = false;
			
 
				-	getRouteQuery(){
			
 
				+	async getRouteQuery(){
			
 
				 		let data = sessionStorage.getItem('maintenanceData')
			
 
				 		let query = null
			
 
				 		if(data){
			
 
				 			query = JSON.parse(data)
			
 
				 			console.log('query==========',query)
			
 
				-			setTimeout(_=>{
			
 
				-				if(query.repairDeptId){
			
 
				-					this.getRepairDeptList();
			
 
				-					this.repairDeptId = query.repairDeptId
			
 
				-				}else{
			
 
				-					this.repairDeptId = undefined
			
 
				-				}
			
 
				-				if(query.searchQuery){
			
 
				-					this.goingType = true
			
 
				-					this.fieldConfig.fields = query.searchQuery
			
 
				-				}else{
			
 
				-					this.goingType = false
			
 
				-					this.fieldConfig.fields = {}
			
 
				-				}
			
 
				-				this.getQueryParams();
			
 
				-			},50)
			
 
				+      if(query.repairDeptId){
			
 
				+        this.repairDeptId = query.repairDeptId
			
 
				+        let postData = {
			
 
				+          department: {
			
 
				+            id: query.repairDeptId,
			
 
				+            searchType: 1,
			
 
				+          },
			
 
				+          idx: 0,
			
 
				+          sum: 1,
			
 
				+        };
			
 
				+        let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+        this.repairDeptList = result.list || [];
			
 
				+      }else{
			
 
				+        this.repairDeptId = undefined
			
 
				+      }
			
 
				+      if(query.searchQuery){
			
 
				+        this.goingType = true
			
 
				+        this.fieldConfig.fields = query.searchQuery
			
 
				+      }else{
			
 
				+        this.goingType = false
			
 
				+        this.fieldConfig.fields = {}
			
 
				+      }
			
 
				+      this.getQueryParams();
			
 
				 		}else{
			
 
				-			setTimeout(_=>{
			
 
				-				this.getQueryParams();
			
 
				-			},50)
			
 
				+      this.getQueryParams();
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -114,10 +110,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   }
			
 
				 
			
 
				   get getMoreFilter(){
			
 
				-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || 
			
 
				-		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || 
			
 
				-		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  || 
			
 
				-		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
			
 
				+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO ||
			
 
				+		this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO ||
			
 
				+		this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO  ||
			
 
				+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO ||
			
 
				 		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
			
 
				     return flag ? 37 : 0;
			
 
				   }
			
@@ -127,13 +123,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -154,6 +153,35 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -194,15 +222,16 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 			wxDegreeId: this.fieldConfig.fields.evaluateId,
			
 
				 			statusValue: this.fieldConfig.fields.statusValue || undefined,
			
 
				 			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				+			priorityId: this.fieldConfig.fields.priorityId || undefined,
			
 
				     };
			
 
				-		
			
 
				+
			
 
				 		if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
			
 
				 			postData.workHourId = this.fieldConfig.fields.workHourSmallId
			
 
				 		}
			
 
				 		if(this.fieldConfig.fields.workHourParentId && !this.fieldConfig.fields.workHourSmallId){
			
 
				 			postData.workHourId = this.fieldConfig.fields.workHourParentId
			
 
				 		}
			
 
				-		
			
 
				+
			
 
				     this.loading1 = true;
			
 
				     this.mainService
			
 
				       .postCustom("itsm/report", "incidentWorkOrderList", postData)
			
@@ -264,9 +293,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     	incidentSign: this.fieldConfig.fields.codeNum,
			
 
				 			wxDegreeId: this.fieldConfig.fields.evaluateId,
			
 
				 			statusValue: this.fieldConfig.fields.statusValue || undefined,
			
 
				-			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined
			
 
				+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
			
 
				+			priorityId: this.fieldConfig.fields.priorityId || undefined,
			
 
				     };
			
 
				-    
			
 
				+
			
 
				     if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
			
 
				     	postData.workHourId = this.fieldConfig.fields.workHourSmallId
			
 
				     }
			
@@ -304,7 +334,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     this.dateRange = []
			
 
				 		this.dateData1 = null;
			
 
				 		this.dateData2 = null;
			
 
				-    this.repairDeptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
@@ -325,7 +356,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				     this.isLoading = true;
			
 
				     this.searchTimerSubject.next([fun, e]);
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 查看工单详情
			
 
				 	coopData:any;
			
 
				 	detailModalShow = false; //弹窗开关
			
@@ -342,7 +373,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 	  this.detailModalShow = false;
			
 
				 	  this.getList();
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   openChangeRepairDept(flag){
			
 
				     flag && this.getRepairDeptList();
			
 
				   }
			
@@ -370,10 +401,9 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
				 
			
 
				   // 详细搜索
			
 
				   fieldConfig:any = {
			
 
				-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: 
			
 
				-		undefined,buildingId: undefined, floorId: undefined, companyId: undefined, 
			
 
				-		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined, deptTypeId: undefined},
			
 
				-    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true, deptType: true},
			
 
				+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined,buildingId: undefined, floorId: undefined, companyId: undefined,
			
 
				+		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined, deptTypeId: undefined, priorityId: undefined,},
			
 
				+    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true, deptType: true, priority: true},
			
 
				   }
			
 
				   showSearchMore:boolean = false;
			
 
				   showMore(){
			
--- a/src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.html
@@ -3,7 +3,7 @@
 
				     <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)">
			
 
				+      <nz-select class="selectItem" [nzDisabled]="queryType == 5" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
			
 
				         <ng-container *ngFor="let option of repairDeptList">
			
 
				           <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
			
 
				         </ng-container>
			
--- a/src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts
@@ -55,7 +55,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 
			
 
				     }, 0)
			
 
				   }
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail1(data,type){
			
 
				 		let query = null
			
@@ -115,7 +115,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail2(data, type){
			
 
				 		let query = null
			
@@ -185,7 +185,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail3(data, type){
			
 
				 		let query = null;
			
@@ -255,7 +255,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				 	// 数据下钻
			
 
				 	viewDetail4(data, type){
			
 
				 		let query = null
			
@@ -335,7 +335,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 			this.router.navigate([path], { replaceUrl: true });
			
 
				 		}
			
 
				 	}
			
 
				-	
			
 
				+
			
 
				   getQueryParams(){
			
 
				     let queryParams = this.tabService.getQueryParams();
			
 
				     this.tabService.clearQueryParams();
			
@@ -355,13 +355,16 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				   hosId:any;
			
 
				   dutyId:any;
			
 
				   parentDutyId:any;
			
 
				-  initSessionData(){
			
 
				+  async initSessionData(){
			
 
				     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				     let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				     let hosId:any = newStatistics.hospitalId;
			
 
				     let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				 
			
 
				     queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : undefined;
			
 
				     hosId = hosId ? +hosId : undefined;
			
 
				     dutyId = dutyId ? +dutyId : undefined;
			
 
				 
			
@@ -382,6 +385,35 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				       this.hosId = undefined;
			
 
				       this.dutyId = undefined;
			
 
				       this.parentDutyId = dutyId;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.repairDeptList = result.list || [];
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 4){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = dutyId;
			
 
				+      }
			
 
				     }
			
 
				   }
			
 
				 
			
@@ -496,7 +528,8 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
				 		this.sortCurrentValue = "";
			
 
				 		this.sortCurrent = {};
			
 
				     this.dateRange = []
			
 
				-    this.repairDeptId = undefined;
			
 
				+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
			
 
				+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
			
 
				     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
			
 
				     this.customChangeDateComponent.resetByDate();
			
 
				 		sessionStorage.removeItem('maintenanceData');
			
--- a/src/app/views/new-statistics/maintenance-statistics/maintenance-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/maintenance-statistics-routing.module.ts
@@ -161,6 +161,33 @@ const routes: Routes = [
 
				           title: '修-工时大类统计'
			
 
				         }
			
 
				       },
			
 
				+      {
			
 
				+        // 人员效能统计
			
 
				+        path: 'personnelEffectivenessStatistics',
			
 
				+        loadChildren: () => import('./personnel-effectiveness-statistics/personnel-effectiveness-statistics.module').then(m => m.PersonnelEffectivenessStatisticsModule),
			
 
				+        data: {
			
 
				+          reuse: true,
			
 
				+          title: '修-人员效能统计'
			
 
				+        }
			
 
				+      },
			
 
				+      {
			
 
				+        // 优先级日期统计
			
 
				+        path: 'priorityDateStatistics',
			
 
				+        loadChildren: () => import('./priority-date-statistics/priority-date-statistics.module').then(m => m.PriorityDateStatisticsModule),
			
 
				+        data: {
			
 
				+          reuse: true,
			
 
				+          title: '修-优先级日期统计'
			
 
				+        }
			
 
				+      },
			
 
				+      {
			
 
				+        // 优先级质控统计
			
 
				+        path: 'priorityQualityControlStatistics',
			
 
				+        loadChildren: () => import('./priority-quality-control-statistics/priority-quality-control-statistics.module').then(m => m.PriorityQualityControlStatisticsModule),
			
 
				+        data: {
			
 
				+          reuse: true,
			
 
				+          title: '修-优先级质控统计'
			
 
				+        }
			
 
				+      },
			
 
				       {
			
 
				         // 人员评价统计
			
 
				         path: 'userEvaluateStatistics',
			
--- a/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics-routing.module.ts
@@ -0,0 +1,14 @@
 
				+import { NgModule } from '@angular/core';
			
 
				+import { Routes, RouterModule } from '@angular/router';
			
 
				+import { PersonnelEffectivenessStatisticsComponent } from './personnel-effectiveness-statistics.component';
			
 
				+
			
 
				+
			
 
				+const routes: Routes = [
			
 
				+  { path: '', component: PersonnelEffectivenessStatisticsComponent }
			
 
				+];
			
 
				+
			
 
				+@NgModule({
			
 
				+  imports: [RouterModule.forChild(routes)],
			
 
				+  exports: [RouterModule]
			
 
				+})
			
 
				+export class PersonnelEffectivenessStatisticsRoutingModule { }
			
--- a/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.html
@@ -0,0 +1,74 @@
 
				+<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-input-number [(ngModel)]="matchUserCouont" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
			
 
				+    </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.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.companyDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.repairDeptDTO">
			
 
				+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
			
 
				+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
			
 
				+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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.5%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总量</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总价格</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="countWorker" [(nzSort)]="sortCurrent.countWorker">总人数</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="totalResolvedTime" [(nzSort)]="sortCurrent.totalResolvedTime">总维修时长</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">人均单量</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgPrice" [(nzSort)]="sortCurrent.avgPrice">人均费用</th>
			
 
				+      <th nzWidth="12.5%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">人均维修时长</th>
			
 
				+    </tr>
			
 
				+  </thead>
			
 
				+  <tbody>
			
 
				+    <tr *ngFor="let data of listOfData">
			
 
				+      <td>{{ data.date }}</td>
			
 
				+      <td>{{ data.totalCount }}</td>
			
 
				+      <td>{{ data.totalPrice }}</td>
			
 
				+      <td>{{ data.countWorker }}</td>
			
 
				+      <td>{{ data.totalResolvedTime }}</td>
			
 
				+      <td>{{ data.avgCount }}</td>
			
 
				+      <td>{{ data.avgPrice }}</td>
			
 
				+      <td>{{ data.avgResolvedTime }}</td>
			
 
				+    </tr>
			
 
				+  </tbody>
			
 
				+  <ng-template #footerTpl>
			
 
				+    <table class="footTable">
			
 
				+      <tr *ngFor="let data of listOfDataEnd">
			
 
				+        <td style="width: 12.5%">{{ data.date }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.countWorker }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.totalResolvedTime }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgCount }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgPrice }}</td>
			
 
				+        <td style="width: 12.5%">{{ data.avgResolvedTime }}</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-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
			
--- a/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.less
+++ b/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-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;
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.ts
@@ -0,0 +1,297 @@
 
				+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 { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
			
 
				+@Component({
			
 
				+  selector: "app-personnel-effectiveness-statistics",
			
 
				+  templateUrl: "./personnel-effectiveness-statistics.component.html",
			
 
				+  styleUrls: ["./personnel-effectiveness-statistics.component.less"],
			
 
				+})
			
 
				+export class PersonnelEffectivenessStatisticsComponent implements OnInit, AfterViewInit {
			
 
				+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
			
 
				+  constructor(
			
 
				+    private mainService: MainService,
			
 
				+    private message: NzMessageService,
			
 
				+    private route: ActivatedRoute,
			
 
				+    private tabService: TabService,
			
 
				+  ) {}
			
 
				+
			
 
				+  listOfData: any[] = []; //表格数据
			
 
				+  listOfDataEnd: any[] = []; //表格合计
			
 
				+  pageIndex: number = 1; //表格当前页码
			
 
				+  pageSize: number = 30; //表格每页展示条数
			
 
				+  listLength: number = 0; //表格总数据量
			
 
				+
			
 
				+  matchUserCouont:number = 1;//排除异常人员
			
 
				+
			
 
				+  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.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.sourceDTO || this.fieldConfig.fields.repairDeptDTO;
			
 
				+    return flag ? 37 : 0;
			
 
				+  }
			
 
				+
			
 
				+  // 初始化缓存数据
			
 
				+  queryType:any;
			
 
				+  hosId:any;
			
 
				+  dutyId:any;
			
 
				+  parentDutyId:any;
			
 
				+  async initSessionData(){
			
 
				+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				+    let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				+    let hosId:any = newStatistics.hospitalId;
			
 
				+    let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+
			
 
				+    queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : 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;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 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,
			
 
				+      treeLevel: 1,
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.hosId || undefined,
			
 
				+      dutyId: this.dutyId || undefined,
			
 
				+      parentDutyId: this.parentDutyId || undefined,
			
 
				+      matchUserCouont: this.matchUserCouont || undefined,
			
 
				+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+      placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      companyId: this.fieldConfig.fields.companyId || undefined,
			
 
				+      sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+    };
			
 
				+    if (field && sort) {
			
 
				+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.loading1 = true;
			
 
				+    this.mainService
			
 
				+      .postCustom("itsm/report", "incidentWorkOrderUser", 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 = {
			
 
				+      treeLevel: 1,
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.hosId || undefined,
			
 
				+      dutyId: this.dutyId || undefined,
			
 
				+      parentDutyId: this.parentDutyId || undefined,
			
 
				+      matchUserCouont: this.matchUserCouont || undefined,
			
 
				+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      buildingId: this.fieldConfig.fields.buildingId || undefined,
			
 
				+      placeId: this.fieldConfig.fields.floorId || undefined,
			
 
				+      companyId: this.fieldConfig.fields.companyId || undefined,
			
 
				+      sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+    };
			
 
				+    if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.mainService
			
 
				+      .postExportCustom("itsm/export", "incidentWorkOrderUser", 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.matchUserCouont = 1;
			
 
				+    this.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      categoryId: undefined,
			
 
				+      buildingId: undefined,
			
 
				+      floorId: undefined,
			
 
				+      companyId: undefined,
			
 
				+      sourceId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				+    this.customChangeDateComponent.resetByDate();
			
 
				+    setTimeout(_=>{
			
 
				+    	this.search();
			
 
				+    })
			
 
				+  }
			
 
				+
			
 
				+  // 详细搜索
			
 
				+  fieldConfig:any = {
			
 
				+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, sourceId: undefined, repairDeptId: undefined},
			
 
				+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, company: true, source: true, repairDept: 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();
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.module.ts
@@ -0,0 +1,23 @@
 
				+import { PersonnelEffectivenessStatisticsComponent } from './personnel-effectiveness-statistics.component';
			
 
				+import { NgModule } from '@angular/core';
			
 
				+import { CommonModule } from '@angular/common';
			
 
				+
			
 
				+import { PersonnelEffectivenessStatisticsRoutingModule } from './personnel-effectiveness-statistics-routing.module';
			
 
				+import { ShareModule } from 'src/app/share/share.module';
			
 
				+import { SearchMoreModule } from '../../components/search-more/search-more.module';
			
 
				+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
			
 
				+
			
 
				+
			
 
				+@NgModule({
			
 
				+  declarations: [
			
 
				+    PersonnelEffectivenessStatisticsComponent,
			
 
				+  ],
			
 
				+  imports: [
			
 
				+    CommonModule,
			
 
				+    PersonnelEffectivenessStatisticsRoutingModule,
			
 
				+    ShareModule,
			
 
				+    SearchMoreModule,
			
 
				+    CustomChangeDateModule,
			
 
				+  ]
			
 
				+})
			
 
				+export class PersonnelEffectivenessStatisticsModule { }
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics-routing.module.ts
@@ -0,0 +1,14 @@
 
				+import { NgModule } from '@angular/core';
			
 
				+import { Routes, RouterModule } from '@angular/router';
			
 
				+import { PriorityDateStatisticsComponent } from './priority-date-statistics.component';
			
 
				+
			
 
				+
			
 
				+const routes: Routes = [
			
 
				+  { path: '', component: PriorityDateStatisticsComponent }
			
 
				+];
			
 
				+
			
 
				+@NgModule({
			
 
				+  imports: [RouterModule.forChild(routes)],
			
 
				+  exports: [RouterModule]
			
 
				+})
			
 
				+export class PriorityDateStatisticsRoutingModule { }
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.html
@@ -0,0 +1,64 @@
 
				+<div class="searchDataWrap">
			
 
				+  <div class="searchData">
			
 
				+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				+  </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.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.repairDeptDTO">
			
 
				+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
			
 
				+  <span>{{fieldConfig.fields.sourceDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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="16%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单总数</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="极低" [(nzSort)]="sortCurrent['极低']">极低</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="低" [(nzSort)]="sortCurrent['低']">低</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="中" [(nzSort)]="sortCurrent['中']">中</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="高" [(nzSort)]="sortCurrent['高']">高</th>
			
 
				+      <th nzWidth="14%" nzShowSort nzSortKey="极高" [(nzSort)]="sortCurrent['极高']">极高</th>
			
 
				+    </tr>
			
 
				+  </thead>
			
 
				+  <tbody>
			
 
				+    <tr *ngFor="let data of listOfData">
			
 
				+      <td>{{ data.date }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.totalCount }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail5(data, null, '极低')">{{ data['极低']}}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail5(data, null, '低')">{{ data['低'] }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail5(data, null, '中')">{{ data['中'] }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail5(data, null, '高')">{{ data['高'] }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail5(data, null, '极高')">{{ data['极高'] }}</td>
			
 
				+    </tr>
			
 
				+  </tbody>
			
 
				+  <ng-template #footerTpl>
			
 
				+    <table class="footTable">
			
 
				+      <tr *ngFor="let data of listOfDataEnd">
			
 
				+        <td style="width: 16%">{{ data.date }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail1(data,'all')">{{ data.totalCount }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '极低')">{{ data['极低'] }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '低')">{{ data['低'] }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '中')">{{ data['中'] }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '高')">{{ data['高'] }}</td>
			
 
				+        <td style="width: 14%" class="text-sign" (click)="viewDetail5(data,'all', '极高')">{{ data['极高'] }}</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-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.less
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.less
@@ -0,0 +1,75 @@
 
				+@import "../../../../../../src/theme.less";
			
 
				+:host{
			
 
				+  position: absolute;
			
 
				+  top: 0;
			
 
				+  right: 0;
			
 
				+  bottom: 0;
			
 
				+  left: 0;
			
 
				+  .text-sign{
			
 
				+		text-decoration: underline;
			
 
				+		cursor: pointer;
			
 
				+	}
			
 
				+  ::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;
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.ts
@@ -0,0 +1,428 @@
 
				+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, Router } from '@angular/router';
			
 
				+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
			
 
				+@Component({
			
 
				+  selector: "app-priority-date-statistics",
			
 
				+  templateUrl: "./priority-date-statistics.component.html",
			
 
				+  styleUrls: ["./priority-date-statistics.component.less"],
			
 
				+})
			
 
				+export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
			
 
				+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
			
 
				+  constructor(
			
 
				+    private mainService: MainService,
			
 
				+    private message: NzMessageService,
			
 
				+    private route: ActivatedRoute,
			
 
				+    private tabService: TabService,
			
 
				+    private router: Router,
			
 
				+  ) {}
			
 
				+
			
 
				+  listOfData: any[] = []; //表格数据
			
 
				+  listOfDataEnd: any[] = []; //表格合计
			
 
				+  pageIndex: number = 1; //表格当前页码
			
 
				+  pageSize: number = 30; //表格每页展示条数
			
 
				+  listLength: number = 0; //表格总数据量
			
 
				+
			
 
				+  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)
			
 
				+  }
			
 
				+
			
 
				+  // 数据下钻
			
 
				+	viewDetail1(data,type){
			
 
				+		let query = null
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate,
			
 
				+				endDate: this.customChangeDateComponent.endDate,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+					sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
			
 
				+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
			
 
				+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO,
			
 
				+					sourceDTO: this.fieldConfig.fields.sourceDTO,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO,
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/maintenanceStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			 query = {
			
 
				+				startDate: data.date + ' ' + '00:00:00',
			
 
				+				endDate: data.date + ' ' + '23:59:59',
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+					sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
			
 
				+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
			
 
				+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO,
			
 
				+					sourceDTO: this.fieldConfig.fields.sourceDTO,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO,
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/maintenanceStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
			
 
				+			this.tabService.setQueryParams('defRange', null);
			
 
				+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+  // 数据下钻
			
 
				+	viewDetail5(data,type,key){
			
 
				+	console.log('data:', data)
			
 
				+	console.log('type:', type)
			
 
				+	console.log('key:', key)
			
 
				+		let query = null
			
 
				+		if(type=='all'){
			
 
				+			query = {
			
 
				+				startDate: this.customChangeDateComponent.startDate,
			
 
				+				endDate: this.customChangeDateComponent.endDate,
			
 
				+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+					sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
			
 
				+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
			
 
				+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO,
			
 
				+					sourceDTO: this.fieldConfig.fields.sourceDTO,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO,
			
 
				+					priorityId: data[key + 'id'] || undefined,
			
 
				+          priorityDTO: {
			
 
				+            id: data[key + 'id'],
			
 
				+            name: key,
			
 
				+          }
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/maintenanceStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
			
 
				+			this.tabService.setQueryParams('defRange', this.customChangeDateComponent.defRange);
			
 
				+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}else{
			
 
				+			 query = {
			
 
				+				startDate: data.date + ' ' + '00:00:00',
			
 
				+				endDate: data.date + ' ' + '23:59:59',
			
 
				+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+				searchQuery:{
			
 
				+					statusValue: 'close',
			
 
				+					groupId: this.fieldConfig.fields.groupId || undefined,
			
 
				+					userId: this.fieldConfig.fields.userId || undefined,
			
 
				+					categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+					sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+					hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+					category1DTO: this.fieldConfig.fields.category1DTO || undefined,
			
 
				+					category2DTO: this.fieldConfig.fields.category2DTO || undefined,
			
 
				+					category3DTO: this.fieldConfig.fields.category3DTO || undefined,
			
 
				+					groupDTO: this.fieldConfig.fields.groupDTO,
			
 
				+					sourceDTO: this.fieldConfig.fields.sourceDTO,
			
 
				+					userDTO: this.fieldConfig.fields.userDTO,
			
 
				+          priorityId: data[key + 'id'] || undefined,
			
 
				+          priorityDTO: {
			
 
				+            id: data[key + 'id'],
			
 
				+            name: key,
			
 
				+          }
			
 
				+				}
			
 
				+			}
			
 
				+			let path = '/newStatistics/maintenanceStatistics/incidentList'
			
 
				+			let flag = this.tabService.tabs.some(v => v.path === path);
			
 
				+			flag && this.tabService.deleteRouteSnapshot(path);
			
 
				+			this.tabService.setQueryParams('dateRange', [data.date + ' ' + '00:00:00', data.date + ' ' + '23:59:59']);
			
 
				+			this.tabService.setQueryParams('defRange', null);
			
 
				+			sessionStorage.setItem('maintenanceData', JSON.stringify(query))
			
 
				+			this.router.navigate([path], { replaceUrl: true });
			
 
				+		}
			
 
				+	}
			
 
				+
			
 
				+  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.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO || this.fieldConfig.fields.repairDeptDTO;
			
 
				+    return flag ? 37 : 0;
			
 
				+  }
			
 
				+
			
 
				+  // 初始化缓存数据
			
 
				+  queryType:any;
			
 
				+  hosId:any;
			
 
				+  dutyId:any;
			
 
				+  parentDutyId:any;
			
 
				+  async initSessionData(){
			
 
				+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
			
 
				+    let queryType:any = newStatistics.queryType;
			
 
				+    let realQueryType:any = newStatistics.realQueryType;
			
 
				+    let hosId:any = newStatistics.hospitalId;
			
 
				+    let dutyId:any = newStatistics.dutyId;
			
 
				+    let currentDeptDTO:any = newStatistics.currentDeptDTO;
			
 
				+
			
 
				+    queryType = queryType ? +queryType : undefined;
			
 
				+    realQueryType = realQueryType ? +realQueryType : 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;
			
 
				+    }else if(queryType == 5){
			
 
				+      this.fieldConfig.fields.repairDeptId = currentDeptDTO.id;
			
 
				+      let postData = {
			
 
				+        department: {
			
 
				+          id: currentDeptDTO.id,
			
 
				+          searchType: 1,
			
 
				+        },
			
 
				+        idx: 0,
			
 
				+        sum: 1,
			
 
				+      };
			
 
				+      let result:any = await this.mainService.getFetchDataList("data", "department", postData).toPromise();
			
 
				+      this.fieldConfig.fields.repairDeptDTO = result.list.length ? result.list[0] : undefined;
			
 
				+      if(realQueryType == 1){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 2){
			
 
				+        this.hosId = hosId;
			
 
				+        this.dutyId = undefined;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 3){
			
 
				+        this.hosId = undefined;
			
 
				+        this.dutyId = dutyId;
			
 
				+        this.parentDutyId = undefined;
			
 
				+      }else if(realQueryType == 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,
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.hosId || undefined,
			
 
				+      dutyId: this.dutyId || undefined,
			
 
				+      parentDutyId: this.parentDutyId || undefined,
			
 
				+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+    };
			
 
				+    if (field && sort) {
			
 
				+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.loading1 = true;
			
 
				+    this.mainService
			
 
				+      .postCustom("itsm/report", "incidentPriority", postData)
			
 
				+      .subscribe((result) => {
			
 
				+        this.loading1 = false;
			
 
				+        result.dataList = result.dataList || [];
			
 
				+        // 优先级需要处理
			
 
				+        result.dataList.forEach(v => {
			
 
				+          for (const key in v) {
			
 
				+            if(key.includes('_')){
			
 
				+              let [key1, value1] = key.split('_');
			
 
				+              v[key1] = v[key];
			
 
				+              v[key1 + 'id'] = +value1;
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+
			
 
				+        console.log('result.dataList:', result.dataList)
			
 
				+        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 = {
			
 
				+      startDate: this.customChangeDateComponent.startDate || undefined,
			
 
				+      endDate: this.customChangeDateComponent.endDate || undefined,
			
 
				+      hosId: this.hosId || undefined,
			
 
				+      dutyId: this.dutyId || undefined,
			
 
				+      parentDutyId: this.parentDutyId || undefined,
			
 
				+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
			
 
				+      userId: this.fieldConfig.fields.userId || undefined,
			
 
				+      categoryId: this.fieldConfig.fields.categoryId || undefined,
			
 
				+      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
			
 
				+      sourceId: this.fieldConfig.fields.sourceId || undefined,
			
 
				+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
			
 
				+    };
			
 
				+    if (this.sortCurrentKey && this.sortCurrentValue) {
			
 
				+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
			
 
				+    }
			
 
				+    this.mainService
			
 
				+      .postExportCustom("itsm/export", "incidentPriority", 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.fieldConfig.fields = {
			
 
				+      groupId: undefined,
			
 
				+      userId: undefined,
			
 
				+      categoryId: undefined,
			
 
				+      sourceId: undefined,
			
 
				+      repairDeptId: this.queryType == 5 ? this.fieldConfig.fields.repairDeptId : undefined,
			
 
				+      repairDeptDTO: this.queryType == 5 ? this.fieldConfig.fields.repairDeptDTO : undefined,
			
 
				+    };
			
 
				+    this.customChangeDateComponent.resetByDate();
			
 
				+    setTimeout(_=>{
			
 
				+    	this.search();
			
 
				+    })
			
 
				+  }
			
 
				+
			
 
				+  // 详细搜索
			
 
				+  fieldConfig:any = {
			
 
				+    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, repairDeptId: undefined},
			
 
				+    config: {groupAndUser: true, category123: true, source: true, repairDept: 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();
			
 
				+  }
			
 
				+}
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.module.ts
@@ -0,0 +1,23 @@
 
				+import { PriorityDateStatisticsComponent } from './priority-date-statistics.component';
			
 
				+import { NgModule } from '@angular/core';
			
 
				+import { CommonModule } from '@angular/common';
			
 
				+
			
 
				+import { PriorityDateStatisticsRoutingModule } from './priority-date-statistics-routing.module';
			
 
				+import { ShareModule } from 'src/app/share/share.module';
			
 
				+import { SearchMoreModule } from '../../components/search-more/search-more.module';
			
 
				+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
			
 
				+
			
 
				+
			
 
				+@NgModule({
			
 
				+  declarations: [
			
 
				+    PriorityDateStatisticsComponent,
			
 
				+  ],
			
 
				+  imports: [
			
 
				+    CommonModule,
			
 
				+    PriorityDateStatisticsRoutingModule,
			
 
				+    ShareModule,
			
 
				+    SearchMoreModule,
			
 
				+    CustomChangeDateModule,
			
 
				+  ]
			
 
				+})
			
 
				+export class PriorityDateStatisticsModule { }
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics-routing.module.ts
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics-routing.module.ts
@@ -0,0 +1,14 @@
 
				+import { NgModule } from '@angular/core';
			
 
				+import { Routes, RouterModule } from '@angular/router';
			
 
				+import { PriorityQualityControlStatisticsComponent } from './priority-quality-control-statistics.component';
			
 
				+
			
 
				+
			
 
				+const routes: Routes = [
			
 
				+  { path: '', component: PriorityQualityControlStatisticsComponent }
			
 
				+];
			
 
				+
			
 
				+@NgModule({
			
 
				+  imports: [RouterModule.forChild(routes)],
			
 
				+  exports: [RouterModule]
			
 
				+})
			
 
				+export class PriorityQualityControlStatisticsRoutingModule { }
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.html
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.html
@@ -0,0 +1,75 @@
 
				+<div class="searchDataWrap">
			
 
				+  <div class="searchData">
			
 
				+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
			
 
				+  </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.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.repairDeptDTO || fieldConfig.fields.companyDTO">
			
 
				+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
			
 
				+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
			
 
				+  <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
			
 
				+  <span>{{fieldConfig.fields.companyDTO?.name}}</span>
			
 
				+  <span>{{fieldConfig.fields.repairDeptDTO?.dept}}</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="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
			
 
				+      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
			
 
				+    </tr>
			
 
				+  </thead>
			
 
				+  <tbody>
			
 
				+    <tr *ngFor="let data of listOfData">
			
 
				+      <td>{{ data.priorityName }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail1(data)">{{ data.sum }}</td>
			
 
				+      <td>{{ data.avgResponseTime }}</td>
			
 
				+      <td>{{ data.avgResolvedTime }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail2(data)">{{ data.resolvedOverNum }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail3(data)">{{ data.overTimeNum }}</td>
			
 
				+      <td>{{ data.consumablePrice }}</td>
			
 
				+      <td>{{ data.workHourPrice }}</td>
			
 
				+      <td>{{ data.totalPrice }}</td>
			
 
				+      <td class="text-sign" (click)="viewDetail4(data)">{{ data.negativeNum }}</td>
			
 
				+      <td>{{ data.favorableRate }}</td>
			
 
				+    </tr>
			
 
				+  </tbody>
			
 
				+  <ng-template #footerTpl>
			
 
				+    <table class="footTable">
			
 
				+      <tr *ngFor="let data of listOfDataEnd">
			
 
				+        <td style="width: 10%">{{ data.priorityName }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail1(data, 'all')">{{ data.sum }}</td>
			
 
				+        <td style="width: 9%">{{ data.avgResponseTime }}</td>
			
 
				+        <td style="width: 9%">{{ data.avgResolvedTime }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail2(data, 'all')">{{ data.resolvedOverNum }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail3(data, 'all')">{{ data.overTimeNum }}</td>
			
 
				+        <td style="width: 9%">{{ data.consumablePrice }}</td>
			
 
				+        <td style="width: 9%">{{ data.workHourPrice }}</td>
			
 
				+        <td style="width: 9%">{{ data.totalPrice }}</td>
			
 
				+        <td style="width: 9%" class="text-sign" (click)="viewDetail4(data, 'all')">{{ data.negativeNum }}</td>
			
 
				+        <td style="width: 9%">{{ data.favorableRate }}</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-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
			
--- a/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.less
+++ b/src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.less
作者	SHA1 备注	提交日期
seimin	66b06dadca 换色	1 天之前
seimin	74d014f871 主题色	2 天之前
seimin	ca45aebd05 Merge branch 'master' into develop	3 天之前
seimin	1c5449a2c0 Merge branch 'master' into develop	4 天之前
seimin	4d755acd79 Merge branch 'master' into develop	1 周之前
seimin	da66432dba 标本添加加急标识	1 周之前
seimin	3ecde76dc9 护士端统计	1 周之前
seimin	571e33e3b7 Merge branch 'master' into develop	1 周之前
seimin	42491422b7 统计暂存	1 周之前
seimin	8158842240 暂提	2 周之前