src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -326,7 +326,6 @@ export class ClinicalUsersManagementComponent implements OnInit {
     });
     let data = {
       user: {
-				upType: "changeDept",
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
         gradeId: that.validateForm.value.gradeId,
@@ -348,10 +347,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
     }
     if (!that.add) {
       data.user["id"] = that.coopId;
-			data.user.upType = "changeDept";
-    }else{
-			delete data.user.upType;
-		}
+    }
     that.mainService
       .coopData(that.add ? "addData" : "updData", "user", data)
       .subscribe((data) => {

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

@@ -42,7 +42,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-	<!-- 			<nz-form-item class="mb0">
+				<nz-form-item class="mb0">
 				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
 				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
 				    <nz-radio-group formControlName="parent">
@@ -50,7 +50,7 @@
 				      <label nz-radio [nzValue]="0">否</label>
 				    </nz-radio-group>
 				  </nz-form-control>
-				</nz-form-item> -->
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -40,7 +40,7 @@ export class QueryRangeComponent implements OnInit {
       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
-			parent :[this.parent, [Validators.required]]
+			parent :[this.parent?1:0, [Validators.required]]
     });
   }
   // 表单提交

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

@@ -1,6 +1,6 @@
 <div class="save add display_flex align-items_center justify-content_flex-center">
   <div class="modalBody">
-    <div class="title">详细搜索<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    <div class="title">更多搜索<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
@@ -143,6 +143,20 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.deptType">
+				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="deptTypeId" nzPlaceHolder="请选择科室类型" (nzOpenChange)="openChangeDeptType($event)">
+				      <ng-container *ngFor="let option of deptTypeList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -51,7 +51,8 @@ export class SearchMoreComponent implements OnInit {
     this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
     this.companyList = this.fieldConfig.fields.companyDTO ? [this.fieldConfig.fields.companyDTO] : [];
     this.repairDeptList = this.fieldConfig.fields.repairDeptDTO ? [this.fieldConfig.fields.repairDeptDTO] : [];
-
+		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
+		 
     this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
@@ -63,7 +64,8 @@ export class SearchMoreComponent implements OnInit {
       floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
       companyId: [this.fieldConfig.fields.companyDTO ? this.fieldConfig.fields.companyDTO.id  : null],
       repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
-    });
+			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
+		});
   }
   // 表单提交
   submitForm(): void {
@@ -116,6 +118,11 @@ export class SearchMoreComponent implements OnInit {
       fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
     }
+		if(this.fieldConfig.config.deptType){
+		  fields.deptTypeId = this.validateForm.value.deptTypeId;
+		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
+		}
+		
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -181,7 +188,26 @@ export class SearchMoreComponent implements OnInit {
     this.validateForm.controls.userId.setValue(null);
     this.getUserList();
   }
-
+	
+	// =================科室类型===================
+	
+	// 科室类型
+	openChangeDeptType(flag){
+	  flag && this.getDeptTypeList();
+	}
+	
+	// 获取科室类型列表
+	deptTypeList:any[] = [];
+	getDeptTypeList(keyword?) {
+	  this.isLoading = true;
+	  this.mainService
+	    .getDictionary("list", "dept_type")
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.deptTypeList = data;
+	    });
+	}
+	
   // =================维修人员===================
 
   // 维修人员搜索

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

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

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

