医废统计

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.163",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/main/main-routing.module.ts

@@ -483,6 +483,26 @@ const routes: Routes = [
         path: "quiltWashingTrendAnalysis",
         loadChildren: () => import("../quilt-washing-trend-analysis/quilt-washing-trend-analysis.module").then((m) => m.QuiltWashingTrendAnalysisModule),
       },
+      // 医废统计-人员统计
+      {
+        path: "medicalWastePersonnelStatistics",
+        loadChildren: () => import("../medical-waste-personnel-statistics/medical-waste-personnel-statistics.module").then((m) => m.MedicalWastePersonnelStatisticsModule),
+      },
+      // 医废统计-科室统计
+      {
+        path: "medicalWasteDepartmentStatistics",
+        loadChildren: () => import("../medical-waste-department-statistics/medical-waste-department-statistics.module").then((m) => m.MedicalWasteDepartmentStatisticsModule),
+      },
+      // 医废统计-全院统计
+      {
+        path: "medicalWasteHospitalStatistics",
+        loadChildren: () => import("../medical-waste-hospital-statistics/medical-waste-hospital-statistics.module").then((m) => m.MedicalWasteHospitalStatisticsModule),
+      },
+      // 医废统计-趋势分析
+      {
+        path: "medicalWasteTrendAnalysis",
+        loadChildren: () => import("../medical-waste-trend-analysis/medical-waste-trend-analysis.module").then((m) => m.MedicalWasteTrendAnalysisModule),
+      },
     ],
   },
 ];

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { MedicalWasteDepartmentStatisticsComponent } from "./medical-waste-department-statistics.component";
+
+const routes: Routes = [
+  { path: "", component: MedicalWasteDepartmentStatisticsComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MedicalWasteDepartmentStatisticsRoutingModule {}

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.html

@@ -0,0 +1,105 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <nz-radio-group [(ngModel)]="dateType" (ngModelChange)="changeDateType($event)">
+            <label *ngFor="let data of dateTypes" nz-radio-button [nzValue]="data.value">{{data.label}}</label>
+          </nz-radio-group>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">发起时间</span>：
+          <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
+          </nz-range-picker>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
+            (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">
+          </nz-month-picker>
+          <span *ngIf="dateType=='month'"> ~ </span>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeEnd" [nzDisabledDate]="disabledMonthEnd"
+            (ngModelChange)="changeMonthEnd($event)" nzPlaceHolder="请选择截止月份">
+          </nz-month-picker>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeStart" [nzDisabledDate]="disabledYearStart"
+            (ngModelChange)="changeYearStart($event)" nzPlaceHolder="请选择开始年份">
+          </nz-year-picker>
+          <span *ngIf="dateType=='year'"> ~ </span>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeEnd" (ngModelChange)="changeYearEnd($event)"
+            [nzDisabledDate]="disabledYearEnd" nzPlaceHolder="请选择截止年份">
+          </nz-year-picker>
+        </div>
+        <div class="list-template__searchItem ml8">
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择时间"
+            [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+            <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">科室名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event, 'getDeptList')" nzAllowClear nzPlaceHolder="请选择科室名称" [(ngModel)]="searchDto.dept">
+            <ng-container *ngFor="let option of deptList">
+              <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 class="list-template__searchItem">
+          <span class="label">楼栋名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event, 'getBuildingList')" nzAllowClear nzPlaceHolder="请选择楼栋名称" [(ngModel)]="searchDto.building">
+            <ng-container *ngFor="let option of buildingList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="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>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search(1)'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <!-- <button nz-button class="btn default ml8" (click)='exportDetail()' [nzLoading]="loading3" [disabled]="!checkedDepIds.length">批量导出详细科室报表</button> -->
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead (nzSortChange)="sort($event)" nzSingleSort>
+          <tr class="thead">
+            <!-- <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+              (nzCheckedChange)="checkAll($event)"></th> -->
+            <th>序号</th>
+            <th>科室名称</th>
+            <th>总重量(kg)</th>
+            <th *ngFor="let data of heads">{{data}}(kg)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
+            <!-- <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td> -->
+            <td>{{ index+(pageIndex-1) * pageSize + 1 }}</td>
+            <td>{{ data.dept }}</td>
+            <td>{{ data.totalWeight }}</td>
+            <td *ngFor="let weight of data.typeWeightList">{{ weight }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [nzPageSizeOptions]="[10,100]" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.less

@@ -0,0 +1,95 @@
+@import "../../../../src/theme.less";
+
+:host ::ng-deep .on {
+  color: #fff !important;
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 1000px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .conItem {
+        color: #333;
+
+        .jiTit {
+          height: 50px;
+          line-height: 50px;
+          border-bottom: 1px solid #e5e9ed;
+          padding: 0 32px;
+        }
+
+        .defeat {
+          font-size: 14px;
+          color: #333;
+          padding: 15px 32px;
+          min-height: 125px;
+        }
+
+        &.noCon {
+          background: #f9fafb;
+          padding: 16px 32px 24px 32px;
+          border-top: 1px solid #e5e9ed;
+
+          .title {
+            text-align: left;
+            font-size: 14px;
+            margin-bottom: 8px;
+          }
+
+          textarea {
+            min-height: 210px;
+          }
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-left: 10px;
+    }
+  }
+
+  .txtL {
+    text-align: left !important;
+  }
+
+  .txtR {
+    text-align: right !important;
+  }
+}

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.component.ts

@@ -0,0 +1,611 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, startOfDay, endOfDay } from "date-fns";
+
+import { MainService } from "../../services/main.service";
+import { DateService } from "../../services/date.service";
+import { MyServiceService } from "../../services/my-service.service";
+import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: "app-medical-waste-department-statistics",
+  templateUrl: "./medical-waste-department-statistics.component.html",
+  styleUrls: ["./medical-waste-department-statistics.component.less"],
+})
+export class MedicalWasteDepartmentStatisticsComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private dateService: DateService,
+    private myService: MyServiceService,
+    private tool: ToolService
+  ) {}
+
+  searchTimerSubject = new Subject();
+
+  searchDto: any = {
+    dept: null,
+    building: null,
+  }
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllHos();
+    this.changeDateRange(this.defRange);
+    // this.search();
+  }
+
+  dateType: string = "day"; //选中时间维度
+  dateTypes: any = [
+    {
+      label: "按天统计",
+      value: "day",
+    },
+    {
+      label: "按月统计",
+      value: "month",
+    },
+    {
+      label: "按年统计",
+      value: "year",
+    },
+  ]; //时间维度
+  defRange = "1"; //默认上周
+  defRanges = [
+    {
+      label: "上周",
+      id: 1,
+    },
+    {
+      label: "上月",
+      id: 2,
+    },
+    {
+      label: "上年",
+      id: 3,
+    },
+  ]; //时间默认区间
+
+  heads: any[] = []; //表头数据
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  alldepart: any = []; //当前院区所属科室
+  dateRange: any = []; //发起时间区间 天
+  monthRangeStart: any; //发起时间 月 起
+  monthRangeEnd: any; //发起时间 月 止
+  yearRangeStart: any; //发起时间 年 起
+  yearRangeEnd: any; //发起时间 年 止
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  searchData: any = {}; // 综合统计页面带过来的参数
+  getSearchData() {
+    let that = this;
+    let sub = that.myService.getMsg().subscribe((msg) => {
+      // 从综合报表跳转过来
+      that.searchData = msg;
+      console.log(that.searchData);
+      console.log(66);
+      sub.unsubscribe(); //取消订阅，否则订阅函数会累加执行
+      that.hospital = that.searchData["hosId"];
+      that.changeDate(that.searchData["range"]);
+      that.defRange = that.searchData["defRange"];
+      that.search();
+    });
+    that.changeDateRange(that.defRange);
+    that.search();
+  }
+  // 搜索
+  search(num?: number) {
+    if (this.hospital) {
+      this.searchData["hosId"] = this.hospital;
+    }
+    if (this.startDate) {
+      this.searchData["dateRange"] = {
+        start: this.startDate,
+        end: this.endDate,
+      };
+    }
+    if (num !== undefined) {
+      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
+    } else {
+      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+    }
+  }
+  // 导出
+  loading2 = false;
+  export() {
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
+    let that = this;
+    let postData: any = {
+      startTime: this.startDate,
+      endTime: this.endDate,
+      hosId: that.hospital,
+      type: this.dateType,
+      deptId: this.searchDto.dept || undefined,
+      buildingId: this.searchDto.building || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort =
+        this.sortCurrentValue === "ascend"
+          ? this.sortCurrentKey
+          : `${this.sortCurrentKey} desc`;
+    }
+    this.loading2 = true;
+    that.mainService.exportReport("medicalWasteDept", postData).subscribe(
+      (data) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", true, "");
+        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 = "科室统计.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", false, "");
+      }
+    );
+  }
+  // 批量导出详细科室报表
+  loading3 = false;
+  exportDetail() {
+    let ids = this.checkedDepIds.join(",");
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
+    let that = this;
+    let postData: any = {
+      startTime: this.startDate,
+      endTime: this.endDate,
+      hosId: that.hospital,
+      type: this.dateType,
+      deptId: ids || undefined,
+      buildingId: this.searchDto.building || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort =
+        this.sortCurrentValue === "ascend"
+          ? this.sortCurrentKey
+          : `${this.sortCurrentKey} desc`;
+    }
+    this.loading3 = true;
+    that.mainService.exportReport("clothesDeptDetails", postData).subscribe(
+      (data) => {
+        this.loading3 = false;
+        this.showPromptModal("导出", true, "");
+        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 = "详细科室报表.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.loading3 = false;
+        this.showPromptModal("导出", false, "");
+      }
+    );
+  }
+  // 重置
+  reset() {
+    this.sortCurrentKey = "";
+    this.sortCurrentValue = "";
+    this.sortCurrent = {
+      clothesTypeNum: null,
+      getOrder: null,
+      sendOrder: null,
+      sendClothesNum: null,
+      price: null,
+    };
+    this.searchDto = {
+      dept: null,
+      building: null,
+    }
+    this.changeDateType("day");
+  }
+  // 选中表格单列
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中单列id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+  }
+  // 整行操作
+  selectedListData(data) {
+    this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => {
+      this.mapOfCheckedId[item.id] = value;
+    });
+    this.refreshStatus();
+  }
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
+    this.pageIndex = num;
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startTime: this.searchData.dateRange.start,
+      endTime: this.searchData.dateRange.end,
+      hosId: this.searchData.hosId,
+      type: this.dateType,
+      deptId: this.searchDto.dept || undefined,
+      buildingId: this.searchDto.building || undefined,
+    };
+    if (field && sort) {
+      postData.sort = sort === "ascend" ? field : `${field} desc`;
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("report/medicalWaste", "dept", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.list || [];
+        this.heads = result.heads || [];
+        this.listLength = result.totalNum;
+      });
+  }
+  // 获取院区
+  hospital: string; //选中院区
+  getAllHos() {
+    this.hospital = this.tool.getCurrentHospital().id + "";
+    this.getDeptList();
+    this.getBuildingList();
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
+  }
+
+  // 边输边搜节流阀
+  changeInp(e, fn) {
+    this.searchTimer(this[fn], e);
+  }
+  // 获取科室
+  deptList: any = [];
+  getDeptList(keyword = '') {
+    let postData = {
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hospital,
+        dept: keyword,
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.deptList = result.list;
+      });
+  }
+
+  // 获取楼栋
+  buildingList: any = [];
+  getBuildingList(keyword = '') {
+    let postData = {
+      building: {
+        cascadeHosId: this.hospital,
+        buildingName: keyword
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.buildingList = result.list;
+      });
+  }
+
+  // 修改时间展示维度
+  changeDateType(res) {
+    console.log(res, this.dateType);
+    this.dateType = res;
+    this.searchData["type"] = res;
+    console.log(this.searchData);
+    switch (res) {
+      case "day":
+        this.defRanges = [
+          {
+            label: "上周",
+            id: 1,
+          },
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "1"; //默认上周
+        this.changeDateRange("1");
+        break;
+      case "month":
+        this.defRanges = [
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "2"; //上月
+        this.changeDateRange("2");
+        break;
+      case "year":
+        this.defRanges = [
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "3"; //默认上周
+        this.changeDateRange("3");
+        break;
+    }
+  }
+
+  // 禁选日期
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return differenceInCalendarDays(current, this.today) > 0;
+  };
+
+  // 禁选月份开始
+  disabledMonthStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.monthRangeEnd) > 0;
+    return cur || staEnd;
+  };
+  // 禁选月份结束
+  disabledMonthEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.monthRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份开始
+  disabledYearStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.yearRangeEnd) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份结束
+  disabledYearEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.yearRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 日期选择 日
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result?): void {
+    console.log(this.dateRange);
+    console.log(result);
+    this.dateRange = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result || !result.length) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 跳转详情
+  toDetail(e, data){
+    e.stopPropagation();
+    console.log(data);
+    window.open(`${location.origin}/spreadSheet/#/quiltWashingDepartment/${data.id}/${this.dateType}/${this.startDate}/${this.endDate}`);
+  }
+
+  // 月份选择
+  changeMonthStart(result?) {
+    console.log(result);
+    this.monthRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+  }
+  changeMonthEnd(result?) {
+    console.log(result);
+    this.monthRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    // this.startDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  // 年份选择
+  changeYearStart(result?) {
+    console.log(result);
+    this.yearRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-01-01';
+  }
+  changeYearEnd(result?) {
+    console.log(result);
+    this.yearRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.endDate = format(endOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 日期选择 快速修改时间区间
+  today = new Date();
+  quick: boolean = false;
+  changeDateRange(res) {
+    console.log(res);
+    this.quick = true;
+    switch (res) {
+      case "1":
+        // 上周
+        let lastweekstartdate = this.dateService.date().lastWeekStartDate;
+        let lastweekenddate = this.dateService.date().lastWeekEndDate;
+        console.log(lastweekstartdate, lastweekenddate);
+        this.changeDate([lastweekstartdate, lastweekenddate]);
+        break;
+      case "2":
+        // 上月
+        let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+        let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+        console.log(lastmonthstartdate, lastmonthenddate);
+        this.changeDate([lastmonthstartdate, lastmonthenddate]);
+        this.changeMonthStart(lastmonthstartdate);
+        this.changeMonthEnd(lastmonthenddate);
+        break;
+      case "3":
+        // 上年
+        let lastyearstartdate = this.dateService.date().lastYearStartDate;
+        let lastyearenddate = this.dateService.date().lastYearEndDate;
+        console.log(lastyearstartdate, lastyearenddate);
+        this.changeDate([lastyearstartdate, lastyearenddate]);
+        this.changeMonthStart(lastyearstartdate);
+        this.changeMonthEnd(lastyearenddate);
+        this.changeYearStart(lastyearstartdate);
+        this.changeYearEnd(lastyearenddate);
+        break;
+    }
+    this.quick = false;
+    this.search();
+  }
+
+  // 更多
+  toMore(type) {
+    let sendData = this.searchData;
+    console.log(sendData);
+    this.myService.sendMsg(sendData);
+    this.router.navigateByUrl("/main/" + type);
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  // 边输入边搜索节流阀
+  isLoading: boolean = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  // 列表排序
+  sortCurrent = {
+    clothesTypeNum: null,
+    getOrder: null,
+    sendOrder: null,
+    sendClothesNum: null,
+    price: null,
+  };
+  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);
+  }
+}

src/app/views/medical-waste-department-statistics/medical-waste-department-statistics.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+import { MedicalWasteDepartmentStatisticsRoutingModule } from "./medical-waste-department-statistics-routing.module";
+import { ShareModule } from "src/app/share/share.module";
+import { MedicalWasteDepartmentStatisticsComponent } from "./medical-waste-department-statistics.component";
+
+@NgModule({
+  declarations: [MedicalWasteDepartmentStatisticsComponent],
+  imports: [
+    CommonModule,
+    MedicalWasteDepartmentStatisticsRoutingModule,
+    ShareModule,
+  ],
+})
+export class MedicalWasteDepartmentStatisticsModule {}

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { MedicalWasteHospitalStatisticsComponent } from "./medical-waste-hospital-statistics.component";
+
+const routes: Routes = [
+  { path: "", component: MedicalWasteHospitalStatisticsComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MedicalWasteHospitalStatisticsRoutingModule {}

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.html

@@ -0,0 +1,91 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <nz-radio-group [(ngModel)]="dateType" (ngModelChange)="changeDateType($event)">
+            <label *ngFor="let data of dateTypes" nz-radio-button [nzValue]="data.value">{{data.label}}</label>
+          </nz-radio-group>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">发起时间</span>：
+          <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
+          </nz-range-picker>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
+            (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">
+          </nz-month-picker>
+          <span *ngIf="dateType=='month'"> ~ </span>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeEnd" [nzDisabledDate]="disabledMonthEnd"
+            (ngModelChange)="changeMonthEnd($event)" nzPlaceHolder="请选择截止月份">
+          </nz-month-picker>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeStart" [nzDisabledDate]="disabledYearStart"
+            (ngModelChange)="changeYearStart($event)" nzPlaceHolder="请选择开始年份">
+          </nz-year-picker>
+          <span *ngIf="dateType=='year'"> ~ </span>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeEnd" (ngModelChange)="changeYearEnd($event)"
+            [nzDisabledDate]="disabledYearEnd" nzPlaceHolder="请选择截止年份">
+          </nz-year-picker>
+        </div>
+        <div class="list-template__searchItem ml8">
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择时间"
+            [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+            <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search(1)'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__checkBoxes">
+      <nz-radio-group [(ngModel)]="dataType" (ngModelChange)="getList(true)">
+        <label nz-radio [nzValue]="item.value" *ngFor="let item of checkOptionsOne">{{item.label}}</label>
+      </nz-radio-group>
+    </div>
+    <div class="list-template__chart">
+      <div class="echarts">
+        <div class="echart-head">医废类型</div>
+        <div echarts class="echart" [options]='pieChartOption'></div>
+      </div>
+      <div class="echarts">
+        <div class="echart-head">回收及出库重量</div>
+        <div echarts class="echart" [options]='barChartOption'></div>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <!-- <thead (nzSortChange)="sort($event)" nzSingleSort> -->
+        <thead>
+          <tr class="thead">
+            <th>序号</th>
+            <th>日期</th>
+            <th *ngFor="let data of heads">{{data}}(kg)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.date }}</td>
+            <td *ngFor="let weight of data.typeWeightList">{{ weight }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.less

@@ -0,0 +1,95 @@
+@import "../../../../src/theme.less";
+
+:host ::ng-deep .on {
+  color: #fff !important;
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 1000px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .conItem {
+        color: #333;
+
+        .jiTit {
+          height: 50px;
+          line-height: 50px;
+          border-bottom: 1px solid #e5e9ed;
+          padding: 0 32px;
+        }
+
+        .defeat {
+          font-size: 14px;
+          color: #333;
+          padding: 15px 32px;
+          min-height: 125px;
+        }
+
+        &.noCon {
+          background: #f9fafb;
+          padding: 16px 32px 24px 32px;
+          border-top: 1px solid #e5e9ed;
+
+          .title {
+            text-align: left;
+            font-size: 14px;
+            margin-bottom: 8px;
+          }
+
+          textarea {
+            min-height: 210px;
+          }
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-left: 10px;
+    }
+  }
+
+  .txtL {
+    text-align: left !important;
+  }
+
+  .txtR {
+    text-align: right !important;
+  }
+}

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.component.ts

@@ -0,0 +1,624 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, startOfDay, endOfDay } from "date-fns";
+
+import { MainService } from "../../services/main.service";
+import { DateService } from "../../services/date.service";
+import { MyServiceService } from "../../services/my-service.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+
+@Component({
+  selector: "app-medical-waste-hospital-statistics",
+  templateUrl: "./medical-waste-hospital-statistics.component.html",
+  styleUrls: ["./medical-waste-hospital-statistics.component.less"],
+})
+export class MedicalWasteHospitalStatisticsComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private dateService: DateService,
+    private myService: MyServiceService,
+    private message: NzMessageService,
+    private tool: ToolService
+  ) {}
+
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllHos();
+    this.changeDateRange(this.defRange);
+    // this.search();
+  }
+
+  dataType:string = 'outbound';
+
+  checkOptionsOne: Array<any> = [
+    { label: "回收重量", value: "recovery", checked: true },
+    { label: "出库总重量", value: "outbound", checked: false },
+  ];
+
+  dateType: string = "day"; //选中时间维度
+  dateTypes: any = [
+    {
+      label: "按天统计",
+      value: "day",
+    },
+    {
+      label: "按月统计",
+      value: "month",
+    },
+    {
+      label: "按年统计",
+      value: "year",
+    },
+  ]; //时间维度
+  defRange = "1"; //默认上周
+  defRanges = [
+    {
+      label: "上周",
+      id: 1,
+    },
+    {
+      label: "上月",
+      id: 2,
+    },
+    {
+      label: "上年",
+      id: 3,
+    },
+  ]; //时间默认区间
+
+  heads: any[] = []; //表头数据
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  alldepart: any = []; //当前院区所属科室
+  dateRange: any = []; //发起时间区间 天
+  monthRangeStart: any; //发起时间 月 起
+  monthRangeEnd: any; //发起时间 月 止
+  yearRangeStart: any; //发起时间 年 起
+  yearRangeEnd: any; //发起时间 年 止
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  searchData: any = {}; // 综合统计页面带过来的参数
+  getSearchData() {
+    let that = this;
+    let sub = that.myService.getMsg().subscribe((msg) => {
+      // 从综合报表跳转过来
+      that.searchData = msg;
+      console.log(that.searchData);
+      console.log(66);
+      sub.unsubscribe(); //取消订阅，否则订阅函数会累加执行
+      that.hospital = that.searchData["hosId"];
+      that.changeDate(that.searchData["range"]);
+      that.defRange = that.searchData["defRange"];
+      that.search();
+    });
+    that.changeDateRange(that.defRange);
+    that.search();
+  }
+  // 搜索
+  search(num?: number) {
+    if (this.hospital) {
+      this.searchData["hosId"] = this.hospital;
+    }
+    if (this.startDate) {
+      this.searchData["dateRange"] = {
+        start: this.startDate,
+        end: this.endDate,
+      };
+    }
+    if (num !== undefined) {
+      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
+    } else {
+      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+    }
+  }
+  // 导出
+  loading2 = false;
+  export() {
+    let that = this;
+    let postData: any = {
+      startTime: this.startDate,
+      endTime: this.endDate,
+      hosId: that.hospital,
+      type: this.dateType,
+      dataType: this.dataType || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort =
+        this.sortCurrentValue === "ascend"
+          ? this.sortCurrentKey
+          : `${this.sortCurrentKey} desc`;
+    }
+    this.loading2 = true;
+    that.mainService.exportReport("medicalWasteHospital", postData).subscribe(
+      (data) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", true, "");
+        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 = "全院统计.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", false, "");
+      }
+    );
+  }
+  // 重置
+  reset() {
+    this.dataType = 'outbound';
+    this.sortCurrentKey = "";
+    this.sortCurrentValue = "";
+    this.sortCurrent = {
+      deptNum: null,
+      clothesTypeNum: null,
+      getOrder: null,
+      sendOrder: null,
+      sendClothesNum: null,
+      price: null,
+    };
+    this.changeDateType("day");
+  }
+  // 医废类型-图表
+  pieChartOption;
+  pieChartHandler(datas) {
+    console.log(datas)
+    let labels = [];
+    let nums = [];
+    if (datas.length) {
+      datas.forEach((e) => {
+        labels.push(e[0]);
+        nums.push({
+          name: e[0],
+          value: e[1],
+          label: {
+            position: e[1] >= 0 ? 'bottom' : 'top',
+          }
+        });
+      });
+    }
+    this.pieChartOption = {
+      color: ["#6c63f0", "#b750be", "#3aacff", "#ed589d", "#fb466c", "#00d6f6"],
+      tooltip: {
+        trigger: "item",
+        axisPointer: {
+          // 坐标轴指示器，坐标轴触发有效
+          type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        },
+        formatter: '{b}: {c}kg'
+      },
+      legend: {
+        orient: 'vertical',
+        right: 20,
+        top: 'center'
+      },
+      grid: {
+        left: "9px",
+        right: "9px",
+        bottom: "20px",
+        top: "20px",
+        containLabel: true,
+      },
+      series: [
+        {
+          type: 'pie',
+          radius: '50%',
+          data: nums,
+          emphasis: {
+            itemStyle: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          },
+          label: {
+            show: true,
+            formatter: "{b} {d}%"
+          },
+        },
+      ],
+    };
+  }
+
+  // 回收及出库重量-图表
+  barChartOption;
+  barChartHandler(datas) {
+    console.log(datas)
+    let labels = [];
+    let nums = [];
+    if (datas.length) {
+      datas.forEach((e) => {
+        labels.push(e[0]);
+        nums.push({
+          name: e[0],
+          value: e[1],
+          label: {
+            position: 'top',
+          },
+          itemStyle: {
+            color: e[0] === '回收' ? '#3588fa' : '#00d6f6'
+          }
+        });
+      });
+    }
+    this.barChartOption = {
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          // 坐标轴指示器，坐标轴触发有效
+          type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        },
+        formatter: '{b}: {c}kg'
+      },
+      grid: {
+        left: "9px",
+        right: "9px",
+        bottom: "20px",
+        top: "20px",
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: "category",
+          data: labels,
+          axisTick: {
+            alignWithLabel: true,
+          },
+        },
+      ],
+      yAxis: [
+        {
+          type: "value",
+          axisLabel: {
+            formatter: "{value}kg",
+          },
+          nameTextStyle: {
+            align: "left",
+          },
+        },
+      ],
+      series: [
+        {
+          name: "",
+          type: "bar",
+          barWidth: "35",
+          data: nums,
+          label: {
+            show: true,
+            color: '#000',
+            formatter: '{c}kg'
+          },
+        },
+      ],
+    };
+  }
+  // 表格数据
+  loading1 = false;
+  pieChart: any = [];
+  barChart: any = [];
+  getList(num?: number, field?: string, sort?: string) {
+    let maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+    this.pageIndex = num;
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startTime: this.searchData.dateRange.start,
+      endTime: this.searchData.dateRange.end,
+      hosId: this.searchData.hosId,
+      type: this.dateType,
+      dataType: this.dataType || undefined,
+    };
+    if (field && sort) {
+      postData.sort = sort === "ascend" ? field : `${field} desc`;
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("report/medicalWaste", "hospital", postData)
+      .subscribe((result) => {
+        this.message.remove(maskFlag);
+        this.loading1 = false;
+        this.heads = result.heads || [];
+        this.listOfData = result.list || [];
+        this.listLength = result.totalNum;
+
+        this.pieChart = result.pieChart || [];
+        this.pieChartHandler(this.pieChart);
+
+        this.barChart = result.barChart || [];
+        this.barChartHandler(this.barChart);
+      });
+  }
+  // 获取院区
+  hospital: string; //选中院区
+  getAllHos() {
+    this.hospital = this.tool.getCurrentHospital().id + "";
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
+  }
+
+  // 修改时间展示维度
+  changeDateType(res) {
+    console.log(res, this.dateType);
+    this.dateType = res;
+    this.searchData["type"] = res;
+    console.log(this.searchData);
+    switch (res) {
+      case "day":
+        this.defRanges = [
+          {
+            label: "上周",
+            id: 1,
+          },
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "1"; //默认上周
+        this.changeDateRange("1");
+        break;
+      case "month":
+        this.defRanges = [
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "2"; //上月
+        this.changeDateRange("2");
+        break;
+      case "year":
+        this.defRanges = [
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "3"; //默认上周
+        this.changeDateRange("3");
+        break;
+    }
+  }
+
+  // 禁选日期
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return differenceInCalendarDays(current, this.today) > 0;
+  };
+
+  // 禁选月份开始
+  disabledMonthStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.monthRangeEnd) > 0;
+    return cur || staEnd;
+  };
+  // 禁选月份结束
+  disabledMonthEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.monthRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份开始
+  disabledYearStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.yearRangeEnd) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份结束
+  disabledYearEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.yearRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 日期选择 日
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result?): void {
+    console.log(this.dateRange);
+    console.log(result);
+    this.dateRange = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result || !result.length) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 月份选择
+  changeMonthStart(result?) {
+    console.log(result);
+    this.monthRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+  }
+  changeMonthEnd(result?) {
+    console.log(result);
+    this.monthRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    // this.startDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  // 年份选择
+  changeYearStart(result?) {
+    console.log(result);
+    this.yearRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-01-01';
+  }
+  changeYearEnd(result?) {
+    console.log(result);
+    this.yearRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.endDate = format(endOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 日期选择 快速修改时间区间
+  today = new Date();
+  quick: boolean = false;
+  changeDateRange(res) {
+    console.log(res);
+    this.quick = true;
+    switch (res) {
+      case "1":
+        // 上周
+        let lastweekstartdate = this.dateService.date().lastWeekStartDate;
+        let lastweekenddate = this.dateService.date().lastWeekEndDate;
+        console.log(lastweekstartdate, lastweekenddate);
+        this.changeDate([lastweekstartdate, lastweekenddate]);
+        break;
+      case "2":
+        // 上月
+        let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+        let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+        console.log(lastmonthstartdate, lastmonthenddate);
+        this.changeDate([lastmonthstartdate, lastmonthenddate]);
+        this.changeMonthStart(lastmonthstartdate);
+        this.changeMonthEnd(lastmonthenddate);
+        break;
+      case "3":
+        // 上年
+        let lastyearstartdate = this.dateService.date().lastYearStartDate;
+        let lastyearenddate = this.dateService.date().lastYearEndDate;
+        console.log(lastyearstartdate, lastyearenddate);
+        this.changeDate([lastyearstartdate, lastyearenddate]);
+        this.changeMonthStart(lastyearstartdate);
+        this.changeMonthEnd(lastyearenddate);
+        this.changeYearStart(lastyearstartdate);
+        this.changeYearEnd(lastyearenddate);
+        break;
+    }
+    this.quick = false;
+    this.search();
+  }
+
+  // 更多
+  toMore(type) {
+    let sendData = this.searchData;
+    console.log(sendData);
+    this.myService.sendMsg(sendData);
+    this.router.navigateByUrl("/main/" + type);
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  // 跳转详情
+  toDetail(e, data){
+    e.stopPropagation();
+    console.log(data);
+    window.open(`${location.origin}/spreadSheet/#/quiltWashingHospital/${data.date}/${this.dateType}`);
+  }
+
+  // 边输入边搜索节流阀
+  isLoading: boolean = false;
+  searchTimer(fun, e, those) {
+    let that = this;
+    that.isLoading = true;
+    fun(e, those);
+  }
+  // 列表排序
+  sortCurrent = {
+    deptNum: null,
+    clothesTypeNum: null,
+    getOrder: null,
+    sendOrder: null,
+    sendClothesNum: null,
+    price: null,
+  };
+  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);
+  }
+}

src/app/views/medical-waste-hospital-statistics/medical-waste-hospital-statistics.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+import { MedicalWasteHospitalStatisticsRoutingModule } from "./medical-waste-hospital-statistics-routing.module";
+import { ShareModule } from "src/app/share/share.module";
+import { MedicalWasteHospitalStatisticsComponent } from "./medical-waste-hospital-statistics.component";
+import { NgxEchartsModule } from 'ngx-echarts';
+
+@NgModule({
+  declarations: [MedicalWasteHospitalStatisticsComponent],
+  imports: [
+    CommonModule,
+    MedicalWasteHospitalStatisticsRoutingModule,
+    NgxEchartsModule,
+    ShareModule,
+  ],
+})
+export class MedicalWasteHospitalStatisticsModule {}

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { MedicalWastePersonnelStatisticsComponent } from "./medical-waste-personnel-statistics.component";
+
+const routes: Routes = [
+  { path: "", component: MedicalWastePersonnelStatisticsComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MedicalWastePersonnelStatisticsRoutingModule {}

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.html

@@ -0,0 +1,97 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='18' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <nz-radio-group [(ngModel)]="dateType" (ngModelChange)="changeDateType($event)">
+            <label *ngFor="let data of dateTypes" nz-radio-button [nzValue]="data.value">{{data.label}}</label>
+          </nz-radio-group>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">发起时间</span>：
+          <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
+            [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
+          </nz-range-picker>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
+            (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">
+          </nz-month-picker>
+          <span *ngIf="dateType=='month'"> ~ </span>
+          <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeEnd" [nzDisabledDate]="disabledMonthEnd"
+            (ngModelChange)="changeMonthEnd($event)" nzPlaceHolder="请选择截止月份">
+          </nz-month-picker>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeStart" [nzDisabledDate]="disabledYearStart"
+            (ngModelChange)="changeYearStart($event)" nzPlaceHolder="请选择开始年份">
+          </nz-year-picker>
+          <span *ngIf="dateType=='year'"> ~ </span>
+          <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeEnd" (ngModelChange)="changeYearEnd($event)"
+            [nzDisabledDate]="disabledYearEnd" nzPlaceHolder="请选择截止年份">
+          </nz-year-picker>
+        </div>
+        <div class="list-template__searchItem ml8">
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择时间"
+            [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+            <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">人员名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event)" nzAllowClear nzPlaceHolder="请选择人员名称" [(ngModel)]="searchDto.user">
+            <ng-container *ngFor="let option of userList">
+              <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="list-template__searchItem">
+          <span class="label">人员分组</span>：
+          <nz-select class="formItem" nzAllowClear [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择人员分组" [(ngModel)]="searchDto.group">
+            <nz-option [nzLabel]="data.groupName" [nzValue]="data.id" *ngFor="let data of groupList"></nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzXl='6' class="list-template__btns">
+        <button nz-button class="btn default" (click)='search(1)'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead (nzSortChange)="sort($event)" nzSingleSort>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="5%">人员姓名</th>
+            <th nzWidth="30%">总趟数</th>
+            <th nzWidth="30%">总单数</th>
+            <th nzWidth="30%">总重量(KG)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.userName }}</td>
+            <td>{{ data.totalTrip }}</td>
+            <td>{{ data.totalOrder }}</td>
+            <td>{{ data.totalWeight }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.less

@@ -0,0 +1,95 @@
+@import "../../../../src/theme.less";
+
+:host ::ng-deep .on {
+  color: #fff !important;
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 1000px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .conItem {
+        color: #333;
+
+        .jiTit {
+          height: 50px;
+          line-height: 50px;
+          border-bottom: 1px solid #e5e9ed;
+          padding: 0 32px;
+        }
+
+        .defeat {
+          font-size: 14px;
+          color: #333;
+          padding: 15px 32px;
+          min-height: 125px;
+        }
+
+        &.noCon {
+          background: #f9fafb;
+          padding: 16px 32px 24px 32px;
+          border-top: 1px solid #e5e9ed;
+
+          .title {
+            text-align: left;
+            font-size: 14px;
+            margin-bottom: 8px;
+          }
+
+          textarea {
+            min-height: 210px;
+          }
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-left: 10px;
+    }
+  }
+
+  .txtL {
+    text-align: left !important;
+  }
+
+  .txtR {
+    text-align: right !important;
+  }
+}

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.component.ts

@@ -0,0 +1,520 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, endOfDay, startOfDay } from "date-fns";
+
+import { MainService } from "../../services/main.service";
+import { DateService } from "../../services/date.service";
+import { MyServiceService } from "../../services/my-service.service";
+import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: "app-medical-waste-personnel-statistics",
+  templateUrl: "./medical-waste-personnel-statistics.component.html",
+  styleUrls: ["./medical-waste-personnel-statistics.component.less"],
+})
+export class MedicalWastePersonnelStatisticsComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private dateService: DateService,
+    private myService: MyServiceService,
+    private tool: ToolService
+  ) {}
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllHos();
+    this.changeDateRange(this.defRange);
+    // this.search();
+  }
+
+  dateType: string = "day"; //选中时间维度
+  dateTypes: any = [
+    {
+      label: "按天统计",
+      value: "day",
+    },
+    {
+      label: "按月统计",
+      value: "month",
+    },
+    {
+      label: "按年统计",
+      value: "year",
+    },
+  ]; //时间维度
+  defRange = "1"; //默认上周
+  defRanges = [
+    {
+      label: "上周",
+      id: 1,
+    },
+    {
+      label: "上月",
+      id: 2,
+    },
+    {
+      label: "上年",
+      id: 3,
+    },
+  ]; //时间默认区间
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  alldepart: any = []; //当前院区所属科室
+  dateRange: any = []; //发起时间区间 天
+  monthRangeStart: any; //发起时间 月 起
+  monthRangeEnd: any; //发起时间 月 止
+  yearRangeStart: any; //发起时间 年 起
+  yearRangeEnd: any; //发起时间 年 止
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  searchDto: any = {
+    group: null,
+    user: null,
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  searchData: any = {}; // 综合统计页面带过来的参数
+  getSearchData() {
+    let that = this;
+    let sub = that.myService.getMsg().subscribe((msg) => {
+      // 从综合报表跳转过来
+      that.searchData = msg;
+      console.log(that.searchData);
+      console.log(66);
+      sub.unsubscribe(); //取消订阅，否则订阅函数会累加执行
+      that.hospital = that.searchData["hosId"];
+      that.changeDate(that.searchData["range"]);
+      that.defRange = that.searchData["defRange"];
+      that.search();
+    });
+    that.changeDateRange(that.defRange);
+    that.search();
+  }
+  // 获取分组
+  groupList: any = []; //分组
+  getGroupList(id) {
+    let groupData = {
+      group2: {
+        hospitals: id,
+        type:1
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("data", "group2", groupData)
+      .subscribe((result) => {
+        this.groupList = result.list;
+      });
+  }
+  // 边输边搜节流阀
+  changeInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+  // 获取人员
+  userList: any = []; //人员
+  getUserList(keyword = '') {
+    let postData = {
+      user: {
+        hospital: { id: this.hospital },
+        name: keyword
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.userList = result.list;
+      });
+  }
+  // 搜索
+  search(num?: number) {
+    if (this.hospital) {
+      this.searchData["hosId"] = this.hospital;
+    }
+    if (this.startDate) {
+      this.searchData["dateRange"] = {
+        start: this.startDate,
+        end: this.endDate,
+      };
+    }
+    if (num !== undefined) {
+      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
+    } else {
+      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+    }
+  }
+  // 导出
+  loading2 = false;
+  export() {
+    let that = this;
+    let postData: any = {
+      startTime: this.startDate,
+      endTime: this.endDate,
+      hosId: that.hospital,
+      type: this.dateType,
+      userId: this.searchDto.user || undefined,
+      groupId: this.searchDto.group || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort =
+        this.sortCurrentValue === "ascend"
+          ? this.sortCurrentKey
+          : `${this.sortCurrentKey} desc`;
+    }
+    this.loading2 = true;
+    that.mainService.exportReport("medicalWastePersonal", postData).subscribe(
+      (data) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", true, "");
+        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 = "人员统计.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.loading2 = false;
+        this.showPromptModal("导出", false, "");
+      }
+    );
+  }
+  // 重置
+  reset() {
+    this.sortCurrentKey = "";
+    this.sortCurrentValue = "";
+    this.sortCurrent = {
+      totalTrip: null,
+      totalOrder: null,
+      getTrip: null,
+      getOrder: null,
+      sendTrip: null,
+      sendOrder: null,
+    };
+    this.searchDto = {
+      group: null,
+      user: null,
+    }
+    this.changeDateType("day");
+  }
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    this.pageIndex = num;
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      startTime: this.searchData.dateRange.start,
+      endTime: this.searchData.dateRange.end,
+      hosId: this.searchData.hosId,
+      type: this.dateType,
+      userId: this.searchDto.user || undefined,
+      groupId: this.searchDto.group || undefined,
+    };
+    if (field && sort) {
+      postData.sort = sort === "ascend" ? field : `${field} desc`;
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("report/medicalWaste", "personal", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.list || [];
+        this.listLength = result.totalNum;
+      });
+  }
+  // 获取院区
+  hospital: string; //选中院区
+  getAllHos() {
+    this.hospital = this.tool.getCurrentHospital().id + "";
+    this.getGroupList(this.hospital);
+    this.getUserList();
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      let dateStart = new Date(dateArr[0]);
+      let dateEnd = new Date(dateArr[1]);
+      dateStart.setHours(0,0,0);
+      dateEnd.setHours(23,59,59);
+      this.dateRange = [dateStart,dateEnd];
+    }
+  }
+
+  // 修改时间展示维度
+  changeDateType(res) {
+    console.log(res, this.dateType);
+    this.dateType = res;
+    this.searchData["type"] = res;
+    console.log(this.searchData);
+    switch (res) {
+      case "day":
+        this.defRanges = [
+          {
+            label: "上周",
+            id: 1,
+          },
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "1"; //默认上周
+        this.changeDateRange("1");
+        break;
+      case "month":
+        this.defRanges = [
+          {
+            label: "上月",
+            id: 2,
+          },
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "2"; //上月
+        this.changeDateRange("2");
+        break;
+      case "year":
+        this.defRanges = [
+          {
+            label: "上年",
+            id: 3,
+          },
+        ]; //时间默认区间
+        this.defRange = "3"; //默认上周
+        this.changeDateRange("3");
+        break;
+    }
+  }
+
+  // 禁选日期
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return differenceInCalendarDays(current, this.today) > 0;
+  };
+
+  // 禁选月份开始
+  disabledMonthStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.monthRangeEnd) > 0;
+    return cur || staEnd;
+  };
+  // 禁选月份结束
+  disabledMonthEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.monthRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份开始
+  disabledYearStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.yearRangeEnd) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份结束
+  disabledYearEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(this.yearRangeStart, current) > 0;
+    return cur || staEnd;
+  };
+
+  // 日期选择 日
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result?): void {
+    console.log(this.dateRange);
+    console.log(result);
+    this.dateRange = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result || !result.length) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    this.endDate = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 月份选择
+  changeMonthStart(result?) {
+    console.log(result);
+    this.monthRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+  }
+  changeMonthEnd(result?) {
+    console.log(result);
+    this.monthRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    // this.startDate = result.getFullYear() + '-' + (result.getMonth() + 1) + '-01';
+    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  // 年份选择
+  changeYearStart(result?) {
+    console.log(result);
+    this.yearRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+    // this.endDate = result.getFullYear() + '-01-01';
+  }
+  changeYearEnd(result?) {
+    console.log(result);
+    this.yearRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.endDate = format(endOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 日期选择 快速修改时间区间
+  today = new Date();
+  quick: boolean = false;
+  changeDateRange(res) {
+    console.log(res);
+    this.quick = true;
+    switch (res) {
+      case "1":
+        // 上周
+        let lastweekstartdate = this.dateService.date().lastWeekStartDate;
+        let lastweekenddate = this.dateService.date().lastWeekEndDate;
+        console.log(lastweekstartdate, lastweekenddate);
+        this.changeDate([lastweekstartdate, lastweekenddate]);
+        break;
+      case "2":
+        // 上月
+        let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+        let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+        console.log(lastmonthstartdate, lastmonthenddate);
+        this.changeDate([lastmonthstartdate, lastmonthenddate]);
+        this.changeMonthStart(lastmonthstartdate);
+        this.changeMonthEnd(lastmonthenddate);
+        break;
+      case "3":
+        // 上年
+        let lastyearstartdate = this.dateService.date().lastYearStartDate;
+        let lastyearenddate = this.dateService.date().lastYearEndDate;
+        console.log(lastyearstartdate, lastyearenddate);
+        this.changeDate([lastyearstartdate, lastyearenddate]);
+        this.changeMonthStart(lastyearstartdate);
+        this.changeMonthEnd(lastyearenddate);
+        this.changeYearStart(lastyearstartdate);
+        this.changeYearEnd(lastyearenddate);
+        break;
+    }
+    this.quick = false;
+    this.search();
+  }
+
+  // 更多
+  toMore(type) {
+    let sendData = this.searchData;
+    console.log(sendData);
+    this.myService.sendMsg(sendData);
+    this.router.navigateByUrl("/main/" + type);
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
+  // 边输入边搜索节流阀
+  isLoading: boolean = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  // 列表排序
+  sortCurrent = {
+    totalTrip: null,
+    totalOrder: null,
+    getTrip: null,
+    getOrder: null,
+    sendTrip: null,
+    sendOrder: null,
+  };
+  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);
+  }
+}

src/app/views/medical-waste-personnel-statistics/medical-waste-personnel-statistics.module.ts

@@ -0,0 +1,16 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+import { MedicalWastePersonnelStatisticsRoutingModule } from "./medical-waste-personnel-statistics-routing.module";
+import { ShareModule } from "src/app/share/share.module";
+import { MedicalWastePersonnelStatisticsComponent } from "./medical-waste-personnel-statistics.component";
+
+@NgModule({
+  declarations: [MedicalWastePersonnelStatisticsComponent],
+  imports: [
+    CommonModule,
+    MedicalWastePersonnelStatisticsRoutingModule,
+    ShareModule,
+  ],
+})
+export class MedicalWastePersonnelStatisticsModule {}

src/app/views/medical-waste-trend-analysis/medical-waste-trend-analysis-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { MedicalWasteTrendAnalysisComponent } from "./medical-waste-trend-analysis.component";
+
+const routes: Routes = [
+  { path: "", component: MedicalWasteTrendAnalysisComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class MedicalWasteTrendAnalysisRoutingModule {}

src/app/views/medical-waste-trend-analysis/medical-waste-trend-analysis.component.html

@@ -0,0 +1,181 @@
+<div class="quiltWashingTrendAnalysis">
+  <div class="main">
+    <div class="head">
+      <div class="search">
+        <div class="searchItem">
+          <nz-radio-group [(ngModel)]="searchDto.dateType" (ngModelChange)="changeDateType($event)">
+            <label *ngFor="let data of dateTypes" nz-radio-button [nzValue]="data.value">{{data.label}}</label>
+          </nz-radio-group>
+        </div>
+        <div class="searchItem" *ngIf="searchDto.dateType=='day'">
+          <span class="label">发起时间：</span>
+          <nz-date-picker [nzAllowClear]="false" [(ngModel)]="searchDto.dateStr"></nz-date-picker>
+        </div>
+        <div class="searchItem" *ngIf="searchDto.dateType=='month'">
+          <span class="label">发起时间：</span>
+          <nz-month-picker [nzAllowClear]="false" [(ngModel)]="searchDto.dateStr"></nz-month-picker>
+        </div>
+        <div class="searchItem" *ngIf="searchDto.dateType=='year'">
+          <span class="label">发起时间：</span>
+          <nz-year-picker [nzAllowClear]="false" [(ngModel)]="searchDto.dateStr"></nz-year-picker>
+        </div>
+        <div class="searchItem" *ngIf="searchDto.dateType=='quarter'">
+          <span class="label">发起时间：</span>
+          <nz-select [(ngModel)]="searchDto.year">
+            <nz-option [nzLabel]="item.name" [nzValue]="item.value" *ngFor="let item of yearList"></nz-option>
+          </nz-select>
+          <nz-select class="ml8" [(ngModel)]="searchDto.quarter">
+            <nz-option [nzLabel]="item.name" [nzValue]="item.value" *ngFor="let item of quarterList"></nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div class="btns">
+        <button nz-button nzType="primary" (click)='search()'>搜索</button>
+        <button nz-button class="ml8" (click)='reset()'>重置</button>
+      </div>
+    </div>
+    <div class="body">
+      <div class="body_tabs_wrap">
+        <div class="body_tabs">
+          <ng-container *ngFor="let tabType of tabTypes">
+            <div class="tab" [ngClass]="{active: searchDto.tabType == tabType.value}" *ngIf="!(searchDto.dateType == 'year' && tabType.value == 'MoM')" (click)="changeTabType(tabType.value)">{{tabType.name}}</div>
+          </ng-container>
+        </div>
+        <div class="compareDate">对比期：{{headerDate.compareDate}}</div>
+      </div>
+
+      <div class="total">
+        <div class="total_list">
+          <div class="total_item">
+            <span class="name">{{headerData.totalIntoWeight}}</span>
+            <span class="value">产生医废重量(kg)</span>
+          </div>
+          <div class="total_item">
+            <span class="name">{{headerData.compareTotalIntoWeight}}</span>
+            <span class="value">对比期重量(kg)</span>
+          </div>
+          <div class="total_item" [ngClass]="{green: headerData.intoWeightRate >= 0, red: headerData.intoWeightRate < 0}">
+            <span class="name">{{headerData.intoWeightRate}}%</span>
+            <span class="value">差异率</span>
+          </div>
+        </div>
+        <div class="total_list">
+          <div class="total_item">
+            <span class="name">{{headerData.totalOutWeight}}</span>
+            <span class="value">出库总重量(kg)</span>
+          </div>
+          <div class="total_item">
+            <span class="name">{{headerData.compareTotalOutWeight}}</span>
+            <span class="value">对比期总重量(kg)</span>
+          </div>
+          <div class="total_item" [ngClass]="{green: headerData.outWeightRate >= 0, red: headerData.outWeightRate < 0}">
+            <span class="name">{{headerData.outWeightRate}}%</span>
+            <span class="value">差异率</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="boxwrap">
+        <div class="box">
+          <div class="box-head">本期科室重量TOP10</div>
+          <nz-table class="table" [nzData]="deptListTop10" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="10%">排名</th>
+                <th nzWidth="30%">科室名称</th>
+                <th nzWidth="30%">本期重量(kg)</th>
+                <th nzWidth="30%">占比(%)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of deptListTop10;let i = index;">
+                <td>{{i + 1}}</td>
+                <td>{{data.deptName}}</td>
+                <td>{{data.weight}}</td>
+                <td>{{data.weightRate}}%</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+
+        <div class="box">
+          <div class="box-head">对比期科室重量TOP10</div>
+          <nz-table class="table" [nzData]="deptCompareListTop10" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="10%">排名</th>
+                <th nzWidth="30%">科室名称</th>
+                <th nzWidth="30%">对比期重量(kg)</th>
+                <th nzWidth="30%">占比(%)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of deptCompareListTop10;let i = index;">
+                <td>{{i + 1}}</td>
+                <td>{{data.deptName}}</td>
+                <td>{{data.weight}}</td>
+                <td>{{data.weightRate}}%</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+
+      <div class="echarts">
+        <div class="echart-head">科室重量差异率TOP10</div>
+        <div echarts class="echart" [options]='deptWeightOption'></div>
+      </div>
+
+      <div class="boxwrap">
+        <div class="box">
+          <div class="box-head">本期医废类型产生重量排名</div>
+          <nz-table class="table" [nzData]="wasteTypeListTop10" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="10%">排名</th>
+                <th nzWidth="30%">医废类型</th>
+                <th nzWidth="30%">本期重量(kg)</th>
+                <th nzWidth="30%">占比(%)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of wasteTypeListTop10;let i = index;">
+                <td>{{i + 1}}</td>
+                <td>{{data.clinicalWasteTypeName}}</td>
+                <td>{{data.weight}}</td>
+                <td>{{data.weightRate}}%</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+
+        <div class="box">
+          <div class="box-head">对比期医废类型产生重量排名</div>
+          <nz-table class="table" [nzData]="wasteTypeCompareListTop10" nzSize="small" [nzShowPagination]="false" [nzLoading]="loading">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="10%">排名</th>
+                <th nzWidth="30%">医废类型</th>
+                <th nzWidth="30%">对比期重量(kg)</th>
+                <th nzWidth="30%">占比(%)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of wasteTypeCompareListTop10;let i = index;">
+                <td>{{i + 1}}</td>
+                <td>{{data.clinicalWasteTypeName}}</td>
+                <td>{{data.weight}}</td>
+                <td>{{data.weightRate}}%</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
+      </div>
+
+      <div class="echarts">
+        <div class="echart-head">医废类型重量差异率排名</div>
+        <div echarts class="echart" [options]='typeWeightOption'></div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/medical-waste-trend-analysis/medical-waste-trend-analysis.component.less

@@ -0,0 +1,186 @@
+@import "../../../../src/theme.less";
+
+:host {
+  .quiltWashingTrendAnalysis ::ng-deep .ant-table-small > .ant-table-content > .ant-table-body{
+    margin: 0;
+  }
+  .quiltWashingTrendAnalysis ::ng-deep thead{
+    background-color: #F9F9FB;
+    border-bottom: none;
+  }
+  .quiltWashingTrendAnalysis{
+    min-height: 100%;
+    background-color: #F1F2F2;
+    .main{
+      margin-left: 10px;
+      .head{
+        margin-top: 8px;
+        height: 60px;
+        background-color: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 0 16px;
+        .search{
+          display: flex;
+          .searchItem{
+            margin-left: 16px;
+            &:first-of-type{
+              margin-left: 0;
+            }
+          }
+        }
+        .btns{
+          display: flex;
+        }
+      }
+      .body{
+        margin-top: 8px;
+        background-color: #fff;
+        padding-bottom: 30px;
+        .body_tabs_wrap{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .body_tabs{
+            display: flex;
+            .tab{
+              width: 106px;
+              height: 50px;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              background-color: #F9FAFB;
+              color: #6E6E6E;
+              font-size: 22px;
+              font-weight: bold;
+              cursor: pointer;
+              &.active{
+                background-color: @primary-color;
+                color: #fff;
+              }
+            }
+          }
+          .compareDate{
+            font-size: 22px;
+            font-weight: bold;
+            margin-right: 24px;
+          }
+        }
+
+        .total{
+          height: 105px;
+          padding: 0 16px;
+          border-bottom: 1px solid #CECECE;
+          display: flex;
+          justify-content: space-between;
+          align-items:center;
+          .total_list{
+            flex: 1;
+            display: flex;
+            justify-content: space-between;
+            align-items:center;
+            padding-right: 30px;
+            position: relative;
+            &:after{
+              content: '';
+              position:absolute;
+              right: -1px;
+              top: 50%;
+              transform: translateY(-50%);
+              width: 2px;
+              height: 42px;
+              background-color: #D9D9D9;
+            }
+            &:last-of-type{
+              padding-left: 30px;
+              &:after{
+                display: none;
+              }
+            }
+            .total_item{
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              .name{
+                font-size: 32px;
+                font-weight: bold;
+                &.green{
+                  color: @primary-color;
+                }
+                &.red{
+                  color: red;
+                }
+              }
+              .value{
+                font-size: 16px;
+                color: #8F8F8F;
+              }
+            }
+          }
+        }
+
+        .boxwrap{
+          display: flex;
+          .box{
+            flex: 1;
+            margin: 0 8px;
+            .box-head{
+              height: 46px;
+              padding: 0 24px;
+              display: flex;
+              align-items: center;
+              font-size: 16px;
+              font-weight: bold;
+              position: relative;
+              &:before{
+                content: '';
+                width: 10px;
+                height: 10px;
+                border-radius: 50%;
+                background-color: @primary-color;
+                position: absolute;
+                top: 50%;
+                left: 8px;
+                transform: translateY(-50%);
+              }
+            }
+            .table{
+              th,td{
+                text-align: center;
+              }
+            }
+          }
+        }
+
+        .echarts{
+          flex: 1;
+          margin: 0 8px;
+          .echart-head{
+            height: 46px;
+            padding: 0 24px;
+            display: flex;
+            align-items: center;
+            font-size: 16px;
+            font-weight: bold;
+            position: relative;
+            &:before{
+              content: '';
+              width: 10px;
+              height: 10px;
+              border-radius: 50%;
+              background-color: @primary-color;
+              position: absolute;
+              top: 50%;
+              left: 8px;
+              transform: translateY(-50%);
+            }
+          }
+          .echart{
+
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/medical-waste-trend-analysis/medical-waste-trend-analysis.component.ts

@@ -0,0 +1,380 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { differenceInCalendarDays, endOfMonth, endOfYear, format, startOfMonth, startOfYear, getQuarter } from "date-fns";
+
+import { MainService } from "../../services/main.service";
+import { DateService } from "../../services/date.service";
+import { MyServiceService } from "../../services/my-service.service";
+import { ToolService } from "../../services/tool.service";
+
+@Component({
+  selector: "app-medical-waste-trend-analysis",
+  templateUrl: "./medical-waste-trend-analysis.component.html",
+  styleUrls: ["./medical-waste-trend-analysis.component.less"],
+})
+export class MedicalWasteTrendAnalysisComponent implements OnInit {
+  constructor(
+    private route: ActivatedRoute,
+    private router: Router,
+    private mainService: MainService,
+    private dateService: DateService,
+    private myService: MyServiceService,
+    private tool: ToolService
+  ) {}
+
+  ngOnInit() {
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getAllHos();
+    this.changeDateType();
+  }
+
+  searchDto = {
+    dateType: "day", //选中日期维度
+    dateStr: new Date(), //选中日期--天、月、年
+    year: +format(new Date(), "yyyy"),//季度-年
+    quarter: getQuarter(new Date()),//季度
+    tabType: 'YoY',//YoY/同比，MoM/环比
+  }
+
+  tabTypes = [
+    {
+      name: "同比",
+      value: "YoY",
+    },
+    {
+      name: "环比",
+      value: "MoM",
+    },
+  ]
+
+  quarterList = [
+    { name: '第一季度', value: 1, },
+    { name: '第二季度', value: 2, },
+    { name: '第三季度', value: 3, },
+    { name: '第四季度', value: 4, },
+  ]
+
+  yearList = this.generaterYears();
+
+  dateTypes: any = [
+    {
+      label: "按天统计",
+      value: "day",
+    },
+    {
+      label: "按月统计",
+      value: "month",
+    },
+    {
+      label: "按季度统计",
+      value: "quarter",
+    },
+    {
+      label: "按年统计",
+      value: "year",
+    },
+  ]; //时间维度
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 切换同比/环比
+  changeTabType(value){
+    this.searchDto.tabType = value;
+    this.search();
+  }
+
+  // 生成前5年的年份
+  generaterYears(){
+    const currentYear = new Date().getFullYear();
+    const years = [];
+
+    for (let i = currentYear - 4; i <= currentYear; i++) {
+      years.push(i);
+    }
+
+    return years.map(v => ({
+      name: v + '年',
+      value: v,
+    }));
+  }
+  // 科室重量差异率TOP10
+  deptWeightOption;
+  deptWeightChart(datas) {
+    console.log(datas)
+    let labels = [];
+    let nums = [];
+    if (datas.length) {
+      datas.forEach((e) => {
+        labels.push(e.deptName);
+        nums.push({
+          name: e.deptName,
+          value: e.weightRate,
+          label: {
+            position: e.weightRate >= 0 ? 'bottom' : 'top',
+          }
+        });
+      });
+    }
+    this.deptWeightOption = {
+      color: ["#3398DB"],
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          // 坐标轴指示器，坐标轴触发有效
+          type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        },
+        formatter: '{b}: {c}%'
+      },
+      grid: {
+        left: "9px",
+        right: "9px",
+        bottom: "20px",
+        top: "20px",
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: "category",
+          data: labels,
+          // axisLine: {
+          //   show: true,
+          //   onZero: false,
+          // },
+          axisTick: {
+            alignWithLabel: true,
+          },
+        },
+      ],
+      yAxis: [
+        {
+          type: "value",
+          interval: 20,
+          max: 100,
+          min: -100,
+          splitLine: {
+            // show: false,
+          },
+          axisLabel: {
+            formatter: "{value}%",
+          },
+          nameTextStyle: {
+            align: "left",
+          },
+        },
+      ],
+      series: [
+        {
+          name: "差异率",
+          type: "bar",
+          barWidth: "35",
+          data: nums,
+          label: {
+            show: true,
+            color: '#000',
+            formatter: '{c}%'
+          },
+          itemStyle: {
+            normal: {
+              //每根柱子颜色设置
+              color: function (params) {
+                if (params.value > 0) {
+                  return '#92DCE9';  // 正数颜色
+                } else {
+                  return '#7E8CEB';    // 负数颜色
+                }
+              },
+            },
+          },
+        },
+      ],
+    };
+  }
+  // 医废类型重量差异率排名
+  typeWeightOption;
+  typeWeightChart(datas) {
+    console.log(datas)
+    let labels = [];
+    let nums = [];
+    if (datas.length) {
+      datas.forEach((e) => {
+        labels.push(e.clinicalWasteTypeName);
+        nums.push({
+          name: e.clinicalWasteTypeName,
+          value: e.weightRate,
+          label: {
+            position: e.weightRate >= 0 ? 'bottom' : 'top',
+          }
+        });
+      });
+    }
+    this.typeWeightOption = {
+      color: ["#3398DB"],
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          // 坐标轴指示器，坐标轴触发有效
+          type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        },
+        formatter: '{b}: {c}%'
+      },
+      grid: {
+        left: "9px",
+        right: "9px",
+        bottom: "20px",
+        top: "20px",
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: "category",
+          data: labels,
+          // axisLine: {
+          //   show: true,
+          //   onZero: false,
+          // },
+          axisTick: {
+            alignWithLabel: true,
+          },
+        },
+      ],
+      yAxis: [
+        {
+          type: "value",
+          interval: 20,
+          max: 100,
+          min: -100,
+          splitLine: {
+            // show: false,
+          },
+          axisLabel: {
+            formatter: "{value}%",
+          },
+          nameTextStyle: {
+            align: "left",
+          },
+        },
+      ],
+      series: [
+        {
+          name: "差异率",
+          type: "bar",
+          barWidth: "35",
+          data: nums,
+          label: {
+            show: true,
+            color: '#000',
+            formatter: '{c}%'
+          },
+          itemStyle: {
+            normal: {
+              //每根柱子颜色设置
+              color: function (params) {
+                if (params.value > 0) {
+                  return '#89C9BD';  // 正数颜色
+                } else {
+                  return '#0694B6';    // 负数颜色
+                }
+              },
+            },
+          },
+        },
+      ],
+    };
+  }
+  // 搜索
+  search() {
+    this.getData();
+  }
+  // 重置
+  reset() {
+    this.searchDto = {
+      dateType: "day", //选中日期维度
+      dateStr: new Date(), //选中日期--天、月、年
+      year: +format(new Date(), "yyyy"),//季度-年
+      quarter: getQuarter(new Date()),//季度
+      tabType: 'YoY',//YoY/同比，MoM/环比
+    }
+    this.search();
+  }
+  // 数据
+  loading = false;
+  headerDate: any = {};
+  headerData: any = {};
+  deptListTop10: any = [];
+  deptCompareListTop10: any = [];
+  wasteTypeListTop10: any = [];
+  wasteTypeCompareListTop10: any = [];
+  deptBarTop10: any = [];
+  wasteTypeBarTop10: any = [];
+  getData() {
+    let postData: any = {
+      tabType: this.searchDto.tabType,
+      hosId: this.hospital,
+      type: this.searchDto.dateType,
+    };
+    switch (postData.type) {
+      case "day":
+        postData.dateStr = this.searchDto.dateStr ? format(this.searchDto.dateStr, "yyyy-MM-dd") : format(new Date(), "yyyy-MM-dd");
+        break;
+      case "month":
+        postData.dateStr = this.searchDto.dateStr ? format(this.searchDto.dateStr, "yyyy-MM") : format(new Date(), "yyyy-MM");
+        break;
+      case "quarter":
+        postData.year = this.searchDto.year || +format(new Date(), "yyyy");
+        postData.quarter = this.searchDto.quarter || getQuarter(new Date());
+        break;
+      case "year":
+        postData.dateStr = format(this.searchDto.dateStr, "yyyy");
+        break;
+    }
+    this.loading = true;
+    this.mainService
+      .postCustom("report/trend/analysis", "medicalWaste", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if(result.status == 200){
+          this.headerDate = result.list[0] || {};
+          this.headerData = result.list[1] || {};
+          let bodyData = result.list[2] || {};
+          this.deptListTop10 = bodyData.deptListTop10 || [];
+          this.deptCompareListTop10 = bodyData.deptCompareListTop10 || [];
+          this.wasteTypeListTop10 = bodyData.wasteTypeListTop10 || [];
+          this.wasteTypeCompareListTop10 = bodyData.wasteTypeCompareListTop10 || [];
+          this.deptBarTop10 = bodyData.deptBarTop10 || [];
+          this.deptWeightChart(this.deptBarTop10);
+          this.wasteTypeBarTop10 = bodyData.wasteTypeBarTop10 || [];
+          this.typeWeightChart(this.wasteTypeBarTop10);
+        }
+      });
+  }
+  // 获取院区
+  hospital: string; //选中院区
+  getAllHos() {
+    this.hospital = this.tool.getCurrentHospital().id;
+  }
+
+  // 修改时间展示维度
+  changeDateType(e?) {
+    if(this.searchDto.dateType == 'year' && this.searchDto.tabType == 'MoM'){
+      this.searchDto.tabType = 'YoY';
+    }
+    this.getData();
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+}

src/app/views/medical-waste-trend-analysis/medical-waste-trend-analysis.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+
+import { MedicalWasteTrendAnalysisRoutingModule } from "./medical-waste-trend-analysis-routing.module";
+import { ShareModule } from "src/app/share/share.module";
+import { MedicalWasteTrendAnalysisComponent } from "./medical-waste-trend-analysis.component";
+import { NgxEchartsModule } from 'ngx-echarts';
+
+@NgModule({
+  declarations: [MedicalWasteTrendAnalysisComponent],
+  imports: [
+    CommonModule,
+    MedicalWasteTrendAnalysisRoutingModule,
+    NgxEchartsModule,
+    ShareModule,
+  ],
+})
+export class MedicalWasteTrendAnalysisModule {}

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.ts

@@ -217,8 +217,6 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
   }
   // 重置
   reset() {
-    this.changeDateType("day");
-    this.changeDateRange("1");
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
@@ -232,7 +230,7 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
       dept: null,
       building: null,
     }
-    this.search();
+    this.changeDateType("day");
   }
   // 选中表格单列
   mapOfCheckedId: { [key: string]: boolean } = {};

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.ts

@@ -154,8 +154,6 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
   }
   // 重置
   reset() {
-    this.changeDateType("day");
-    this.changeDateRange("1");
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
@@ -166,7 +164,7 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
       sendClothesNum: null,
       price: null,
     };
