maotao hace 2 semanas
padre
commit
0c9fe741f7
Se han modificado 19 ficheros con 267 adiciones y 160 borrados
  1. 4 2
      src/app/components/incidentManagement/incident-detail/incident-detail.component.ts
  2. 2 2
      src/app/components/order-scope/order-scope.component.ts
  3. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html
  4. 3 2
      src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts
  5. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html
  6. 2 1
      src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts
  7. 28 23
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html
  8. 46 10
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts
  9. 1 1
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html
  10. 2 1
      src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts
  11. 53 51
      src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html
  12. 16 1
      src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.less
  13. 14 1
      src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts
  14. 56 54
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html
  15. 16 1
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.less
  16. 17 4
      src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts
  17. 1 1
      src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html
  18. 2 1
      src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts
  19. 2 2
      src/app/views/new-statistics/new-statistics.component.ts

+ 4 - 2
src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -88,12 +88,14 @@ export class IncidentDetailComponent implements OnInit {
88 88
         this.message.remove(this.maskFlag);
89 89
         this.maskFlag = false;
90 90
         this.incidentData = result.data || {};
91
-
91
+				if(this.incidentData.wxdegree){
92
+					this.incidentData.wxdegree.value = Number(this.incidentData.wxdegree.value)
93
+				}
92 94
         this.clickTbab(this.tabs[0]);
93 95
 
94 96
         let logs = this.incidentData.logs || [];
95 97
         this.resolveLogs = logs.filter(v => v.logType.value == 'resolve').slice(0, 1);
96
-        this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
98
+				this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
97 99
 
98 100
         this.getHospitalConfig();
99 101
       });

+ 2 - 2
src/app/components/order-scope/order-scope.component.ts