@@ -0,0 +1,74 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <div class="searchDataItem">
+      <span class="label">建单时间</span>：
+      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
+      </nz-range-picker>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+  <thead (nzSortChange)="sort($event)" nzSingleSort>
+    <tr>
+      <th nzWidth="10%">业务分类名称</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭工单</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.name }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+			<td>{{ data.totalPrice }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
+      <td>{{ data.aveper }}</td>
+      <td>{{ data.total_time }}</td>
+      <td>{{ data.five_count }}</td>
+      <td>{{ data.special_close }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.name }}</td>
+        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%">{{ data.totalGrade }}</td>
+				<td style="width: 10%">{{ data.totalPrice }}</td>
+        <td style="width: 10%">{{ data.response_time_num }}</td>
+        <td style="width: 10%">{{ data.execution_time_num }}</td>
+        <td style="width: 10%">{{ data.aveper }}</td>
+        <td style="width: 10%">{{ data.total_time }}</td>
+        <td style="width: 10%">{{ data.five_count }}</td>
+        <td style="width: 10%">{{ data.special_close }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

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

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

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

@@ -0,0 +1,252 @@
+import { TabService } from './../../services/tab.service';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
+import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-business-classify-statistics",
+  templateUrl: "./business-classify-statistics.component.html",
+  styleUrls: ["./business-classify-statistics.component.less"],
+})
+export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  statisticsTypeId;//统计分类id
+
+  ngOnInit() {
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "statisticsDateTransOrderQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/exportMergeTitle", "statisticsDateTransOrderQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
+    this.search();
+  }
+
+  // 防抖
+  isLoading = false;
+
+  openChangeStatisticsType(flag){
+    flag && this.getStatisticsTypeList();
+  }
+
+  // 获取统计分类列表
+  statisticsTypeList:any[] = [];
+  getStatisticsTypeList(keyword?) {
+    this.isLoading = true;
+    this.mainService
+      .getDictionary("list", "statistics_date_type")
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.statisticsTypeList = data;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined},
+    config: {groupAndUser: true, building: true, dept: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,21 @@
+import { BusinessClassifyStatisticsComponent } from './business-classify-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BusinessClassifyStatisticsRoutingModule } from './business-classify-statistics-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+
+
+@NgModule({
+  declarations: [
+    BusinessClassifyStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    BusinessClassifyStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class BusinessClassifyStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html

@@ -20,18 +20,20 @@
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>
 <div class="tableWrap">
-  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 20 + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
+  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 100 + 20 + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
     <thead (nzSortChange)="sort($event)" nzSingleSort>
       <tr>
         <th rowspan="2" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
         <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
         <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
-        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th colspan="3" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
       </tr>
       <tr>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
           <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
+					<th nzShowSort [nzSortKey]="dictionary.value + 'Score'" [(nzSort)]="sortCurrent[dictionary.value + 'Score']">费用(元)</th>
         </ng-container>
       </tr>
     </thead>
@@ -40,9 +42,11 @@
         <td>{{ data.date }}</td>
         <td>{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
+				<td>{{ data.totalPrice }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <td>{{ data[dictionary.value + 'Count'] }}</td>
           <td>{{ data[dictionary.value + 'Grade'] }}</td>
+					<td>{{ data[dictionary.value + 'Score'] }}</td>
         </ng-container>
       </tr>
     </tbody>
@@ -52,9 +56,11 @@
           <td>{{ data.date }}</td>
           <td>{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
+					<td>{{ data.totalPrice }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">
             <td>{{ data[dictionary.value + 'Count'] }}</td>
             <td>{{ data[dictionary.value + 'Grade'] }}</td>
+						<td>{{ data[dictionary.value + 'Score'] }}</td>
           </ng-container>
         </tr>
       </table>

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

@@ -104,9 +104,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
       let dictionaryList = data || [];
       dictionaryList = cloneDeep(dictionaryList);
       let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
-      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px');
+      this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px');
       if (num !== undefined) {
         this.pageIndex = num;
       }

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

@@ -34,15 +34,16 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
@@ -50,6 +51,7 @@
       <td>{{ data.date }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
+			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
@@ -61,15 +63,16 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.date }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.totalGrade }}</td>
-        <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.execution_time_num }}</td>
-        <td style="width: 11%">{{ data.aveper }}</td>
-        <td style="width: 11%">{{ data.total_time }}</td>
-        <td style="width: 11%">{{ data.five_count }}</td>
-        <td style="width: 11%">{{ data.special_close }}</td>
+        <td style="width: 10%">{{ data.date }}</td>
+        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%">{{ data.totalGrade }}</td>
+				<td style="width: 10%">{{ data.totalPrice }}</td>
+        <td style="width: 10%">{{ data.response_time_num }}</td>
+        <td style="width: 10%">{{ data.execution_time_num }}</td>
+        <td style="width: 10%">{{ data.aveper }}</td>
+        <td style="width: 10%">{{ data.total_time }}</td>
+        <td style="width: 10%">{{ data.five_count }}</td>
+        <td style="width: 10%">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -5,17 +5,18 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
-    <div class="searchDataItem">
-      <span class="label">楼栋</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
-        <ng-container *ngFor="let option of buildingList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
-        </ng-container>
-        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-        </nz-option>
-      </nz-select>
-    </div>
+		
+		<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-option *ngIf="!isLoading" [nzLabel]="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">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
@@ -24,46 +25,57 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
 <div class="tableWrap">
-  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 50 * 1 + 20 + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
+  <nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
     <thead (nzSortChange)="sort($event)" nzSingleSort>
       <tr>
+				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
         <th rowspan="2">科室(编码)</th>
         <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
         <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
-        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th colspan="3" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
       </tr>
       <tr>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
           <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
-        </ng-container>
+					<th nzShowSort [nzSortKey]="dictionary.value + 'Score'" [(nzSort)]="sortCurrent[dictionary.value + 'Score']">费用(元)</th>
+				</ng-container>
       </tr>
     </thead>
     <tbody>
       <tr *ngFor="let data of listOfData">
+				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}</td>
         <td class="width150">{{ data.name }}</td>
         <td>{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
+				<td>{{ data.totalPrice }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <td>{{ data[dictionary.value + 'Count'] }}</td>
           <td>{{ data[dictionary.value + 'Grade'] }}</td>
+					<td>{{ data[dictionary.value + 'Score'] }}</td>
         </ng-container>
       </tr>
     </tbody>
     <ng-template #footerTpl>
       <table class="footTable">
         <tr *ngFor="let data of listOfDataEnd">
-          <td class="width150">{{ data.name }}</td>
+					<td class="width150" *ngIf="parent==1">{{ data.parentName }}</td>
+					<td class="width150" *ngIf="parent==0">{{ data.name }}</td>
+					<td class="width150" *ngIf="parent==1"></td>
           <td>{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
+					<td>{{ data.totalPrice }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">
             <td>{{ data[dictionary.value + 'Count'] }}</td>
             <td>{{ data[dictionary.value + 'Grade'] }}</td>
+						<td>{{ data[dictionary.value + 'Score'] }}</td>
           </ng-container>
         </tr>
       </table>

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

@@ -7,6 +7,8 @@ import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
 import cloneDeep from 'lodash-es/cloneDeep'
+import { ToolService } from "../../../../services/tool.service";
+
 @Component({
   selector: "app-department-business-statistics",
   templateUrl: "./department-business-statistics.component.html",
@@ -18,6 +20,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -28,8 +31,10 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   widthConfig: any[] = [];
 
   buildingId;//楼栋id
-
-  searchTimerSubject = new Subject();
+	hospital:any;
+	deptTypeId;//科室类型id
+	deptId;
+	searchTimerSubject = new Subject();
 
   ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -38,6 +43,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     });
     this.initSessionData();
     this.getQueryParams();
+		this.getDeparts();
     this.search();
   }
 
@@ -72,11 +78,13 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+  parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+  	this.parent = newStatistics.parent;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -109,26 +117,34 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   // 表格数据
   loading1 = false;
   dictionaryList: any[] = [];
+	widthValue:any;
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
       let dictionaryList = data || [];
       dictionaryList = cloneDeep(dictionaryList);
       let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
-      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });;
-      if (num !== undefined) {
+      this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+      if(this.parent==1){
+				this.widthValue = this.widthConfig.length * 100 + 300 * 1 + 20
+			}else{
+				this.widthValue = this.widthConfig.length * 100 + 149 * 1 + 20
+			}
+			if (num !== undefined) {
         this.pageIndex = num;
       }
       let postData:any = {
         idx: this.pageIndex - 1,
         sum: this.pageSize,
+				showParentDept: this.parent==1 ? 'true' : undefined,
+				deptId: this.deptId || undefined,
+				buildingId: this.fieldConfig.fields.buildingId || undefined,
         startDate: this.dateRange[0] || undefined,
         endDate: this.dateRange[1] || undefined,
         hosId: this.getHosId,
         groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-        userId: this.fieldConfig.fields.userId || undefined,
-        buildingId: this.buildingId || undefined,
+        userId: this.fieldConfig.fields.userId || undefined
       };
       if (field && sort) {
         postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -183,12 +199,14 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
-      buildingId: this.buildingId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -222,8 +240,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.buildingId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined};
     this.search();
   }
 
@@ -242,7 +260,31 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   openChangeBuilding(flag){
     flag && this.getBuildingList();
   }
-
+	
+	// 科室搜索
+	changeInp(e) {
+	  this.searchTimer(this.getDeparts, e);
+	}
+	
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      cascadeHosId: this.hospital,
+	      dept: dept,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
+	
   // 获取报修科室列表
   buildingList:any[] = [];
   getBuildingList(keyword?) {
@@ -266,8 +308,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined},
-    config: {groupAndUser: true},
+    fields: {groupId: undefined, userId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">楼栋</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
-        <ng-container *ngFor="let option of buildingList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+      <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-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,31 +24,36 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO || fieldConfig.fields.buildingDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%">科室(编码)</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
+      <th nzWidth="9%">科室(编码)</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
       <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
+			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
@@ -60,15 +65,18 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.name }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.totalGrade }}</td>
-        <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.execution_time_num }}</td>
-        <td style="width: 11%">{{ data.aveper }}</td>
-        <td style="width: 11%">{{ data.total_time }}</td>
-        <td style="width: 11%">{{ data.five_count }}</td>
-        <td style="width: 11%">{{ data.special_close }}</td>
+				<td style="width: 9%" *ngIf="parent==1">{{ data.parentName }}</td>
+				<td style="width: 9%" *ngIf="parent==0">{{ data.name }}</td>
+				<td style="width: 9%" *ngIf="parent==1"></td>
+        <td style="width: 9%">{{ data.totalCount }}</td>
+        <td style="width: 9%">{{ data.totalGrade }}</td>
+				<td style="width: 9%">{{ data.totalPrice }}</td>
+        <td style="width: 9%">{{ data.response_time_num }}</td>
+        <td style="width: 9%">{{ data.execution_time_num }}</td>
+        <td style="width: 9%">{{ data.aveper }}</td>
+        <td style="width: 9%">{{ data.total_time }}</td>
+        <td style="width: 9%">{{ data.five_count }}</td>
+        <td style="width: 9%">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -6,6 +6,7 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
 @Component({
   selector: "app-department-quality-control-statistics",
   templateUrl: "./department-quality-control-statistics.component.html",
@@ -17,6 +18,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -26,7 +28,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   listLength: number = 0; //表格总数据量
 
   buildingId;//楼栋id
-
+  hospital:any;
+  deptTypeId;//科室类型id
+  deptId;
   searchTimerSubject = new Subject();
 
   ngOnInit() {
@@ -36,6 +40,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     });
     this.initSessionData();
     this.getQueryParams();
+		this.getDeparts();
     this.search();
   }
 
