护士端统计

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;

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>

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -15,6 +15,7 @@ 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;

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

@@ -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>

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts

@@ -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,
@@ -100,10 +98,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,
@@ -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,
@@ -150,10 +146,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,
@@ -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,
@@ -206,10 +200,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,
@@ -228,10 +221,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,
@@ -275,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;
 
@@ -302,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;
+      }
     }
   }
 
@@ -406,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();

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;
+      }
     }
   }
 
@@ -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();

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

@@ -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,
@@ -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,
@@ -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,
@@ -240,10 +234,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,
@@ -271,10 +264,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,
@@ -319,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;
 
@@ -346,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;
+      }
     }
   }
 
@@ -457,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();

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>

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;
+      }
     }
   }
 
@@ -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;
 	    });
 	}
 

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>

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

@@ -66,17 +66,16 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		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,
@@ -142,17 +140,16 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		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,
@@ -222,17 +218,16 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		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,
@@ -308,17 +302,16 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		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,
@@ -359,10 +352,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,
@@ -410,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;
 
@@ -438,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;
+      }
     }
   }
 
@@ -548,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(_=>{
@@ -578,7 +603,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 	}
 
 	// 获取所有科室
-	alldepart:any;
+	deptList:any[] = [];
 	getDeparts(dept?) {
 	  let data = {
 	    department: {
@@ -593,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;
 	    });
 	}
 

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>

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;
 	    });
 	}
 

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>

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;
 	    });
 	}
 

src/app/views/new-statistics/distribution-inspection-statistics/distribution-personnel-effectiveness-statistics/distribution-personnel-effectiveness-statistics.component.ts

@@ -76,13 +76,16 @@ export class DistributionPersonnelEffectivenessStatisticsComponent implements On
   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 DistributionPersonnelEffectivenessStatisticsComponent implements On
       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;
+      }
     }
   }
 
@@ -214,7 +246,15 @@ export class DistributionPersonnelEffectivenessStatisticsComponent implements On
 		this.sortCurrent = {totalCount: 'descend'};
     this.dateRange = []
     this.matchUserCouont = 1;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
+    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();

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>

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;
 		      }

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();

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();

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

@@ -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,
@@ -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,
@@ -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,
@@ -237,10 +231,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,
@@ -261,10 +254,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,
@@ -314,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;
 
@@ -341,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;
+      }
     }
   }
 
@@ -450,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();

src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.ts

@@ -28,13 +28,9 @@ 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]);
@@ -49,6 +45,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
   ngAfterViewInit(){
     this.initSessionData();
+    // 数据下钻搜索
+		this.getRouteQuery()
     this.onResize(0);
   }
 
@@ -63,13 +61,13 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 
 	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,18 +83,35 @@ 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)
 		}
 	}
 
@@ -125,7 +141,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 		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;
+		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;
+      }
     }
   }
 
@@ -288,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(_=>{

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>

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(_=>{

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

@@ -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,
@@ -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,
@@ -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,
@@ -308,10 +302,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,
@@ -351,10 +344,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,
@@ -401,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;
 
@@ -428,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;
+      }
     }
   }
 
@@ -535,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();

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;
+      }
     }
   }
 
@@ -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();

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

@@ -67,10 +67,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
 				statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+        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,
@@ -111,10 +110,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
 							startDate: this.customChangeDateComponent.startDate || undefined,
 							endDate: this.customChangeDateComponent.endDate || undefined,
 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
+              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,
 								groupId: this.fieldConfig.fields.groupId || undefined,
@@ -161,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;
 
@@ -188,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;
+      }
     }
   }
 
@@ -293,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();

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>

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(){

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(_=>{

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>

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(){

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(_=>{

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(_=>{

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>

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');

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>

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;
 	    });
 	}
 

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>

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;
 	    });
 	}
 

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>

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;
       });
   }
 

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>

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(){

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>

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(){

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>

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

@@ -123,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;
 
@@ -150,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;
+      }
     }
   }
 
@@ -302,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');

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>

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');

src/app/views/new-statistics/maintenance-statistics/personnel-effectiveness-statistics/personnel-effectiveness-statistics.component.ts

@@ -74,13 +74,16 @@ export class PersonnelEffectivenessStatisticsComponent 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;
 
@@ -101,6 +104,35 @@ export class PersonnelEffectivenessStatisticsComponent implements OnInit, AfterV
       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;
+      }
     }
   }
 
