暂提

src/app/services/tool.service.ts

@@ -12,34 +12,34 @@ export class ToolService {
 	changeInpSubject:any;
 	allSubject = new Subject();
 	allEndSubject = new Subject();
-	 
+
 	// 提供方法来触发事件
 	triggerEvent(data: any) {
 		this.allSubject.next(data);
 	}
-	
+
 	// 提供方法来触发事件
 	triggerEndEvent(data: any) {
 		this.allEndSubject.next(data);
 	}
-	
+
 	// 提供方法来订阅事件
 	getEventObservable() {
 		return this.allSubject.asObservable();
 	}
-	
+
 	// 提供方法来订阅事件
 	getEventEndObservable() {
 		return this.allEndSubject.asObservable();
 	}
-	
+
   // 附件类型
   // word，excel，pdf，txt，ppt
   attachmentsTypes:string = 'text/plain,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/pdf,application/vnd.ms-excel,application/msword,application/vnd.openxmlformats-officedocument.presentationml.presentation';
 
   constructor(private mainService: MainService) {}
-	
-	
+
+
   // 获取logoUrl和logoTitle
   getSysNameAndLogoAsync(hosId = ''){
     return this.mainService.getSysNameAndLogo(hosId);
@@ -382,7 +382,7 @@ export class ToolService {
 				case "collect":
 					coopBtns.collect = true; //设置核收
 					break;
-				
+
       }
     });
     console.log(coopBtns);
@@ -485,4 +485,32 @@ export class ToolService {
   generateNumberArray(start, end){
     return Array.from(new Array(end + 1).keys()).slice(start);
   }
+
+  /**
+   * @description sessionStorage缓存新增,修改
+   * @param {number} key 名称
+   * @param {number} value 值
+   * @return {array}
+   */
+  setSessionStorage(key, value){
+    sessionStorage.setItem(key, JSON.stringify(value));
+  }
+
+  /**
+   * @description sessionStorage缓存获取
+   * @param {number} key 名称
+   * @return {array}
+   */
+  getSessionStorage(key){
+    return JSON.parse(sessionStorage.getItem(key));
+  }
+
+  /**
+   * @description sessionStorage缓存删除
+   * @param {number} key 名称
+   * @return {array}
+   */
+  removeSessionStorage(key){
+    sessionStorage.removeItem(key);
+  }
 }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -182,7 +182,8 @@
             <div class="updateTipsForNurses red">{{ updateTipsForNurses }}</div>
             <div class="queuingInformation" *ngIf="!updateTipsForNurses && inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检：<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中：<span class="red">{{queuingInformationList[1]}}</span></div>
           </div>
-          <div class="right">
+          <div class="right nurseMenu">
+            <i class="icon_transport transport-tongji-2 green" *ngIf="coopBtns.newStatisticsNurse && newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>
             <div class="userInfo dropdown">
               <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
                 <img src="../../assets/images/icon_keshi.png" alt="">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -5,6 +5,17 @@
   height: 100%;
   display: flex;
 
+  .nurseMenu{
+    & > .icon_transport{
+      margin-left: 24px;
+      cursor: pointer;
+      font-size: 20px;
+      height: 48px;
+      line-height: 48px;
+      display: inline-block;
+    }
+  }
+
   .transport-chaoshi{
     font-size: 16px;
     margin-right: 4px;

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -290,6 +290,12 @@ export class HushijiandanComponent implements OnInit {
 
   getCoopBtns(){
     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
+    menu.forEach(v => {
+      if (v.type == "newStatistics") {
+        this.newStatisticsRole = true;
+        console.log("新版统计");
+      }
+    })
     let coopBtns:any = {};
     let nurseMenu = menu.find(v => v.link === 'nurse');
     let nurseMenuChildren = nurseMenu.childrens || [];
@@ -316,6 +322,9 @@ export class HushijiandanComponent implements OnInit {
         case "buildOrdersForOtherTasks":
           coopBtns.buildOrdersForOtherTasks = true; //其他任务建单
           break;
+        case "newStatisticsNurse":
+          coopBtns.newStatisticsNurse = true; //护士端新版统计权限
+          break;
       }
     });
     this.coopBtns = coopBtns;
@@ -5767,4 +5776,13 @@ export class HushijiandanComponent implements OnInit {
         });
     }
   }