@@ -70,11 +75,13 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+  parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+  	this.parent = newStatistics.parent;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -113,10 +120,12 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -174,10 +183,12 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -215,8 +226,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.buildingId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.search();
   }
 
@@ -235,7 +246,31 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   openChangeBuilding(flag){
     flag && this.getBuildingList();
   }
-
+	
+	// 科室搜索
+	changeInp(e) {
+	  this.searchTimer(this.getDeparts, e);
+	}
+	
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      cascadeHosId: this.hospital,
+	      dept: dept,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
+	
   // 获取报修科室列表
   buildingList:any[] = [];
   getBuildingList(keyword?) {
@@ -259,8 +294,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
-    config: {groupAndUser: true, statisticsType: true, taskType: true},
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, statisticsType: true, taskType: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">楼栋</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
-        <ng-container *ngFor="let option of buildingList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+      <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-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,24 +24,27 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO || fieldConfig.fields.buildingDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
+			<th nzWidth="20%" *ngIf="parent==1">父级科室(编码)</th>
       <th nzWidth="20%">科室(编码)</th>
-      <th nzWidth="20%" nzShowSort nzSortKey="service" [(nzSort)]="sortCurrent.service">服务台建单数</th>
-      <th nzWidth="20%" nzShowSort nzSortKey="nurse" [(nzSort)]="sortCurrent.nurse">护士端建单数</th>
-      <th nzWidth="20%" nzShowSort nzSortKey="system" [(nzSort)]="sortCurrent.system">系统自动建单数</th>
-      <th nzWidth="20%" nzShowSort nzSortKey="wechat" [(nzSort)]="sortCurrent.wechat">微信端建单数量</th>
+      <th nzWidth="15%" nzShowSort nzSortKey="service" [(nzSort)]="sortCurrent.service">服务台建单数</th>
+      <th nzWidth="15%" nzShowSort nzSortKey="nurse" [(nzSort)]="sortCurrent.nurse">护士端建单数</th>
+      <th nzWidth="15%" nzShowSort nzSortKey="system" [(nzSort)]="sortCurrent.system">系统自动建单数</th>
+      <th nzWidth="15%" nzShowSort nzSortKey="wechat" [(nzSort)]="sortCurrent.wechat">微信端建单数量</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
       <td>{{ data.name }}</td>
       <td>{{ data.service }}</td>
       <td>{{ data.nurse }}</td>
@@ -52,11 +55,13 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 20%">{{ data.name }}</td>
-        <td style="width: 20%">{{ data.service }}</td>
-        <td style="width: 20%">{{ data.nurse }}</td>
-        <td style="width: 20%">{{ data.system }}</td>
-        <td style="width: 20%">{{ data.wechat }}</td>
+				<td style="width: 20%" *ngIf="parent==1">{{ data.parentName }}</td>
+				<td style="width: 20%" *ngIf="parent==0">{{ data.name }}</td>
+				<td style="width: 20%" *ngIf="parent==1"></td>
+        <td style="width: 15%">{{ data.service }}</td>
+        <td style="width: 15%">{{ data.nurse }}</td>
+        <td style="width: 15%">{{ data.system }}</td>
+        <td style="width: 15%">{{ data.wechat }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -6,6 +6,7 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
 @Component({
   selector: "app-distribution-department-source-statistics",
   templateUrl: "./distribution-department-source-statistics.component.html",
@@ -17,6 +18,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -26,7 +28,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
   listLength: number = 0; //表格总数据量
 
   buildingId;//楼栋id
-
+  hospital:any;
+  deptTypeId;//科室类型id
+  deptId;
   searchTimerSubject = new Subject();
 
   ngOnInit() {
@@ -36,6 +40,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     });
     this.initSessionData();
     this.getQueryParams();
+		this.getDeparts();
     this.search();
   }
 
@@ -70,11 +75,13 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+  parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+  	this.parent = newStatistics.parent;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -113,10 +120,12 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -174,10 +183,12 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -215,8 +226,8 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.buildingId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+		this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.search();
   }
 
@@ -224,7 +235,31 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
   changeBuildingInp(e) {
     this.searchTimer(this.getBuildingList, e);
   }
-
+	
+	// 科室搜索
+	changeInp(e) {
+	  this.searchTimer(this.getDeparts, e);
+	}
+	
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      cascadeHosId: this.hospital,
+	      dept: dept,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
+	
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {
@@ -259,8 +294,8 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
-    config: {groupAndUser: true, statisticsType: true, taskType: true},
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, statisticsType: true, taskType: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -98,6 +98,15 @@ const routes: Routes = [
           title: '配-来源统计'
         }
       },
+			{
+			  // 业务分类统计
+			  path: 'businessClassifyStatistics',
+			  loadChildren: () => import('./business-classify-statistics/business-classify-statistics.module').then(m => m.BusinessClassifyStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-业务分类统计'
+			  }
+			},
     ]
   }
 ];

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.html