@@ -224,7 +256,17 @@ export class PersonnelEffectivenessStatisticsComponent implements OnInit, AfterV
 		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: undefined};
+    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();

src/app/views/new-statistics/maintenance-statistics/priority-date-statistics/priority-date-statistics.component.ts

@@ -61,9 +61,9 @@ export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -88,9 +88,9 @@ export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
 			 query = {
 				startDate: data.date + ' ' + '00:00:00',
 				endDate: data.date + ' ' + '23:59:59',
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -124,9 +124,9 @@ export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate,
 				endDate: this.customChangeDateComponent.endDate,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -156,9 +156,9 @@ export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
 			 query = {
 				startDate: data.date + ' ' + '00:00:00',
 				endDate: data.date + ' ' + '23:59:59',
+				repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
-					repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 					groupId: this.fieldConfig.fields.groupId || undefined,
 					userId: this.fieldConfig.fields.userId || undefined,
 					categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -206,13 +206,16 @@ export class PriorityDateStatisticsComponent 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;
 
@@ -233,6 +236,35 @@ export class PriorityDateStatisticsComponent 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;
+      }
     }
   }
 
@@ -358,7 +390,14 @@ export class PriorityDateStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, repairDeptId: undefined};
+    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();

src/app/views/new-statistics/maintenance-statistics/priority-quality-control-statistics/priority-quality-control-statistics.component.ts

@@ -52,6 +52,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -59,13 +60,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
           groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -78,6 +77,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -85,13 +85,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 					userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -118,6 +116,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
@@ -126,13 +125,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
           groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -149,6 +146,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					overtimeId: 1,
@@ -157,13 +155,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -194,6 +190,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
@@ -202,13 +199,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
           groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -225,6 +220,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					isHangId: 1,
@@ -233,13 +229,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -270,6 +264,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
@@ -278,13 +273,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
           groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -306,6 +299,7 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					evaluateId: 20424,
@@ -314,13 +308,11 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 					placeId: this.fieldConfig.fields.floorId || undefined,
           groupId: this.fieldConfig.fields.groupId || undefined,
           userId: this.fieldConfig.fields.userId || undefined,
-          repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
           companyId: this.fieldConfig.fields.companyId || undefined,
 					buildingDTO: this.fieldConfig.fields.buildingDTO || undefined,
 					floorDTO: this.fieldConfig.fields.floorDTO || undefined,
 					groupDTO: this.fieldConfig.fields.groupDTO || undefined,
           userDTO: this.fieldConfig.fields.userDTO || undefined,
-          repairDeptDTO: this.fieldConfig.fields.repairDeptDTO || undefined,
           companyDTO: this.fieldConfig.fields.companyDTO || undefined,
           priorityId: data.priorityId || undefined,
           priorityDTO: {
@@ -368,13 +360,16 @@ export class PriorityQualityControlStatisticsComponent 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;
 
@@ -395,6 +390,35 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
       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;
+      }
     }
   }
 
@@ -507,7 +531,15 @@ export class PriorityQualityControlStatisticsComponent implements OnInit, AfterV
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, groupId: undefined, userId: undefined, repairDeptId: undefined, companyId: undefined};
+    this.fieldConfig.fields = {
+      buildingId: undefined,
+      floorId: undefined,
+      groupId: undefined,
+      userId: undefined,
+      companyId: 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();

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

@@ -4,7 +4,7 @@
       <app-custom-change-date #customChangeDate [isShowType]="true" name="选择日期"></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>

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

@@ -614,15 +614,16 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
   hosId:any;
   dutyId:any;
   parentDutyId:any;
-  currentDeptDTO: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;
 
@@ -644,9 +645,34 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
       this.dutyId = undefined;
       this.parentDutyId = dutyId;
     }else if(queryType == 5){
-      this.hosId = undefined;
-      this.dutyId = undefined;
-      this.parentDutyId = dutyId;
+      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;
+      }
     }
 
 		this.isLoading1 = true
@@ -723,7 +749,8 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 
 	// 重置
 	reset(){
-    this.repairDeptId = undefined;
+    this.repairDeptId = this.queryType == 5 ? this.repairDeptId : undefined;
+    this.repairDeptList = this.queryType == 5 ? this.repairDeptList : [];
 		this.dateRange = [];
 		this.activeIndex = 0;
     this.customChangeDateComponent.resetByDate();

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -54,7 +54,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -118,7 +118,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
@@ -193,7 +193,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
@@ -268,7 +268,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
@@ -353,7 +353,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -373,13 +373,16 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   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;
 
@@ -400,6 +403,35 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       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;
+      }
     }
   }
 