+
+  // 统计
+  newStatisticsRole: boolean = false; //新版统计权限
+  toNewStatistics(): void {
+    this.tool.setSessionStorage('newStatisticsFrom', 'nurse');//统计来源标识
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let firstMenu = menus.find((item) => item.type == "newStatistics");
+    this.router.navigateByUrl(`newStatistics/${firstMenu.link}/${firstMenu.childrens[0].link}`);
+  }
 }

src/app/views/main/main.component.html

@@ -315,7 +315,7 @@
 											</nz-option>
 										</nz-select>
 									</div>
-									
+
 									<div class="col">
 										<span class="name required">故障现象：</span>
 										<nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">
@@ -639,7 +639,7 @@
 </div>
 
 <!-- 查询范围 -->
-<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
+<app-query-range sign="largeScreen" [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" [hiddenDefaultDate]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
 
 <!-- 知识库查看 -->
 <app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>

src/app/views/main/main.component.ts

@@ -549,7 +549,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	searchPatientListSubject = new Subject();
 	inspectSubject = new Subject();
 	changeAssetInpSubject = new Subject();
-	
+
 	// 运维相关
 	incidentModel:any = {};
 	incidentMsg:any = {};
@@ -1056,7 +1056,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	      }
 	    });
 	}
-	
+
 	// 引入知识库
 	importKnowage(item){
 	  console.log(item)
@@ -1069,11 +1069,11 @@ export class MainComponent implements OnInit, OnDestroy {
 	  this.coopData = data || {};
 	  this.isShowKnowledge = true;
 	}
-	
+
 	cancelKnowledgeModal(flag) {
 	  this.isShowKnowledge = false;
 	}
-	
+
 	// 获取患者信息
 	searchPatientList(id, searchWords) {
 	  this.searchPatientListSubject.next([id, searchWords]);
@@ -3915,11 +3915,11 @@ export class MainComponent implements OnInit, OnDestroy {
 		    this.getPatientByResidenceNo(v[1]);
 		  }
 		});
-		
+
 		this.changeAssetInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.getAssetData(v);
 		});
-		
+
 		this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.getTasktypeByPhone(v);
 		});
@@ -3990,7 +3990,7 @@ export class MainComponent implements OnInit, OnDestroy {
 									}else{
 										this.cmdbRepair = false
 									}
-									break;	
+									break;
 							}
 						});
 						if(this.eventData){
@@ -4012,7 +4012,7 @@ export class MainComponent implements OnInit, OnDestroy {
 							}
 							this.searchApplicationBuilding()
 						}
-						
+
 						if(this.cmdbRepair && this.hospitalModel==1){
 							this.getAssetData()
 						}
@@ -4020,11 +4020,11 @@ export class MainComponent implements OnInit, OnDestroy {
 				}
 			});
 	 }
-	
+
 	changeAsset(e){
 		this.changeAssetInpSubject.next(e);
 	}
-	
+
   // 获取资产列表
 	assetData:any = [];
 	getAssetData(name?){
@@ -4039,7 +4039,7 @@ export class MainComponent implements OnInit, OnDestroy {
 		    name: name
 		  },
 		};
-		
+
 		this.mainService
 		  .getFetchDataList("simple/data", "asset", data)
 		  .subscribe((data) => {
@@ -4048,7 +4048,7 @@ export class MainComponent implements OnInit, OnDestroy {
 		    }
 		  });
 	}