@@ -66,7 +66,8 @@
     <div class="statistics width-60 mar-right-8">
 			<div class="statistics-box">
 				<div class="sign-green"></div>
-				<div class="statistics-title">业务分类</div>
+				<div class="statistics-title">业务分类top5</div>
+				<div class="more" *ngIf="showMore('businessClassifyStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/businessClassifyStatistics')">更多></div>
 			</div>
 			<div class="echarts-repairs">
 				<div echarts class="echarts" [options]='businessOptions'></div>

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html

@@ -29,18 +29,20 @@
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>
 <div class="tableWrap">
-  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 50 * 1 + 20 + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
+  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 150 * 1 + 20 + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
     <thead (nzSortChange)="sort($event)" nzSingleSort>
       <tr>
         <th rowspan="2">人员(编码)</th>
         <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
         <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
-        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th colspan="3" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
       </tr>
       <tr>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
           <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
+					<th nzShowSort [nzSortKey]="dictionary.value + 'Score'" [(nzSort)]="sortCurrent[dictionary.value + 'Score']">费用(元)</th>
         </ng-container>
       </tr>
     </thead>
@@ -49,9 +51,11 @@
         <td class="width150">{{ data.name }}</td>
         <td>{{ data.totalCount }}</td>
         <td>{{ data.totalGrade }}</td>