@@ -45,7 +45,7 @@ export class OrderScopeComponent implements OnInit {
45 45
 	activeScopeTab:any;
46 46
 	//#region 工单范围-运维start
47 47
 	allDuty:number = 1;
48
-	showReassign:number = 0;
48
+	showReassign:any = 0;
49 49
 	menuList:any;
50 50
 	
51 51
   ngOnInit() {
@@ -100,7 +100,7 @@ export class OrderScopeComponent implements OnInit {
100 100
     itsmGetOrderScope() {
101 101
       // 是否不限制部门
102 102
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
103
-      this.showReassign = this.itsmData.showReassign;
103
+      this.showReassign = this.itsmData.showReassign || 0;
104 104
 			// 权限内的院区和组
105 105
       let hosList = this.user.infoPermission.dutyList || [];
106 106
       let groups = this.user.infoPermission.dutyGroupList || [];

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

@@ -10,7 +10,7 @@
10 10
 		  <span class="label">科室</span>:
11 11
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
12 12
 		    <ng-container *ngFor="let option of alldepart">
13
-		      <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
13
+		      <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
14 14
 		    </ng-container>
15 15
 		    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
16 16
 		      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -125,7 +125,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
125 125
       let flag = dictionaryList.some((item) => item.value === 'dateOther');
126 126
       !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
127 127
       this.dictionaryList = dictionaryList;
128
-      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' });;
128
+      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' });
129 129
       if(this.parent==1){
130 130
 				this.widthValue = this.widthConfig.length * 100 + 300 * 1 + 20
131 131
 			}else{
@@ -271,8 +271,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
271 271
 	getDeparts(dept?) {
272 272
 	  let data = {
273 273
 	    department: {
274
-	      cascadeHosId: this.hospital,
274
+	      statisticalHosId: this.getHosId,
275 275
 	      dept: dept,
276
+	      searchType: 1,
276 277
 	    },
277 278
 	    idx: 0,
278 279
 	    sum: 20,

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

@@ -9,7 +9,7 @@
9 9
       <span class="label">科室</span>:
10 10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11 11
         <ng-container *ngFor="let option of alldepart">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
         </ng-container>
14 14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -257,8 +257,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
257 257
 	getDeparts(dept?) {
258 258
 	  let data = {
259 259
 	    department: {
260
-	      cascadeHosId: this.hospital,
260
+	      statisticalHosId: this.getHosId,
261 261
 	      dept: dept,
262
+	      searchType: 1,
262 263
 	    },
263 264
 	    idx: 0,
264 265
 	    sum: 20,

+ 28 - 23
src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -6,10 +6,10 @@
6 6
       </nz-range-picker>
7 7
     </div>
8 8
     <div class="searchDataItem">
9
-      <span class="label">楼栋</span>:
10
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
11
-        <ng-container *ngFor="let option of buildingList">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
9
+      <span class="label">科室</span>:
10
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11
+        <ng-container *ngFor="let option of alldepart">
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
         </ng-container>
14 14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,28 +24,31 @@
24 24
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
25 25
   </div>
26 26
 </div>
27
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
27
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO || fieldConfig.fields.buildingDTO">
28 28
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
29 29
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
30 30
   <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
31 31
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
32
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
32 33
 </div>
33 34
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
34 35
   <thead (nzSortChange)="sort($event)" nzSingleSort>
35 36
     <tr>
36
-      <th nzWidth="12%">科室(编码)</th>
37
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
38
-      <th nzWidth="11%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
39
-      <th nzWidth="11%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
40
-      <th nzWidth="11%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
41
-      <th nzWidth="11%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
42
-      <th nzWidth="11%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
43
-      <th nzWidth="11%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
44
-      <th nzWidth="11%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
37
+			<th nzWidth="10%" *ngIf="parent==1">父级科室(编码)</th>
38
+      <th nzWidth="10%">科室(编码)</th>
39
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
40
+      <th nzWidth="10%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
41
+      <th nzWidth="10%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
42
+      <th nzWidth="10%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
43
+      <th nzWidth="10%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
44
+      <th nzWidth="10%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
45
+      <th nzWidth="10%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
46
+      <th nzWidth="10%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
45 47
     </tr>
46 48
   </thead>
47 49
   <tbody>
48 50
     <tr *ngFor="let data of listOfData">
51
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
49 52
       <td>{{ data.name }}</td>
50 53
       <td>{{ data.totalCount }}</td>
51 54
       <td>{{ data.evaCount }}</td>
@@ -60,15 +63,17 @@
60 63
   <ng-template #footerTpl>
61 64
     <table class="footTable">
62 65
       <tr *ngFor="let data of listOfDataEnd">
63
-        <td style="width: 12%">{{ data.name }}</td>
64
-        <td style="width: 11%">{{ data.totalCount }}</td>
65
-        <td style="width: 11%">{{ data.evaCount }}</td>
66
-        <td style="width: 11%">{{ data.eva1 }}</td>
67
-        <td style="width: 11%">{{ data.eva2 }}</td>
68
-        <td style="width: 11%">{{ data.eva3 }}</td>
69
-        <td style="width: 11%">{{ data.eva4 }}</td>
70
-        <td style="width: 11%">{{ data.eva5 }}</td>
71
-        <td style="width: 11%">{{ data.avgCount }}</td>
66
+				<td style="width: 10%" *ngIf="parent==1">{{ data.parentName }}</td>
67
+				<td style="width: 10%" *ngIf="parent==0">{{ data.name }}</td>
68
+				<td style="width: 10%" *ngIf="parent==1"></td>
69
+        <td style="width: 10%">{{ data.totalCount }}</td>
70
+        <td style="width: 10%">{{ data.evaCount }}</td>
71
+        <td style="width: 10%">{{ data.eva1 }}</td>
72
+        <td style="width: 10%">{{ data.eva2 }}</td>
73
+        <td style="width: 10%">{{ data.eva3 }}</td>
74
+        <td style="width: 10%">{{ data.eva4 }}</td>
75
+        <td style="width: 10%">{{ data.eva5 }}</td>
76
+        <td style="width: 10%">{{ data.avgCount }}</td>
72 77
       </tr>
73 78
     </table>
74 79
   </ng-template>

+ 46 - 10
src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -6,6 +6,7 @@ import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } fro
6 6
 import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
7 7
 import { MainService } from 'src/app/services/main.service';
8 8
 import { ActivatedRoute } from '@angular/router';
9
+import { ToolService } from "../../../../services/tool.service";
9 10
 @Component({
10 11
   selector: "app-distribution-department-evaluate-statistics",
11 12
   templateUrl: "./distribution-department-evaluate-statistics.component.html",
@@ -17,6 +18,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
17 18
     private message: NzMessageService,
18 19
     private route: ActivatedRoute,
19 20
     private tabService: TabService,
21
+		private tool: ToolService,
20 22
   ) {}
21 23
 
22 24
   listOfData: any[] = []; //表格数据
@@ -25,9 +27,11 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
25 27
   pageSize: number = 30; //表格每页展示条数
26 28
   listLength: number = 0; //表格总数据量
27 29
 
28
-  buildingId;//楼栋id
29
-
30
-  searchTimerSubject = new Subject();
30
+	buildingId;//楼栋id
31
+	hospital:any;
32
+	deptTypeId;//科室类型id
33
+	deptId;
34
+	searchTimerSubject = new Subject();
31 35
 
32 36
   ngOnInit() {
33 37
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -36,6 +40,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
36 40
     });
37 41
     this.initSessionData();
38 42
     this.getQueryParams();
43
+		this.getDeparts();
39 44
     this.search();
40 45
   }
41 46
 
@@ -70,11 +75,13 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
70 75
   hosId:any;
71 76
   dutyId:any;
72 77
   parentDutyId:any;
78
+  parent:any;
73 79
   initSessionData(){
74 80
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
75 81
     let queryType:any = newStatistics.queryType;
76 82
     let hosId:any = newStatistics.hospitalId;
77 83
     let dutyId:any = newStatistics.dutyId;
84
+  	this.parent = newStatistics.parent;
78 85
 
79 86
     queryType = queryType ? +queryType : undefined;
80 87
     hosId = hosId ? +hosId : undefined;
@@ -113,10 +120,12 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
113 120
     let postData:any = {
114 121
       idx: this.pageIndex - 1,
115 122
       sum: this.pageSize,
123
+			showParentDept: this.parent==1 ? 'true' : undefined,
124
+			deptId: this.deptId || undefined,
125
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
116 126
       startDate: this.dateRange[0] || undefined,
117 127
       endDate: this.dateRange[1] || undefined,
118 128
       hosId: this.getHosId,
119
-      buildingId: this.buildingId || undefined,
120 129
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
121 130
       userId: this.fieldConfig.fields.userId || undefined,
122 131
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -174,10 +183,12 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
174 183
       nzDuration: 0,
175 184
     }).messageId;
176 185
     let postData:any = {
186
+			showParentDept: this.parent==1 ? 'true' : undefined,
187
+			deptId: this.deptId || undefined,
188
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
177 189
       startDate: this.dateRange[0] || undefined,
178 190
       endDate: this.dateRange[1] || undefined,
179 191
       hosId: this.getHosId,
180
-      buildingId: this.buildingId || undefined,
181 192
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
182 193
       userId: this.fieldConfig.fields.userId || undefined,
183 194
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -215,8 +226,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
215 226
 		this.sortCurrentValue = "";
216 227
 		this.sortCurrent = {};
217 228
     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')]
218
-    this.buildingId = undefined;
219
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
229
+    this.deptId = undefined;
230
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
220 231
     this.search();
221 232
   }
222 233
 
@@ -224,7 +235,32 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
224 235
   changeBuildingInp(e) {
225 236
     this.searchTimer(this.getBuildingList, e);
226 237
   }
227
-
238
+	
239
+	// 科室搜索
240
+	changeInp(e) {
241
+	  this.searchTimer(this.getDeparts, e);
242
+	}
243
+	
244
+	// 获取所有科室
245
+	alldepart:any;
246
+	getDeparts(dept?) {
247
+	  let data = {
248
+	    department: {
249
+	      statisticalHosId: this.getHosId,
250
+	      dept: dept,
251
+	      searchType: 1,
252
+	    },
253
+	    idx: 0,
254
+	    sum: 20,
255
+	  };
256
+	  this.mainService
257
+	    .getFetchDataList("data", "department", data)
258
+	    .subscribe((data) => {
259
+				this.isLoading = false;
260
+	      this.alldepart = data.list;
261
+	    });
262
+	}
263
+	
228 264
   // 防抖
229 265
   isLoading = false;
230 266
   searchTimer(fun, e) {
@@ -259,8 +295,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
259 295
 
260 296
   // 详细搜索
261 297
   fieldConfig:any = {
262
-    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
263
-    config: {groupAndUser: true, statisticsType: true, taskType: true},
298
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined},
299
+    config: {groupAndUser: true, statisticsType: true, taskType: true, building: true},
264 300
   }
265 301
   showSearchMore:boolean = false;
266 302
   showMore(){

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

@@ -9,7 +9,7 @@
9 9
       <span class="label">科室</span>:
10 10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11 11
         <ng-container *ngFor="let option of alldepart">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
         </ng-container>
14 14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -246,8 +246,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
246 246
 	getDeparts(dept?) {
247 247
 	  let data = {
248 248
 	    department: {
249
-	      cascadeHosId: this.hospital,
249
+	      statisticalHosId: this.getHosId,
250 250
 	      dept: dept,
251
+	      searchType: 1,
251 252
 	    },
252 253
 	    idx: 0,
253 254
 	    sum: 20,

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

@@ -9,7 +9,7 @@
9 9
       <span class="label">科室</span>:
10 10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11 11
         <ng-container *ngFor="let option of alldepart">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
         </ng-container>
14 14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -34,56 +34,58 @@
34 34
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
35 35
 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
36 36
 </div>
37
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
38
-  <thead (nzSortChange)="sort($event)" nzSingleSort>
39
-    <tr>
40
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
41
-      <th nzWidth="10%">科室名称(编码)</th>
42
-      <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
43
-      <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
44
-      <th nzWidth="10%" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
45
-      <th nzWidth="10%" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
46
-      <th nzWidth="10%" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
47
-      <th nzWidth="10%" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
48
-      <th nzWidth="10%" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
49
-      <th nzWidth="10%" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
50
-      <th nzWidth="10%" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
51
-    </tr>
52
-  </thead>
53
-  <tbody>
54
-    <tr *ngFor="let data of listOfData">
55
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
56
-      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
57
-      <td>{{ data.sum }}</td>
58
-      <td>{{ data.degreeCount }}</td>
59
-      <td>{{ data.oneStar }}</td>
60
-      <td>{{ data.twoStar }}</td>
61
-      <td>{{ data.threeStar }}</td>
62
-      <td>{{ data.fourStar }}</td>
63
-      <td>{{ data.fiveStar }}</td>
64
-      <td>{{ data.totalStar }}</td>
65
-      <td>{{ data.avgStar }}</td>
66
-    </tr>
67
-  </tbody>
68
-  <ng-template #footerTpl>
69
-    <table class="footTable">
70
-      <tr *ngFor="let data of listOfDataEnd">
71
-				<td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
72
-				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode }}</td>
73
-				<td style="width: 10%" *ngIf="parent==1"></td>
74
-        <td style="width: 10%">{{ data.sum }}</td>
75
-        <td style="width: 10%">{{ data.degreeCount }}</td>
76
-        <td style="width: 10%">{{ data.oneStar }}</td>
77
-        <td style="width: 10%">{{ data.twoStar }}</td>
78
-        <td style="width: 10%">{{ data.threeStar }}</td>
79
-        <td style="width: 10%">{{ data.fourStar }}</td>
80
-        <td style="width: 10%">{{ data.fiveStar }}</td>
81
-        <td style="width: 10%">{{ data.totalStar }}</td>
82
-        <td style="width: 10%">{{ data.avgStar }}</td>
83
-      </tr>
84
-    </table>
85
-  </ng-template>
86
-</nz-table>
37
+<div class="tableWrap">
38
+	<nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzWidthConfig]="widthConfig" [nzFooter]="footerTpl">
39
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
40
+			<tr>
41
+				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
42
+				<th rowspan="2">科室名称(编码)</th>
43
+				<th rowspan="2" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
44
+				<th rowspan="2" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
45
+				<th rowspan="2" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
46
+				<th rowspan="2" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
47
+				<th rowspan="2" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
48
+				<th rowspan="2" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
49
+				<th rowspan="2" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
50
+				<th rowspan="2" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
51
+				<th rowspan="2" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
52
+			</tr>
53
+		</thead>
54
+		<tbody>
55
+			<tr *ngFor="let data of listOfData">
56
+				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
57
+				<td class="width150">{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
58
+				<td>{{ data.sum }}</td>
59
+				<td>{{ data.degreeCount }}</td>
60
+				<td>{{ data.oneStar }}</td>
61
+				<td>{{ data.twoStar }}</td>
62
+				<td>{{ data.threeStar }}</td>
63
+				<td>{{ data.fourStar }}</td>
64
+				<td>{{ data.fiveStar }}</td>
65
+				<td>{{ data.totalStar }}</td>
66
+				<td>{{ data.avgStar }}</td>
67
+			</tr>
68
+		</tbody>
69
+		<ng-template #footerTpl>
70
+			<table class="footTable">
71
+				<tr *ngFor="let data of listOfDataEnd">
72
+					<td class="width150" *ngIf="parent==1">{{ data.parentCode }}</td>
73
+					<td class="width150" *ngIf="parent==0">{{ data.deptCode }}</td>
74
+					<td class="width150" *ngIf="parent==1"></td>
75
+					<td>{{ data.sum }}</td>
76
+					<td>{{ data.degreeCount }}</td>
77
+					<td>{{ data.oneStar }}</td>
78
+					<td>{{ data.twoStar }}</td>
79
+					<td>{{ data.threeStar }}</td>
80
+					<td>{{ data.fourStar }}</td>
81
+					<td>{{ data.fiveStar }}</td>
82
+					<td>{{ data.totalStar }}</td>
83
+					<td>{{ data.avgStar }}</td>
84
+				</tr>
85
+			</table>
86
+		</ng-template>
87
+	</nz-table>
88
+</div>
87 89
 <div class="pagination">
88 90
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
89 91
   <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>

+ 16 - 1
src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.less

@@ -53,7 +53,22 @@
53 53
   .table{
54 54
     margin: 0 8px;
55 55
   }
56
-
56
+	
57
+	.tableWrap{
58
+	  margin: 0 8px;
59
+	  overflow-x: auto;
60
+	  .footTable, tbody{
61
+	    td{
62
+	      width: 100px;
63
+	      max-width: 100px;
64
+	      &.width150{
65
+	        width: 150px;
66
+	        max-width: 150px;
67
+	      }
68
+	    }
69
+	  }
70
+	}
71
+	
57 72
   .moreFilter{
58 73
     margin-bottom: 16px;
59 74
     span{

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

@@ -113,6 +113,9 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
113 113
 
114 114
   // 表格数据
115 115
   loading1 = false;
116
+	widthStyle:any;
117
+	widthValue:any;
118
+	widthConfig:any = [];
116 119
   getList(num?: number, field?: string, sort?: string) {
117 120
     if (num !== undefined) {
118 121
       this.pageIndex = num;
@@ -138,6 +141,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
138 141
     if (field && sort) {
139 142
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
140 143
     }
144
+		if(this.parent==1){
145
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
146
+			this.widthStyle = '10%'
147
+			this.widthValue = 11 * 100 + 300 * 1 + 20
148
+		}else{
149
+			this.widthConfig = new Array(10).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
150
+			this.widthStyle = '20%'
151
+			this.widthValue = 10 * 100 + 149 * 1 + 20
152
+		}
141 153
     this.loading1 = true;
142 154
     this.mainService
143 155
       .postCustom("itsm/report", "deptEvaluate", postData)
@@ -261,8 +273,9 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
261 273
 	getDeparts(dept?) {
262 274
 	  let data = {
263 275
 	    department: {
264
-	      cascadeHosId: this.hospital,
276
+	      statisticalHosId: this.getHosId,
265 277
 	      dept: dept,
278
+	      searchType: 1,
266 279
 	    },
267 280
 	    idx: 0,
268 281
 	    sum: 20,

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

@@ -9,7 +9,7 @@
9 9
 		  <span class="label">科室</span>:
10 10
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11 11
 		    <ng-container *ngFor="let option of alldepart">
12
-		      <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+		      <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
 		    </ng-container>
14 14
 		    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
 		      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -34,59 +34,61 @@
34 34
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
35 35
 	<span>{{fieldConfig.fields.deptTypeDTO?.name}}</span>
36 36
 </div>
37
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
38
-  <thead (nzSortChange)="sort($event)" nzSingleSort>
39
-    <tr>
40
-			<th nzWidth="9%" *ngIf="parent==1">父级科室(编码)</th>
41
-      <th nzWidth="10%">科室名称(编码)</th>
42
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
43
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
44
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
45
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
46
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
47
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
48
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
49
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
50
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
51
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
52
-    </tr>
53
-  </thead>
54
-  <tbody>
55
-    <tr *ngFor="let data of listOfData">
56
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
57
-      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
58
-      <td>{{ data.sum }}</td>
59
-      <td>{{ data.avgResponseTime }}</td>
60
-      <td>{{ data.avgResolvedTime }}</td>
61
-      <td>{{ data.resolvedOverNum }}</td>
62
-      <td>{{ data.overTimeNum }}</td>
63
-      <td>{{ data.consumablePrice }}</td>
64
-      <td>{{ data.workHourPrice }}</td>
65
-      <td>{{ data.totalPrice }}</td>
66
-      <td>{{ data.negativeNum }}</td>
67
-      <td>{{ data.favorableRate }}</td>
68
-    </tr>
69
-  </tbody>
70
-  <ng-template #footerTpl>
71
-    <table class="footTable">
72
-      <tr *ngFor="let data of listOfDataEnd">
73
-        <td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
74
-				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode}}</td>
75
-				<td style="width: 10%" *ngIf="parent==1"></td>
76
-        <td style="width: 9%">{{ data.sum }}</td>
77
-        <td style="width: 9%">{{ data.avgResponseTime }}</td>
78
-        <td style="width: 9%">{{ data.avgResolvedTime }}</td>
79
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
80
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
81
-        <td style="width: 9%">{{ data.consumablePrice }}</td>
82
-        <td style="width: 9%">{{ data.workHourPrice }}</td>
83
-        <td style="width: 9%">{{ data.totalPrice }}</td>
84
-        <td style="width: 9%">{{ data.negativeNum }}</td>
85
-        <td style="width: 9%">{{ data.favorableRate }}</td>
86
-      </tr>
87
-    </table>
88
-  </ng-template>
89
-</nz-table>
37
+<div class="tableWrap">
38
+	<nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" accesskey=""[nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzWidthConfig]="widthConfig" [nzFooter]="footerTpl">
39
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
40
+			<tr>
41
+				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
42
+				<th rowspan="2">科室名称(编码)</th>
43
+				<th rowspan="2" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
44
+				<th rowspan="2" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
45
+				<th rowspan="2" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
46
+				<th rowspan="2" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
47
+				<th rowspan="2" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
48
+				<th rowspan="2" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
49
+				<th rowspan="2" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
50
+				<th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
51
+				<th rowspan="2" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
52
+				<th rowspan="2" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
53
+			</tr>
54
+		</thead>
55
+		<tbody>
56
+			<tr *ngFor="let data of listOfData">
57
+				<td class="width150" *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
58
+				<td class="width150">{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
59
+				<td>{{ data.sum }}</td>
60
+				<td>{{ data.avgResponseTime }}</td>
61
+				<td>{{ data.avgResolvedTime }}</td>
62
+				<td>{{ data.resolvedOverNum }}</td>
63
+				<td>{{ data.overTimeNum }}</td>
64
+				<td>{{ data.consumablePrice }}</td>
65
+				<td>{{ data.workHourPrice }}</td>
66
+				<td>{{ data.totalPrice }}</td>
67
+				<td>{{ data.negativeNum }}</td>
68
+				<td>{{ data.favorableRate }}</td>
69
+			</tr>
70
+		</tbody>
71
+		<ng-template #footerTpl>
72
+			<table class="footTable">
73
+				<tr *ngFor="let data of listOfDataEnd">
74
+					<td class="width150" *ngIf="parent==1">{{ data.parentCode }}</td>
75
+					<td class="width150" *ngIf="parent==0">{{ data.deptCode}}</td>
76
+					<td class="width150" *ngIf="parent==1"></td>
77
+					<td>{{ data.sum }}</td>
78
+					<td>{{ data.avgResponseTime }}</td>
79
+					<td>{{ data.avgResolvedTime }}</td>
80
+					<td>{{ data.resolvedOverNum }}</td>
81
+					<td>{{ data.overTimeNum }}</td>
82
+					<td>{{ data.consumablePrice }}</td>
83
+					<td>{{ data.workHourPrice }}</td>
84
+					<td>{{ data.totalPrice }}</td>
85
+					<td>{{ data.negativeNum }}</td>
86
+					<td>{{ data.favorableRate }}</td>
87
+				</tr>
88
+			</table>
89
+		</ng-template>
90
+	</nz-table>
91
+</div>
90 92
 <div class="pagination">
91 93
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
92 94
   <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>

+ 16 - 1
src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.less

@@ -53,7 +53,22 @@
53 53
   .table{
54 54
     margin: 0 8px;
55 55
   }
56
-
56
+	
57
+	.tableWrap{
58
+	  margin: 0 8px;
59
+	  overflow-x: auto;
60
+	  .footTable, tbody{
61
+	    td{
62
+	      width: 100px;
63
+	      max-width: 100px;
64
+	      &.width150{
65
+	        width: 150px;
66
+	        max-width: 150px;
67
+	      }
68
+	    }
69
+	  }
70
+	}
71
+	
57 72
   .moreFilter{
58 73
     margin-bottom: 16px;
59 74
     span{

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

@@ -113,6 +113,9 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
113 113
 
114 114
   // 表格数据
115 115
   loading1 = false;
116
+	widthStyle:any;
117
+	widthValue:any;
118
+	widthConfig:any = [];
116 119
   getList(num?: number, field?: string, sort?: string) {
117 120
     if (num !== undefined) {
118 121
       this.pageIndex = num;
@@ -138,6 +141,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
138 141
     if (field && sort) {
139 142
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
140 143
     }
144
+		if(this.parent==1){
145
+			this.widthConfig = new Array(12).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
146
+			this.widthStyle = '10%'
147
+			this.widthValue = 12 * 100 + 300 * 1 + 20
148
+		}else{
149
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
150
+			this.widthStyle = '20%'
151
+			this.widthValue = 11 * 100 + 149 * 1 + 20
152
+		}
141 153
     this.loading1 = true;
142 154
     this.mainService
143 155
       .postCustom("itsm/report", "repairDept", postData)
@@ -260,10 +272,11 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
260 272
 	alldepart:any;
261 273
 	getDeparts(dept?) {
262 274
 	  let data = {
263
-	    department: {
264
-	      cascadeHosId: this.hospital,
265
-	      dept: dept,
266
-	    },
275
+			department: {
276
+			  statisticalHosId: this.getHosId,
277
+			  dept: dept,
278
+			  searchType: 1,
279
+			},
267 280
 	    idx: 0,
268 281
 	    sum: 20,
269 282
 	  };

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

@@ -9,7 +9,7 @@
9 9
       <span class="label">科室</span>:
10 10
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
11 11
         <ng-container *ngFor="let option of alldepart">
12
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
12
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
13 13
         </ng-container>
14 14
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
15 15
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -261,8 +261,9 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
261 261
   getDeparts(dept?) {
262 262
     let data = {
263 263
       department: {
264
-        cascadeHosId: this.hospital,
264
+        statisticalHosId: this.getHosId,
265 265
         dept: dept,
266
+        searchType: 1,
266 267
       },
267 268
       idx: 0,
268 269
       sum: 20,

+ 2 - 2
src/app/views/new-statistics/new-statistics.component.ts

@@ -35,7 +35,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
35 35
   hospital;
36 36
   duty;
37 37
   queryType;//查询范围
38
-	parent;
38
+	parent:any = 0;
39 39
   // 初始化院区、部门显示
40 40
   initHospitalAndDuty(hospitalOrDuty){
41 41
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -85,7 +85,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
85 85
 
86 86
   // 缓存数据
87 87
   sessionSave(){
88
-    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent:this.parent}));
88
+    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent: this.parent}));
89 89
   }
90 90
 
91 91
   // 查询范围