-	
+
 	// 新增报修
 	speedinessAdd(): void {
 		this.addOrder();
@@ -4123,6 +4123,7 @@ export class MainComponent implements OnInit, OnDestroy {
 	}
   // 统计
   toNewStatistics(): void {
+    this.tool.setSessionStorage('newStatisticsFrom', 'main');//统计来源标识
     let menus = JSON.parse(localStorage.getItem("menu"));
     let firstMenu = menus.find((item) => item.type == "newStatistics");
     this.router.navigateByUrl(`newStatistics/${firstMenu.link}/${firstMenu.childrens[0].link}`);

src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.ts

@@ -82,29 +82,20 @@ export class CustomChangeDateComponent implements OnInit, OnDestroy {
 		//     }
 		//   });
   }
-	
+
 	ngOnDestroy(){
-		// this.dateData1 = null 
+		// this.dateData1 = null
 		// this.dateData2 = null
 	}
-	
+
   // 根据时间区间重置
   resetByDate(){
-		setTimeout(_=>{
-			// console.log(2222,this.dateData1, this.dateData2)
-			// if(this.dateData1 && this.dateData2){
-			// 	this.dateRange = [this.dateData1, this.dateData2]
-			// }else{
-			// 	this.dateType = 'day';
-			// 	this.changeDateType(this.dateType, 6);
-			// }
-			this.dateType = 'day';
-			this.changeDateType(this.dateType, 6);
-		})
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+		this.initByDate(newStatistics.defaultDate)
   }
 
   // 根据时间区间初始化
-  initByDate(dateRange:any[], dateNum:any= 6){
+  initByDate(dateRange:any[], dateNum:any = null){
     setTimeout(() => {
       this.dateType = 'day';
       this.dateRange = dateRange;

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

@@ -8,10 +8,11 @@
           <nz-form-label [nzSpan]="4" nzRequired nzFor="queryType">查询范围</nz-form-label>
           <nz-form-control [nzSpan]="20" nzErrorTip="请选择查询范围!">
             <nz-radio-group formControlName="queryType" (ngModelChange)="changeQueryType($event)">
-              <label nz-radio [nzValue]="1">全院查询</label>
-              <label nz-radio [nzValue]="2">院区查询</label>
-              <label nz-radio [nzValue]="3">部门查询</label>
-              <label nz-radio [nzValue]="4">垂直部门查询</label>
+              <label nz-radio [nzValue]="1" *ngIf="sign !== 'nurse'">全院查询</label>
+              <label nz-radio [nzValue]="2" *ngIf="sign !== 'nurse'">院区查询</label>
+              <label nz-radio [nzValue]="3" *ngIf="sign !== 'nurse'">部门查询</label>
+              <label nz-radio [nzValue]="4" *ngIf="sign !== 'nurse'">垂直部门查询</label>
+              <label nz-radio [nzValue]="5" *ngIf="sign === 'nurse'">申请科室查询</label>
             </nz-radio-group>
           </nz-form-control>
         </nz-form-item>
@@ -41,16 +42,26 @@
               </nz-option>
             </nz-select>
           </nz-form-control>
+        </nz-form-item>
+        <nz-form-item [hidden]="validateForm.value.queryType != 5">
+          <nz-form-label nzRequired [nzSpan]="4">申请科室</nz-form-label>
+          <nz-form-control [nzSpan]="20">{{currentDept.dept}}</nz-form-control>
         </nz-form-item>
 				<nz-form-item class="mb0" [ngStyle]="{ visibility: !hiddenParent ? 'visible' : 'hidden'}" style="visibility: hidden;">
-				  <nz-form-label [nzSpan]="7" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
-				  <nz-form-control [nzSpan]="15" nzErrorTip="请选择是否显示父级科室!">
+				  <nz-form-label [nzSpan]="6" nzRequired nzFor="parent">是否显示父级科室</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否显示父级科室!">
 				    <nz-radio-group formControlName="parent">
 				      <label nz-radio [nzValue]="1">是</label>
 				      <label nz-radio [nzValue]="0">否</label>
 				    </nz-radio-group>
 				  </nz-form-control>
 				</nz-form-item>
+				<nz-form-item class="mb0" [ngStyle]="{ visibility: !hiddenDefaultDate ? 'visible' : 'hidden'}" style="visibility: hidden;">
+				  <nz-form-label [nzSpan]="4" nzRequired nzFor="defaultDate">默认时间</nz-form-label>
+				  <nz-form-control [nzSpan]="20" nzErrorTip="请选择默认时间!">
+            <nz-range-picker [nzAllowClear]="false" formControlName="defaultDate" [nzAllowClear]='false'></nz-range-picker>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -82,19 +82,18 @@
   // 新增
   &.add {
     .modalBody {
-      width: 578px;
+      width: 700px;
       padding: 0 24px;
 
       .content {
         width: 100%;
-        min-height: 166px;
         padding: 10px 24px 0;
         height: auto;
         overflow-y: auto;
 
         .addForm {
           .ant-form-item {
-            margin-bottom: 14px;
+            margin-bottom: 8px;
             .ant-form-item-label {
               text-align: left;
             }

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

@@ -3,6 +3,8 @@ import { Component, OnInit, Output, Input } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
+import { DateService } from 'src/app/services/date.service';
+import { startOfDay, endOfDay, format } from 'date-fns';
 
 @Component({
   selector: 'app-query-range',
@@ -16,15 +18,27 @@ export class QueryRangeComponent implements OnInit {
   @Input() hospital: any;
   @Input() duty: any;
 	@Input() parent: any;
+	@Input() defaultDate: any = [];
+  // sign = largeScreen 大屏
+  // sign = main 管理端
+  // sign = nurse 护士端
+	@Input() sign: any = '';
 	@Input() hiddenParent: any = false;
+	@Input() hiddenDefaultDate: any = false;
   validateForm: FormGroup;//表单
+  currentDept:any = {};//当前登录人所在科室
   constructor(
     private fb: FormBuilder,
     private tool: ToolService,
     private mainService: MainService,
+    private dateService: DateService,
   ) { }
 
   ngOnInit() {
+    this.currentDept = this.tool.getCurrentUserDept();
+
+    console.log('this.sign:', this.sign)
+
     this.getHospitalList();
     this.queryType == 3 && this.getDutyList(this.hospital.id);
     this.getDutyOneList();
@@ -36,12 +50,15 @@ export class QueryRangeComponent implements OnInit {
   }
   // 初始化新增form表单
   initForm() {
+    let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+    let lastmonthenddate = this.dateService.date().lastMonthEndDate;
     this.validateForm = this.fb.group({
       queryType: [this.queryType, [Validators.required]],
       hospital: [(this.hospital && (this.queryType == 2 || this.queryType == 3)) ? this.hospital.id : null],
       duty: [(this.duty && this.queryType == 3) ? this.duty.id : null],
       dutyOne: [(this.duty && this.queryType == 4) ? this.duty.id : null],
-			parent :[this.parent?1:0, [Validators.required]]
+			parent :[this.parent?1:0, [Validators.required]],
+      defaultDate: [this.defaultDate.length ? this.defaultDate : [lastmonthstartdate, lastmonthenddate], [Validators.required]],
     });
   }
   // 表单提交
@@ -53,6 +70,7 @@ export class QueryRangeComponent implements OnInit {
     if (this.validateForm.invalid) return;
     let queryType = this.validateForm.value.queryType;
 		let parent = this.validateForm.value.parent;
+		let defaultDate = this.validateForm.value.defaultDate;
     let hospital;
     let duty;
     switch (queryType) {
@@ -70,7 +88,7 @@ export class QueryRangeComponent implements OnInit {
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty, parent});
+    this.submitQueryRange.emit({queryType, hospital, duty, parent, defaultDate});
     this.hideModal();
   }
 
@@ -184,5 +202,4 @@ export class QueryRangeComponent implements OnInit {
       }
     });
   }
-
 }

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

@@ -69,13 +69,13 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
       this.search();
     }, 0)
   }
-	
+
 	/*========= 数据下钻 ========*/
-	
+
 	// 汇总
 	viewDetail1(){
 		let query = {
-			
+
 		}
 		let path = '/newStatistics/maintenanceStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
@@ -86,7 +86,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		this.router.navigate([path], { replaceUrl: true });
 		// this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
 	}
-	
+
 	// 挂起
 	viewDetail2(){
 		let query = {
@@ -108,7 +108,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 超时
 	viewDetail3(){
 		let query = {
@@ -130,7 +130,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 差评
 	viewDetail4(){
 		let query = {
@@ -157,7 +157,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 维修处理top5
 	viewMaintain1(data){
 		let query = {
@@ -196,7 +196,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	viewMaintain2(data){
 		let query = {
 			startDate: this.customChangeDateComponent.startDate,
@@ -214,7 +214,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 				}
 			}
 		}
-		
+
 		if(this.activeIndex==0){
 			query.searchQuery.userId = data.userId ? data.userId : -1
 			query.searchQuery.userDTO = {
@@ -240,7 +240,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 课科室费用top5
 	viewDept(data){
 		let query = {
@@ -259,7 +259,7 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 维修处理类型切换
 	selectCheck(type){
 		this.activeIndex = type

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

@@ -55,7 +55,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 
     }, 0)
   }
-	
+
 	// 数据下钻
 	viewDetail1(data, type){
 		let query = null
@@ -116,7 +116,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail2(data, type){
 		let query = null
@@ -191,7 +191,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail3(data, type){
 		let query = null
@@ -266,7 +266,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
 	// 数据下钻
 	viewDetail4(data, type){
 		let query = null
@@ -351,7 +351,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
 		this.router.navigate([path], { replaceUrl: true });
 	}
-	
+
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();

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

@@ -6,10 +6,11 @@
     <ng-container *ngIf="queryType == 2">查询范围:{{hospital.hosName}}</ng-container>
     <ng-container *ngIf="queryType == 3">查询范围:{{hospital.hosName}}{{duty.hosName}}</ng-container>
     <ng-container *ngIf="queryType == 4">查询范围:垂直-{{hospital.hosName}}{{duty.hosName}}</ng-container>
+    <ng-container *ngIf="queryType == 5">查询范围:{{currentDept.dept}}</ng-container>
     <i class="icon_transport transport-jiantou_zuoyouqiehuan"></i>
   </div>
 </div>
 <router-outlet></router-outlet>
 
 <!-- 查询范围 -->
-<app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
+<app-query-range [sign]="sign" [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [defaultDate]="defaultDate" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>

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

@@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { TabService } from './services/tab.service';
 import { NzMessageService } from "ng-zorro-antd/message";
 import { SimpleReuseStrategy } from 'src/app/SimpleReuseStrategy';
+import { DateService } from 'src/app/services/date.service';
 @Component({
   selector: "app-new-statistics",
   templateUrl: "./new-statistics.component.html",
@@ -16,10 +17,15 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 		public msg: NzMessageService,
     public router: Router,
     public tabService: TabService,
+    private dateService: DateService,
   ) {}
 
   menuList: any[] = [];
+  sign:string = '';//标识来源
+  currentDept:any = {};//当前登录人所在科室
   ngOnInit() {
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.sign = this.tool.getSessionStorage('newStatisticsFrom');
     this.getMenuList();
     this.initHospitalAndDuty(this.tool.getCurrentHospital());
     console.log('this.menuList:', this.menuList)
@@ -39,6 +45,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   duty;
   queryType;//查询范围
 	parent:any = 0;
+	defaultDate:any = [];
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -48,8 +55,14 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
       this.duty = sessionData.duty;
       this.queryType = sessionData.queryType;
 			this.parent = sessionData.parent;
+			this.defaultDate = sessionData.defaultDate;
       return;
     }
+
+    let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+    let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+    this.defaultDate = [lastmonthstartdate, lastmonthenddate];
+
     let type = 'hospital';//默认是院区
     if(hospitalOrDuty.type){
       // 当前是责任部门
@@ -69,26 +82,32 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
     console.log('this.duty:', this.duty)
 
     // 查询范围单选框
-    if(this.hospital){
-      if(this.duty){
-        if(this.duty.parentDeptId){
-          this.queryType = 3;
+    if(this.sign === 'nurse'){
+      // 护士端跳转到统计
+      this.queryType = 5;
+    }else{
+      if(this.hospital){
+        if(this.duty){
+          if(this.duty.parentDeptId){
+            this.queryType = 3;
+          }else{
+            this.queryType = 4;
+          }
         }else{
-          this.queryType = 4;
+          this.queryType = 2;
         }
       }else{
-        this.queryType = 2;
+        this.queryType = 1;
       }
-    }else{
-      this.queryType = 1;
     }
 
+
     this.sessionSave();
   }
 
   // 缓存数据
   sessionSave(){
-    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}));
+    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, defaultDate: this.defaultDate}));
   }
 
   // 查询范围
@@ -96,14 +115,16 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   queryRangeClick(){
     this.queryRangeFlag = true;
   }
-  submitQueryRange({queryType, hospital, duty, parent}) {
+  submitQueryRange({queryType, hospital, duty, parent, defaultDate}) {
     console.log('queryType:', queryType)
     console.log('hospital:', hospital)
     console.log('duty:', duty)
+    console.log('defaultDate:', defaultDate)
     this.queryType = queryType;
     this.hospital = hospital;
     this.duty = duty;
 		this.parent = parent;
+		this.defaultDate = defaultDate;
     this.queryRangeFlag = false;
 
     this.sessionSave();
@@ -123,6 +144,12 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 
   // 返回
   goBack(){
+    if(this.sign === 'nurse'){
+      // 护士端跳转到统计
+      sessionStorage.removeItem('maintenanceData')
+      this.router.navigate(['/nurse']);
+      return;
+    }
 		let roleMenus = JSON.parse(localStorage.getItem("user")).menu;
 		let sy = false;
 		let gglb = false;
@@ -137,7 +164,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 		    gzgd = true;
 		  }
 		});
-		
+
 		if(!gglb && !gzgd && !sy){
 			this.msg.error("暂无权限进入系统！", {
 			  nzDuration: 2000,