+				<td>{{ data.totalPrice }}</td>
         <ng-container *ngFor="let dictionary of dictionaryList">
           <td>{{ data[dictionary.value + 'Count'] }}</td>
           <td>{{ data[dictionary.value + 'Grade'] }}</td>
+					<td>{{ data[dictionary.value + 'Score'] }}</td>
         </ng-container>
       </tr>
     </tbody>
@@ -61,9 +65,11 @@
           <td class="width150">{{ data.name }}</td>
           <td>{{ data.totalCount }}</td>
           <td>{{ data.totalGrade }}</td>
+					<td>{{ data.totalPrice }}</td>
           <ng-container *ngFor="let dictionary of dictionaryList">
             <td>{{ data[dictionary.value + 'Count'] }}</td>
             <td>{{ data[dictionary.value + 'Grade'] }}</td>
+						<td>{{ data[dictionary.value + 'Score'] }}</td>
           </ng-container>
         </tr>
       </table>

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

@@ -114,9 +114,9 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
       let dictionaryList = data || [];
       dictionaryList = cloneDeep(dictionaryList);
       let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
-      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });
+      this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });
       if (num !== undefined) {
         this.pageIndex = num;
       }

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

@@ -31,15 +31,16 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%">人员(编码)</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+      <th nzWidth="10%">人员(编码)</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
     </tr>
   </thead>
   <tbody>
@@ -47,6 +48,7 @@
       <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.totalGrade }}</td>
+			<td>{{ data.totalPrice }}</td>
       <td>{{ data.response_time_num }}</td>
       <td>{{ data.execution_time_num }}</td>
       <td>{{ data.aveper }}</td>
@@ -58,15 +60,16 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.name }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.totalGrade }}</td>
-        <td style="width: 11%">{{ data.response_time_num }}</td>
-        <td style="width: 11%">{{ data.execution_time_num }}</td>
-        <td style="width: 11%">{{ data.aveper }}</td>
-        <td style="width: 11%">{{ data.total_time }}</td>
-        <td style="width: 11%">{{ data.five_count }}</td>
-        <td style="width: 11%">{{ data.special_close }}</td>
+        <td style="width: 10%">{{ data.name }}</td>
+        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%">{{ data.totalGrade }}</td>
+				<td style="width: 10%">{{ data.totalPrice }}</td>
+        <td style="width: 10%">{{ data.response_time_num }}</td>
+        <td style="width: 10%">{{ data.execution_time_num }}</td>
+        <td style="width: 10%">{{ data.aveper }}</td>
+        <td style="width: 10%">{{ data.total_time }}</td>
+        <td style="width: 10%">{{ data.five_count }}</td>
+        <td style="width: 10%">{{ data.special_close }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -37,10 +37,11 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="25%">耗材名称(耗材编号)</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含耗材工单总数</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="consumableNum" [(nzSort)]="sortCurrent.consumableNum">使用数量</th>
-      <th nzWidth="25%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">总费用(元)</th>
+      <th nzWidth="20%">耗材名称(耗材编号)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">含耗材工单总数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="consumableNum" [(nzSort)]="sortCurrent.consumableNum">使用数量</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="avgPrice" [(nzSort)]="sortCurrent.avgPrice">平均单价</th>
+			<th nzWidth="20%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">总费用(元)</th>
     </tr>
   </thead>
   <tbody>
@@ -48,16 +49,18 @@
       <td>{{ data.consumableName }}<ng-container *ngIf="data.consumableCode">({{ data.consumableCode }})</ng-container></td>
       <td>{{ data.sum }}</td>
       <td>{{ data.consumableNum }}</td>
+			<td>{{ data.avgPrice }}</td>
       <td>{{ data.consumablePrice }}</td>
     </tr>
   </tbody>
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 25%">{{ data.consumableName }}</td>
-        <td style="width: 25%">{{ data.sum }}</td>
-        <td style="width: 25%">{{ data.consumableNum }}</td>
-        <td style="width: 25%">{{ data.consumablePrice }}</td>
+        <td style="width: 20%">{{ data.consumableName }}</td>
+        <td style="width: 20%">{{ data.sum }}</td>
+        <td style="width: 20%">{{ data.consumableNum }}</td>
+				<td style="width: 20%">{{ data.avgPrice }}</td>
+        <td style="width: 20%">{{ data.consumablePrice }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">科室类型</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
-        <ng-container *ngFor="let option of deptTypeList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+      <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-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +24,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.deptTypeDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
@@ -32,10 +32,12 @@
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
+			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
       <th nzWidth="10%">科室名称(编码)</th>
       <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
@@ -50,6 +52,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
       <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
       <td>{{ data.sum }}</td>
       <td>{{ data.degreeCount }}</td>
@@ -65,7 +68,9 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.deptCode }}</td>
+				<td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
+				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode }}</td>
+				<td style="width: 10%" *ngIf="parent==1"></td>
         <td style="width: 10%">{{ data.sum }}</td>
         <td style="width: 10%">{{ data.degreeCount }}</td>
         <td style="width: 10%">{{ data.oneStar }}</td>

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