@@ -513,7 +545,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		this.sortCurrent = {};
     this.dateRange = []
     this.companyId = undefined;
-    this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: 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();
 		sessionStorage.removeItem('maintenanceData');
     setTimeout(_=>{

src/app/views/new-statistics/maintenance-statistics/user-evaluate-statistics/user-evaluate-statistics.component.ts

@@ -55,7 +55,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -122,7 +122,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
@@ -209,7 +209,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
@@ -296,7 +296,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
@@ -383,7 +383,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail5(data, type){
 		let query = null
@@ -470,7 +470,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail6(data, type){
 		let query = null
@@ -548,7 +548,7 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -568,13 +568,16 @@ export class UserEvaluateStatisticsComponent 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;
 
@@ -595,6 +598,35 @@ export class UserEvaluateStatisticsComponent 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;
+      }
     }
   }
 
@@ -710,7 +742,14 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrent = {};
     this.dateRange = []
     this.userId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined};
+    this.fieldConfig.fields = {
+      buildingId: undefined,
+      floorId: undefined,
+      categoryId: undefined,
+      groupId: 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(_=>{

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.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.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.floorDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.repairDeptDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
 	<span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
@@ -28,6 +28,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>

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

@@ -63,6 +63,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					userId: this.fieldConfig.fields.userId || undefined,
@@ -85,6 +86,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					userId: data.userId ? data.userId : -1 || undefined,
@@ -128,6 +130,7 @@ export class UserStatisticsComponent 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,
@@ -155,6 +158,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					userId: data.userId ? data.userId : -1,
@@ -203,6 +207,7 @@ export class UserStatisticsComponent 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,
@@ -230,6 +235,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					userId: data.userId ? data.userId : -1,
@@ -278,6 +284,7 @@ export class UserStatisticsComponent 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,
@@ -310,6 +317,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
+        repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
 				searchQuery:{
 					statusValue: 'close',
 					userId: data.userId ? data.userId : -1,
@@ -371,13 +379,16 @@ export class UserStatisticsComponent 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;
 
@@ -398,6 +409,35 @@ export class UserStatisticsComponent 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;
+      }
     }
   }
 
@@ -425,6 +465,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
 			groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -477,6 +518,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -511,7 +553,14 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		this.sortCurrent = {};
     this.dateRange = []
     // this.userId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined};
+    this.fieldConfig.fields = {
+      buildingId: undefined,
+      floorId: undefined,
+      categoryId: undefined,
+      groupId: 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(_=>{
@@ -560,8 +609,8 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, userId: undefined},
-    config: {buildingAndFloor: true, category123: true, groupAndUser: true},
+    fields: {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, userId: undefined, repairDeptId: undefined},
+    config: {buildingAndFloor: true, category123: true, groupAndUser: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-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>

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.ts

@@ -74,13 +74,16 @@ export class WorkHourBigStatisticsComponent 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 WorkHourBigStatisticsComponent 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;
+      }
     }
   }
 
@@ -219,7 +251,8 @@ export class WorkHourBigStatisticsComponent 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();
     setTimeout(_=>{

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-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>

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.component.ts

@@ -74,13 +74,16 @@ export class WorkHourSmallStatisticsComponent 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 WorkHourSmallStatisticsComponent 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;
+      }
     }
   }
 
@@ -221,7 +253,8 @@ export class WorkHourSmallStatisticsComponent 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, workHourParentId: undefined};
     this.customChangeDateComponent.resetByDate();
     setTimeout(_=>{

src/app/views/new-statistics/phone-statistics/date-phone-statistics/date-phone-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)="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>

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

@@ -74,13 +74,16 @@ export class DatePhoneStatisticsComponent 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 DatePhoneStatisticsComponent 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;
+      }
     }
   }
 
@@ -207,7 +239,8 @@ export class DatePhoneStatisticsComponent 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 = {buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();

src/app/views/new-statistics/phone-statistics/department-phone-statistics/department-phone-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>

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

@@ -74,13 +74,16 @@ export class DepartmentPhoneStatisticsComponent 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 DepartmentPhoneStatisticsComponent 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;
+      }
     }
   }
 
@@ -205,7 +237,8 @@ export class DepartmentPhoneStatisticsComponent 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 = {buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();