-    this.search();
+    this.changeDateType("day");
   }
   // 表格数据
   loading1 = false;

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.ts

@@ -209,8 +209,6 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
   }
   // 重置
   reset() {
-    this.changeDateType("day");
-    this.changeDateRange("1");
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
@@ -225,7 +223,7 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
       group: null,
       user: null,
     }
-    this.search();
+    this.changeDateType("day");
   }
   // 表格数据
   loading1 = false;

src/common.less

@@ -269,6 +269,41 @@
       display: flex;
       align-items: center;
     }
+    .list-template__chart {
+      display: flex;
+      .echarts{
+        flex: 1;
+        margin-right: 8px;
+        border: 1px solid #e8e8e8;
+        margin-bottom: 8px;
+        &:last-of-type{
+          margin-right: 0;
+        }
+        .echart-head{
+          height: 46px;
+          padding: 0 24px;
+          display: flex;
+          align-items: center;
+          font-size: 16px;
+          font-weight: bold;
+          position: relative;
+          &:before{
+            content: '';
+            width: 10px;
+            height: 10px;
+            border-radius: 50%;
+            background-color: @primary-color;
+            position: absolute;
+            top: 50%;
+            left: 8px;
+            transform: translateY(-50%);
+          }
+        }
+        .echart{
+          height: 250px;
+        }
+      }
+    }
     .list-template__bottom {
       background: #f9fafb;
       border: 1px solid #e5e9ed;

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info(`%c%c v2.4.61 %c 武汉大势恒通科技有限责任公司 `,
+    console.info(`%c%c v2.4.62 %c 武汉大势恒通科技有限责任公司 `,
       'color: #3eaf7c; font-size: 16px;line-height:30px;',
       'background: #35495e; padding: 4px; border-radius: 3px 0 0 3px; color: #fff',
       'background: #41b883; padding: 4px; border-radius: 0 3px 3px 0; color: #fff',