@@ -4,6 +4,10 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+
 @Component({
   selector: "app-department-evaluate-statistics",
   templateUrl: "./department-evaluate-statistics.component.html",
@@ -15,6 +19,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -22,12 +27,20 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
-
-  deptTypeId;//科室类型id
-
+	hospital:any;
+	deptTypeId;//科室类型id
+	deptId;
+	searchTimerSubject = new Subject();
+	
   ngOnInit() {
+		this.hospital = this.tool.getCurrentHospital().id
+		this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  let fun = v[0];
+		  fun.call(this, v[1]);
+		});
     this.initSessionData();
     this.getQueryParams();
+		this.getDeparts();
     this.search();
   }
 
@@ -62,12 +75,14 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+	parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
-
+		this.parent = newStatistics.parent;
+		
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
     dutyId = dutyId ? +dutyId : undefined;
@@ -105,12 +120,14 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+			showParentDept: this.parent==1 ? 'true' : undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
+      repairDeptId: this.deptId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -170,12 +187,14 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			showParentDept: this.parent==1 ? 'true' : undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+      repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -215,17 +234,46 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.deptTypeId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.search();
   }
 
-  // 防抖
+	// 防抖
   isLoading = false;
-
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
+	
+	// 科室搜索
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+	
+	// 边输入边搜索节流阀
+	searchTimer(fun, e) {
+	  this.isLoading = true;
+	  this.searchTimerSubject.next([fun, e]);
+	}
+	
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      cascadeHosId: this.hospital,
+	      dept: dept,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
 
   // 获取科室类型列表
   deptTypeList:any[] = [];
@@ -241,8 +289,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
   // 详细搜索
   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, deptTypeId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -5,17 +5,17 @@
       <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
       </nz-range-picker>
     </div>
-    <div class="searchDataItem">
-      <span class="label">科室类型</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
-        <ng-container *ngFor="let option of deptTypeList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-        </ng-container>
-        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-        </nz-option>
-      </nz-select>
-    </div>
+		<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-option *ngIf="!isLoading" [nzLabel]="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">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
@@ -24,7 +24,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.deptTypeDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
@@ -32,11 +32,12 @@
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-			<!-- <th nzWidth="10%" *ngIf="parent==1">父级科室</th> -->
+			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
       <th nzWidth="10%">科室名称(编码)</th>
       <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
@@ -52,7 +53,7 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-			<!-- <td *ngIf="parent==1">{{ data.parentName }}</td> -->
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
       <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
@@ -69,7 +70,9 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.deptCode }}</td>
+        <td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
+				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode}}</td>
+				<td style="width: 10%" *ngIf="parent==1"></td>
         <td style="width: 9%">{{ data.sum }}</td>
         <td style="width: 9%">{{ data.avgResponseTime }}</td>
         <td style="width: 9%">{{ data.avgResolvedTime }}</td>

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

@@ -4,6 +4,10 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+
 @Component({
   selector: "app-department-incident-statistics",
   templateUrl: "./department-incident-statistics.component.html",
@@ -15,6 +19,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -22,12 +27,20 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
-
+	hospital:any;
   deptTypeId;//科室类型id
-
+	deptId;
+	searchTimerSubject = new Subject();
+	
   ngOnInit() {
+		this.hospital = this.tool.getCurrentHospital().id
+		this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  let fun = v[0];
+		  fun.call(this, v[1]);
+		});
     this.initSessionData();
     this.getQueryParams();
+		this.getDeparts();
     this.search();
   }
 
@@ -107,13 +120,14 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-			// showParentDept: this.parent==1 ? 'true' : undefined,
+			showParentDept: this.parent==1 ? 'true' : undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
+			repairDeptId: this.deptId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -173,12 +187,14 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			showParentDept: this.parent==1 ? 'true' : undefined,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -218,18 +234,47 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.deptTypeId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.search();
   }
 
   // 防抖
   isLoading = false;
-
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
-
+	
+	// 科室搜索
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+	
+	// 边输入边搜索节流阀
+	searchTimer(fun, e) {
+	  this.isLoading = true;
+	  this.searchTimerSubject.next([fun, e]);
+	}
+	
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      cascadeHosId: this.hospital,
+	      dept: dept,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
+	
   // 获取科室类型列表
   deptTypeList:any[] = [];
   getDeptTypeList(keyword?) {
@@ -244,8 +289,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
   // 详细搜索
   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, deptTypeId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <div class="searchDataItem">
-      <span class="label">科室类型</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室类型" [(ngModel)]="deptTypeId" (nzOpenChange)="openChangeDeptType($event)">
-        <ng-container *ngFor="let option of deptTypeList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+      <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-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +24,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.deptTypeDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.category1DTO?.category}}</span>
@@ -32,10 +32,12 @@
   <span>{{fieldConfig.fields.category3DTO?.category}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
+	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
+			<th nzWidth="10%" *ngIf="parent==1">父级科室(编码)</th>
       <th nzWidth="20%">科室名称(编码)</th>
       <th nzWidth="16%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
       <th nzWidth="16%" nzShowSort nzSortKey="phoneCount" [(nzSort)]="sortCurrent.phoneCount">电话报修数</th>
@@ -46,7 +48,8 @@
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
-      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
+			<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
       <td>{{ data.sum }}</td>
       <td>{{ data.phoneCount }}</td>
       <td>{{ data.wechatCount }}</td>
@@ -57,7 +60,9 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 20%">{{ data.deptCode }}</td>
+				<td style="width: 10%" *ngIf="parent==1">{{ data.parentCode }}</td>
+				<td style="width: 20%" *ngIf="parent==0">{{ data.deptCode }}</td>
+				<td style="width: 20%" *ngIf="parent==1"></td>
         <td style="width: 16%">{{ data.sum }}</td>
         <td style="width: 16%">{{ data.phoneCount }}</td>
         <td style="width: 16%">{{ data.wechatCount }}</td>

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -4,6 +4,9 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { ToolService } from "../../../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 @Component({
   selector: "app-department-source-statistics",
   templateUrl: "./department-source-statistics.component.html",
@@ -15,6 +18,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     private message: NzMessageService,
     private route: ActivatedRoute,
     private tabService: TabService,
+		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -23,12 +27,21 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
+  hospital:any;
   deptTypeId;//科室类型id
+  deptId;
+  searchTimerSubject = new Subject();
 
   ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
+		this.hospital = this.tool.getCurrentHospital().id
+		this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  let fun = v[0];
+		  fun.call(this, v[1]);
+		});
+		this.initSessionData();
+		this.getQueryParams();
+		this.getDeparts();
+		this.search();
   }
 
   ngAfterViewInit(){
@@ -62,11 +75,13 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+	parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+		this.parent = newStatistics.parent;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -103,14 +118,16 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       this.pageIndex = num;
     }
     let postData:any = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
-      hosId: this.hosId || undefined,
-      dutyId: this.dutyId || undefined,
-      parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+			idx: this.pageIndex - 1,
+			sum: this.pageSize,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			startDate: this.dateRange[0] || undefined,
+			endDate: this.dateRange[1] || undefined,
+			hosId: this.hosId || undefined,
+			dutyId: this.dutyId || undefined,
+			repairDeptId: this.deptId || undefined,
+			parentDutyId: this.parentDutyId || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -170,12 +187,14 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
-      hosId: this.hosId || undefined,
-      dutyId: this.dutyId || undefined,
-      parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.deptTypeId || undefined,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			startDate: this.dateRange[0] || undefined,
+			endDate: this.dateRange[1] || undefined,
+			hosId: this.hosId || undefined,
+			dutyId: this.dutyId || undefined,
+			parentDutyId: this.parentDutyId || undefined,
+			deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
@@ -215,17 +234,46 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.deptTypeId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.deptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.search();
   }
 
   // 防抖
   isLoading = false;
-
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
+  
+  // 科室搜索
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+  
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  
+  // 获取所有科室
+  alldepart:any;
+  getDeparts(dept?) {
+    let data = {
+      department: {
+        cascadeHosId: this.hospital,
+        dept: dept,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+  			this.isLoading = false;
+        this.alldepart = data.list;
+      });
+  }
 
   // 获取科室类型列表
   deptTypeList:any[] = [];
@@ -241,8 +289,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
   // 详细搜索
   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, deptTypeId: undefined},
+    config: {groupAndUser: true, category123: true, buildingAndFloor: true, deptType: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -6,10 +6,10 @@
       </nz-range-picker>
     </div>
     <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)">
-        <ng-container *ngFor="let option of repairDeptList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+      <span class="label">三方公司</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择三方公司" [(ngModel)]="companyId" (nzOpenChange)="openChangeRepairDept($event)">
+        <ng-container *ngFor="let option of companyList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,12 +24,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/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -112,12 +112,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+			companyId: this.companyId,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      repairDeptId: this.repairDeptId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -175,12 +176,13 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+			companyId: this.companyId,
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      repairDeptId: this.repairDeptId || undefined,
+      repairDeptId: this.fieldConfig.fields.repairDeptId || undefined,
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -218,14 +220,14 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
-    this.repairDeptId = undefined;
-    this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.companyId = undefined;
+    this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined};
     this.search();
   }
 
   // 科室搜索
   changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+    this.searchTimer(this.getCompanyList, e);
   }
 
   // 防抖
@@ -236,7 +238,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   }
 
   openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+    flag && this.getCompanyList();
   }
 
   // 获取报修科室列表
@@ -259,11 +261,35 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
         this.repairDeptList = data.list;
       });
   }
-
+	
+	// 获取三方公司列表
+	companyId:any;
+	companyList:any[] = [];
+	getCompanyList(keyword?){
+	  let postData: any = {
+	    idx: 0,
+	    sum: 20,
+	    company: {
+	      busiType: { key: "company_busi_type", value: "2" },
+	      name: keyword,
+	      statisticalHosId: this.getHosId,
+	    },
+	  };
+	  this.isLoading = true;
+	  this.mainService.getFetchDataList("simple/data", "company", postData).subscribe(result => {
+	    this.isLoading = false;
+	    if(result.status == 200){
+	      this.companyList = result.list || [];
+	    }else{
+	      this.companyList = [];
+	    }
+	  });
+	}
+	
   // 详细搜索
   fieldConfig:any = {
-    fields: {categoryId: undefined, buildingId: undefined, floorId: undefined},
-    config: {category123: true, buildingAndFloor: true},
+    fields: {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: true},
+    config: {category123: true, buildingAndFloor: true, repairDept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -34,17 +34,18 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="10%">人员姓名(工号)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+      <th nzWidth="8%">人员姓名(工号)</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="totalScore" [(nzSort)]="sortCurrent.totalScore">总积分</th>
+			<th nzWidth="8%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
+      <th nzWidth="8%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
     </tr>
   </thead>
   <tbody>
@@ -58,6 +59,7 @@
       <td>{{ data.consumablePrice }}</td>
       <td>{{ data.workHourPrice }}</td>
       <td>{{ data.totalPrice }}</td>
+			<td>{{ data.totalScore }}</td>
       <td>{{ data.negativeNum }}</td>
       <td>{{ data.favorableRate }}</td>
     </tr>
@@ -65,17 +67,18 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.userName }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
-        <td style="width: 9%">{{ data.avgResponseTime }}</td>
-        <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
-        <td style="width: 9%">{{ data.consumablePrice }}</td>
-        <td style="width: 9%">{{ data.workHourPrice }}</td>
-        <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
-        <td style="width: 9%">{{ data.favorableRate }}</td>
+        <td style="width: 8%">{{ data.userName }}</td>
+        <td style="width: 8%">{{ data.sum }}</td>
+        <td style="width: 8%">{{ data.avgResponseTime }}</td>
+        <td style="width: 8%">{{ data.avgResolvedTime }}</td>
+        <td style="width: 8%">{{ data.resolvedOverNum }}</td>
+        <td style="width: 8%">{{ data.overTimeNum }}</td>
+        <td style="width: 8%">{{ data.consumablePrice }}</td>
+        <td style="width: 8%">{{ data.workHourPrice }}</td>
+        <td style="width: 8%">{{ data.totalPrice }}</td>
+				<td style="width: 8%">{{ data.totalScore }}</td>
+        <td style="width: 8%">{{ data.negativeNum }}</td>
+        <td style="width: 8%">{{ data.favorableRate }}</td>
       </tr>
     </table>
   </ng-template>

src/app/views/task-type-management/task-type-management.component.html

@@ -299,6 +299,18 @@
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allStatisticsDateType"></nz-option>
           </nz-select>
         </div>
+				<div nz-row class="mb8 display_flex align-items_center">
+				  <nz-form-label class="label">积分单价</nz-form-label>
+					<nz-input-number
+						class="flex_1"
+						[(ngModel)]="scorePrice"
+					 	[nzMin]="0"
+						[nzPrecision]="2"
+					 	[nzMax]="999999"
+					 	[nzStep]="0.1"
+					 	[nzPlaceHolder]="'请填写积分单价(保留2位小数)'"
+					 ></nz-input-number>
+				</div>
       </div>
       <!-- 规则信息 -->
       <div *ngIf="tabModalName=='gzxx'" class="ruleList">

src/app/views/task-type-management/task-type-management.component.ts

@@ -88,6 +88,7 @@ export class TaskTypeManagementComponent implements OnInit {
   urgeWeight:any; //急单权重
   commonWeight:any; //普单权重
   countRemark:string = ''; //统计备注
+	scorePrice:any; //积分单价
   association: any = {
     id: "",
     value: "",
@@ -851,6 +852,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.urgeWeight = data.urgeWeight;
     this.commonWeight = data.commonWeight;
     this.countRemark = data.countRemark || '';
+		this.scorePrice = data.scorePrice || '';
     this.association = {
       id: data.associationType.id + "",
       value: data.associationType.value,
@@ -1173,6 +1175,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.taskData.taskType["urgeWeight"] = this.urgeWeight;
     this.taskData.taskType["commonWeight"] = this.commonWeight;
     this.taskData.taskType["countRemark"] = this.countRemark;
+		this.taskData.taskType["scorePrice"] = this.scorePrice;
     if (this.association.id) {
       this.taskData.taskType["associationType"] = this.association;
     } else {
@@ -1511,6 +1514,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.urgeWeight = '';
     this.commonWeight = '';
     this.countRemark = '';
+		this.scorePrice = '';
     this.association = {
       id: null,
       value: "",

src/app/views/tripartite-company/tripartite-company.component.ts

@@ -259,7 +259,9 @@ export class TripartiteCompanyComponent implements OnInit {
     this.add = false;
     this.modal = true;
     this.coopData = data;
-		this.validateForm.controls.employScope.setValue(data.selectRange.id);
+		if(data.selectRange){
+			this.validateForm.controls.employScope.setValue(data.selectRange.id);
+		}
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.nickName.setValue(data.nickName);
     this.validateForm.controls.companyTypeIds.setValue(this.companyTypeList.map(v => ({label: v.name, value: v.id, checked: data.companyTypeIds.includes(v.id)})));

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

@@ -416,7 +416,6 @@ export class UsersManagementComponent implements OnInit {
     });
     let data = {
       user: {
-				upType: "changeDept",
         name: that.validateForm.value.name,
         account: that.validateForm.value.account,
         gradeId: that.validateForm.value.gradeId,
@@ -439,10 +438,7 @@ export class UsersManagementComponent implements OnInit {
     }
     if (!that.add) {
       data.user["id"] = that.coopId;
-			data.user.upType = "changeDept"
-    }else{
-			delete data.user.upType
-		}
+    }
     that.mainService
       .coopData(that.add ? "addData" : "updData", "user", data)
       .subscribe((data) => {