一堆修改

src/app/services/main.service.ts

@@ -741,6 +741,13 @@ export class MainService {
     });
   }
 
+  // 楼栋检查率统计
+  postReportBuilding(type, data): any {
+    return this.http.post(host.host + "/report/building/" + type, data, {
+      headers: this.headers,
+    });
+  }
+
   // 获取检验项目列表
   specimenCount(data): any {
     return this.http.post(host.host + "/api/specimenDesc/specimenCount", data, {

src/app/services/tool.service.ts

@@ -134,6 +134,15 @@ export class ToolService {
         case "allOrders":
           coopBtns.allOrders = true; //全部工单
           break;
+        case "batchConversion":
+          coopBtns.batchConversion = true; //批量转换
+          break;
+        case "oneClickConversion":
+          coopBtns.oneClickConversion = true; //一键转换
+          break;
+        case "oneClickRecovery":
+          coopBtns.oneClickRecovery = true; //一键恢复
+          break;
       }
     });
     console.log(coopBtns);

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -162,30 +162,31 @@ export class BusinessDataDetailModalComponent implements OnInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      canceled: this.dataInfo.canceled ? true : undefined,
     }
     switch(this.dataInfo.type){
       case 'total':
-        postData.deptId = this.dataInfo.data.deptId;
+        postData.deptId = this.dataInfo.data.id;
         postData.hosId = this.hosId;
         postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         break;
       case 'noCheckCount':
-        postData.deptId = this.dataInfo.data.deptId;
+        postData.deptId = this.dataInfo.data.id;
         postData.hosId = this.hosId;
         postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.reportInsState = 'noCheck';
         break;
       case 'checkCount':
-        postData.deptId = this.dataInfo.data.deptId;
+        postData.deptId = this.dataInfo.data.id;
         postData.hosId = this.hosId;
         postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.reportInsState = 'check';
         break;
       case 'insCount':
-        postData.deptId = this.dataInfo.data.deptId;
+        postData.deptId = this.dataInfo.data.id;
         postData.hosId = this.hosId;
         postData.startTime = this.dataInfo.searchDto.dateRange[0] ? format(startOfDay(this.dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined;
         postData.endTime = this.dataInfo.searchDto.dateRange[1] ? format(endOfDay(this.dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined;

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { BuildingInspectionRateStatisticsComponent } from './building-inspection-rate-statistics.component';
+
+
+const routes: Routes = [{
+  path: '',
+  component: BuildingInspectionRateStatisticsComponent,
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class BuildingInspectionRateStatisticsRoutingModule { }

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.component.html

@@ -0,0 +1,115 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='17' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">申请时间</span>：
+          <nz-range-picker [(ngModel)]="searchDto.dateRange"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">楼栋</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+            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 class="list-template__searchItem" style="width: 100%;">
+          <span class="label">排除科室</span>：
+          <nz-select style="min-width: 135px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzMode="multiple"
+            (nzOnSearch)="changeInp($event)" nzAllowClear nzPlaceHolder="请选择排除科室" [(ngModel)]="searchDto.department">
+            <ng-container *ngFor="let option of alldepart">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzXl='7' class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</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-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="getList(true)"></nz-checkbox-group>
+    </div>
+    <div class="cont">
+      <div>
+        <span>总计</span>
+        <span class="rate"></span>
+      </div>
+      <div>
+        <span>楼栋数</span>
+        <span>{{statisticsObj.count}}</span>
+      </div>
+      <div>
+        <span>总检查数</span>
+        <span>{{statisticsObj.total}}</span>
+      </div>
+      <div>
+        <span>无需检查数</span>
+        <span>{{statisticsObj.noCheckCount}}</span>
+      </div>
+      <div>
+        <span>需检查数</span>
+        <span>{{statisticsObj.checkCount}}</span>
+      </div>
+      <div>
+        <span>陪检数</span>
+        <span>{{statisticsObj.insCount}}</span>
+      </div>
+      <div>
+        <span>检查率</span>
+        <span>{{statisticsObj.inspectRate}}%</span>
+      </div>
+      <div>
+        <span>工单数</span>
+        <span>{{statisticsObj.workOrderCount}}</span>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="14%">楼栋名称</th>
+            <th nzWidth="14%">总检查数</th>
+            <th nzWidth="14%">无需检查数</th>
+            <th nzWidth="14%">需检查数</th>
+            <th nzWidth="13%">陪检数</th>
+            <th nzWidth="13%">检查率</th>
+            <th nzWidth="13%">工单数</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let index=index;">
+            <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
+            <td>{{ data.name }}</td>
+            <td>{{ data.total }}</td>
+            <td>{{ data.noCheckCount }}</td>
+            <td>{{ data.checkCount }}</td>
+            <td>{{ data.insCount }}</td>
+            <td>{{ data.inspectRate }}%</td>
+            <td>{{ data.workOrderCount }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.component.less

@@ -0,0 +1,174 @@
+@import "../../../../src/theme.less";
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    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%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 8px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.component.ts

@@ -0,0 +1,205 @@
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { ToolService } from "../../services/tool.service";
+import { format, startOfDay, endOfDay, startOfWeek, endOfWeek, add } from 'date-fns';
+import { BuildingInspectionRateStatisticsService } from './building-inspection-rate-statistics.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+
+@Component({
+  selector: "app-building-inspection-rate-statistics",
+  templateUrl: "./building-inspection-rate-statistics.component.html",
+  styleUrls: ["./building-inspection-rate-statistics.component.less"],
+})
+export class BuildingInspectionRateStatisticsComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+    private tool: ToolService,
+    private buildingInspectionRateStatisticsService: BuildingInspectionRateStatisticsService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  searchDto: any = {
+    dateRange: [startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 })],
+    department: [],
+    buildingList: null,
+  }
+
+  hosId: any; //院区（搜索）
+  pageIndex: number = 1; //页码
+  listLength: number = 10; //总条数
+  pageSize: number = 10; //每页条数
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  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.hosId = this.tool.getCurrentHospital().id;
+    this.getList(true);
+    this.getDeparts();
+    this.getBuildingList();
+  }
+
+  checkOptionsOne: Array<any> = [
+    { label: "不包含已取消已作废", value: "1", checked: true },
+  ];
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 科室边输边搜节流阀
+  isLoading = false;
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+
+  // 获取科室
+  alldepart: any = []; //科室
+  getDeparts(dept?) {
+    let data = {
+      department: {
+        cascadeHosId: this.hosId,
+        dept: dept,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.buildingInspectionRateStatisticsService
+      .getDeparts(data)
+      .subscribe((data) => {
+        this.alldepart = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 获取楼栋
+  buildingList: any = []; //楼栋
+  getBuildingList() {
+    let data = {
+      building: {
+        cascadeHosId: this.hosId,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.isLoading = true;
+    this.buildingInspectionRateStatisticsService
+      .getBuildingList(data)
+      .subscribe((data) => {
+        this.buildingList = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 搜索
+  search() {
+    this.getList(true);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {
+      dateRange: [startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 })],
+      department: [],
+      buildingList: null,
+    }
+    this.search();
+  }
+  // 表格数据
+  loading1 = false;
+  statisticsObj = {};
+  getList(isResetPageIndex = false) {
+    isResetPageIndex && (this.pageIndex = 1);
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hosId: this.hosId,
+      startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
+      buildingId: this.searchDto.building|| undefined,
+    };
+    this.loading1 = true;
+    this.buildingInspectionRateStatisticsService
+      .query(postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        result.list = result.list || [];
+        this.listOfData = result.list;
+        this.listLength = result.totalNum;
+        this.statisticsObj = result.totalAnalysis || {};
+      });
+  }
+
+  // 导出
+  loading2 = false;
+  export() {
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hosId: this.hosId,
+      startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
+      buildingId: this.searchDto.building|| undefined,
+    };
+    this.loading2 = true;
+    this.buildingInspectionRateStatisticsService.exportReport(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, "");
+      }
+    );
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+}
+

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { BuildingInspectionRateStatisticsRoutingModule } from './building-inspection-rate-statistics-routing.module';
+import { BuildingInspectionRateStatisticsComponent } from './building-inspection-rate-statistics.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    BuildingInspectionRateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    BuildingInspectionRateStatisticsRoutingModule,
+    ShareModule,
+  ]
+})
+export class BuildingInspectionRateStatisticsModule { }

src/app/views/building-inspection-rate-statistics/building-inspection-rate-statistics.service.ts

@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class BuildingInspectionRateStatisticsService {
+  constructor(
+    private mainService: MainService,
+  ) { }
+
+  // 列表-查
+  query(postData) {
+    return this.mainService.postReportBuilding("inspect", postData);
+  }
+
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
+
+  // 科室
+  getDeparts(postData) {
+    return this.mainService.getFetchDataList("data", "department", postData);
+  }
+
+  // 楼栋
+  getBuildingList(postData) {
+    return this.mainService.getFetchDataList("simple/data", "building", postData);
+  }
+
+  // 导出
+  exportReport(postData) {
+    return this.mainService.exportReport("buildingInspectRate", postData);
+  }
+}
+
+
+

src/app/views/check-and-exclude-config/check-and-exclude-config.component.html

@@ -5,6 +5,7 @@
       </div>
       <div nz-col nzXl="12" class="list-template__btns">
         <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
+        <button nz-button *ngIf="coopBtns.batchConversion" class="btn default ml8" (click)="convertOrRestore('batchConversion')">批量转换</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -34,6 +35,8 @@
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">修改</span>
                 <span *ngIf="coopBtns.del" (click)="showDelModal(data.id, '您确认要删除吗？')">删除</span>
+                <span *ngIf="coopBtns.oneClickConversion" (click)="convertOrRestore('oneClickConversion', data)">一键转换</span>
+                <span *ngIf="coopBtns.oneClickRecovery" (click)="convertOrRestore('oneClickRecovery', data)">一键恢复</span>
               </div>
             </td>
           </tr>
@@ -93,3 +96,8 @@
 <app-prompt-modal [content]="promptModal.content" [success]="promptModal.success" [show]="promptModal.show"
   [info]="promptModal.info">
 </app-prompt-modal>
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+<!-- 模态框 -->
+<app-dialog-delete [delModal]="dialogConvertOrRestore.delModal" (hideDelModalEvent)="hideConvertOrRestoreModal()" [btnLoading]="dialogConvertOrRestore.btnLoading"
+(confirmDelEvent)="confirmConvertOrRestore()" [content]="dialogConvertOrRestore.content"></app-dialog-delete>

src/app/views/check-and-exclude-config/check-and-exclude-config.component.ts

@@ -14,7 +14,7 @@ export class CheckAndExcludeConfigComponent implements OnInit {
     private fb: FormBuilder,
     private checkAndExcludeConfigService: CheckAndExcludeConfigService,
     private route: ActivatedRoute,
-    private tool: ToolService
+    private tool: ToolService,
   ) {}
 
   hosId: any; //当前选中院区
@@ -49,6 +49,10 @@ export class CheckAndExcludeConfigComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 
+  // 批量转换/一键转换/一键恢复
+  convertOrRestore(type, data?){
+    this.showConvertOrRestoreModal(type, data);
+  }
   // 表格数据
   loading = false;
   getList(isInit = false) {
@@ -194,5 +198,72 @@ export class CheckAndExcludeConfigComponent implements OnInit {
         }
       });
   }
+  // ---------------------------------------
+  // 批量转换/一键转换/一键恢复
+  dialogConvertOrRestore:any = {
+    delModal: false, //删除模态框
+    content: '', //提示框信息
+  }
+  coopType:string = '';
+  coopData:any = {};
+  showConvertOrRestoreModal(type, data?) {
+
+    let content = '';
+    switch(type){
+      case 'batchConversion':
+        content = '您确认要转换最近两个半月的所有排除项匹配的检查数据吗？';
+        break;
+      case 'oneClickConversion':
+        content = `您确认要转换最近两个半月的匹配“${data.key1}”检查数据吗？`;
+        break;
+      case 'oneClickRecovery':
+        content = `您确认要恢复最近两个半月的匹配“${data.key1}”检查数据吗？`;
+        break;
+    }
+
+    this.coopType = type;
+    this.coopData = data;
+
+    this.dialogConvertOrRestore = {
+      delModal: true,
+      content,
+    }
+  }
+  // 隐藏
+  hideConvertOrRestoreModal() {
+    this.dialogConvertOrRestore.delModal = false;
+  }
+  // 确认
+  confirmConvertOrRestore() {
+    this.dialogConvertOrRestore.btnLoading = true;
+    let type_back = '';
+    switch(this.coopType){
+      case 'batchConversion':
+        type_back = 'inspectTrans';
+        break;
+      case 'oneClickConversion':
+        type_back = 'inspectTrans';
+        break;
+      case 'oneClickRecovery':
+        type_back = 'inspectRecover';
+        break;
+    }
+    let postData = {
+      hosId:this.hosId,
+      type: type_back,
+      id: this.coopData ? this.coopData.id : undefined,
+    };
+    this.checkAndExcludeConfigService
+      .convertOrRestore(postData)
+      .subscribe((result: any) => {
+        this.dialogConvertOrRestore.btnLoading = false;
+        this.dialogConvertOrRestore.delModal = false;
+        if (result.state == 200) {
+          this.showPromptModal('操作', true);
+        }else{
+          this.showPromptModal('操作', false, result.msg);
+        }
+      });
+  }
 }
 

src/app/views/check-and-exclude-config/check-and-exclude-config.service.ts

@@ -23,4 +23,9 @@ export class CheckAndExcludeConfigService {
   add(postData) {
     return this.mainService.simplePost("addData", "dataFieldRule", postData);
   }
+
+  // 批量转换/一键转换/一键恢复
+  convertOrRestore(postData) {
+    return this.mainService.coopConfig("changeInspectDataField", postData);
+  }
 }

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.html

@@ -6,12 +6,74 @@
           <span class="label">申请时间</span>：
           <nz-range-picker [(ngModel)]="searchDto.dateRange"></nz-range-picker>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">楼栋</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+            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 class="list-template__searchItem" style="width: 100%;">
+          <span class="label">排除科室</span>：
+          <nz-select style="min-width: 135px;" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzMode="multiple"
+            (nzOnSearch)="changeInp($event)" nzAllowClear nzPlaceHolder="请选择排除科室" [(ngModel)]="searchDto.department">
+            <ng-container *ngFor="let option of alldepart">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl='7' class="list-template__btns">
         <button nz-button class="btn default ml8" (click)='search()'>搜索</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-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="getList(true)"></nz-checkbox-group>
+    </div>
+    <div class="cont">
+      <div>
+        <span>总计</span>
+        <span class="rate"></span>
+      </div>
+      <div>
+        <span>科室数</span>
+        <span>{{statisticsObj.count}}</span>
+      </div>
+      <div>
+        <span>总检查数</span>
+        <span>{{statisticsObj.total}}</span>
+      </div>
+      <div>
+        <span>无需检查数</span>
+        <span>{{statisticsObj.noCheckCount}}</span>
+      </div>
+      <div>
+        <span>需检查数</span>
+        <span>{{statisticsObj.checkCount}}</span>
+      </div>
+      <div>
+        <span>陪检数</span>
+        <span>{{statisticsObj.insCount}}</span>
+      </div>
+      <div>
+        <span>检查率</span>
+        <span>{{statisticsObj.inspectRate}}%</span>
+      </div>
+      <div>
+        <span>工单数</span>
+        <span>{{statisticsObj.workOrderCount}}</span>
+      </div>
+    </div>
     <div class="list-template__bottom">
       <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
         [nzLoading]="loading1">
@@ -30,11 +92,11 @@
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.deptName }}</td>
-            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'total' }, 'deptInspectionRateStatistics')">{{ data.total }}</td>
-            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'noCheckCount' }, 'deptInspectionRateStatistics')">{{ data.noCheckCount }}</td>
-            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'checkCount' }, 'deptInspectionRateStatistics')">{{ data.checkCount }}</td>
-            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, type: 'insCount' }, 'deptInspectionRateStatistics')">{{ data.insCount }}</td>
+            <td>{{ data.name }}</td>
+            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, canceled: checkOptionsOne[0].checked, type: 'total' }, 'deptInspectionRateStatistics')">{{ data.total }}</td>
+            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, canceled: checkOptionsOne[0].checked, type: 'noCheckCount' }, 'deptInspectionRateStatistics')">{{ data.noCheckCount }}</td>
+            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, canceled: checkOptionsOne[0].checked, type: 'checkCount' }, 'deptInspectionRateStatistics')">{{ data.checkCount }}</td>
+            <td class="tab_hover" (click)="viewDetail({ data: data, searchDto: searchDto, canceled: checkOptionsOne[0].checked, type: 'insCount' }, 'deptInspectionRateStatistics')">{{ data.insCount }}</td>
             <td>{{ data.inspectRate }}%</td>
             <td class="tab_hover" (click)="personDetail({ data: data, searchDto: searchDto})">{{ data.workOrderCount }}</td>
           </tr>
@@ -59,3 +121,7 @@
   [dataInfo]="dataInfo"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-modal>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo"></app-prompt-modal>

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.less

@@ -1,4 +1,52 @@
 @import "../../../../src/theme.less";
+.cont {
+  width: 100%;
+  border: 1px solid #dde1e5;
+  padding: 8px 16px;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  &>div {
+    display: inline-block;
+    margin-right: 4px;
+
+    &:nth-child(1) {
+      position: relative;
+      padding-left: 10px;
+
+      &::before {
+        content: '';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        height: 100%;
+        background: @primary-color;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      margin-right: 8px;
+
+      &:nth-child(1) {
+        font-size: 12px;
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #333;
+        font-weight: 500;
+      }
+
+      &.rate {
+        font-size: 18px;
+        color: @primary-color;
+      }
+    }
+
+
+  }
+}
 .save {
   position: fixed;
   left: 0;

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.component.ts

@@ -3,8 +3,10 @@ import { ActivatedRoute, Router } from "@angular/router";
 
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
-import { format, startOfDay, endOfDay, previousMonday, previousSunday } from 'date-fns';
+import { format, startOfDay, endOfDay, startOfWeek, endOfWeek, add } from 'date-fns';
 import { DeptInspectionRateStatisticsService } from './dept-inspection-rate-statistics.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-dept-inspection-rate-statistics",
@@ -26,7 +28,9 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
 
   listOfData: any[] = []; //表格数据
   searchDto: any = {
-    dateRange: [previousMonday(new Date()), previousSunday(new Date())],
+    dateRange: [startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 })],
+    department: [],
+    buildingList: null,
   }
 
   hosId: any; //院区（搜索）
@@ -37,10 +41,73 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 
+  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.hosId = this.tool.getCurrentHospital().id;
     this.getList(true);
+    this.getDeparts();
+    this.getBuildingList();
+  }
+
+  checkOptionsOne: Array<any> = [
+    { label: "不包含已取消已作废", value: "1", checked: true },
+  ];
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 科室边输边搜节流阀
+  isLoading = false;
+  changeInp(e) {
+    this.searchTimer(this.getDeparts, e);
+  }
+
+  // 获取科室
+  alldepart: any = []; //科室
+  getDeparts(dept?) {
+    let data = {
+      department: {
+        cascadeHosId: this.hosId,
+        dept: dept,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.deptInspectionRateStatisticsService
+      .getDeparts(data)
+      .subscribe((data) => {
+        this.alldepart = data.list;
+        this.isLoading = false;
+      });
+  }
+
+  // 获取楼栋
+  buildingList: any = []; //楼栋
+  getBuildingList() {
+    let data = {
+      building: {
+        cascadeHosId: this.hosId,
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.isLoading = true;
+    this.deptInspectionRateStatisticsService
+      .getBuildingList(data)
+      .subscribe((data) => {
+        this.buildingList = data.list;
+        this.isLoading = false;
+      });
   }
 
   // 搜索
@@ -50,12 +117,15 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
   // 重置
   reset() {
     this.searchDto = {
-      dateRange: [previousMonday(new Date()), previousSunday(new Date())],
+      dateRange: [startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 })],
+      department: [],
+      buildingList: null,
     }
     this.search();
   }
   // 表格数据
   loading1 = false;
+  statisticsObj = {};
   getList(isResetPageIndex = false) {
     isResetPageIndex && (this.pageIndex = 1);
     let postData:any = {
@@ -64,6 +134,9 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
       hosId: this.hosId,
       startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
+      buildingId: this.searchDto.building|| undefined,
     };
     this.loading1 = true;
     this.deptInspectionRateStatisticsService
@@ -73,6 +146,7 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
         result.list = result.list || [];
         this.listOfData = result.list;
         this.listLength = result.totalNum;
+        this.statisticsObj = result.totalAnalysis || {};
       });
   }
 
@@ -90,10 +164,62 @@ export class DeptInspectionRateStatisticsComponent implements OnInit {
     this.businessDataModalShow = JSON.parse(e).show;
   }
 
+  // 导出
+  loading2 = false;
+  export() {
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      hosId: this.hosId,
+      startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      canceled: this.checkOptionsOne[0].checked ? true : undefined,
+      deptIds: this.searchDto.department.length ? this.searchDto.department.toString() : undefined,
+      buildingId: this.searchDto.building|| undefined,
+    };
+    this.loading2 = true;
+    this.deptInspectionRateStatisticsService.exportReport(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, "");
+      }
+    );
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+  }
+
   personDetail(dataInfo){
     let startDate = dataInfo.searchDto.dateRange[0] ? format(startOfDay(dataInfo.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : 'null';
     let endDate = dataInfo.searchDto.dateRange[1] ? format(endOfDay(dataInfo.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : 'null';
-    let deptId = dataInfo.data.deptId || 'null';
+    let deptId = dataInfo.data.id || 'null';
     this.router.navigateByUrl(
       `/main/deptInspectionRateStatistics/workerStatisticsDetail/null/${startDate}/${endDate}/null/deptInspectionRateStatistics/${deptId}`
     );

src/app/views/dept-inspection-rate-statistics/dept-inspection-rate-statistics.service.ts

@@ -18,6 +18,21 @@ export class DeptInspectionRateStatisticsService {
   getDictionary(type) {
     return this.mainService.getDictionary("list", type);
   }
+
+  // 科室
+  getDeparts(postData) {
+    return this.mainService.getFetchDataList("data", "department", postData);
+  }
+
+  // 楼栋
+  getBuildingList(postData) {
+    return this.mainService.getFetchDataList("simple/data", "building", postData);
+  }
+
+  // 导出
+  exportReport(postData) {
+    return this.mainService.exportReport("deptInspectRate", postData);
+  }
 }
 
 

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

@@ -208,6 +208,11 @@ const routes: Routes = [
         path: "deptInspectionRateStatistics",
         loadChildren: () => import("../dept-inspection-rate-statistics/dept-inspection-rate-statistics.module").then((m) => m.DeptInspectionRateStatisticsModule),
       },
+      // 统计分析-楼栋检查率统计
+      {
+        path: "buildingInspectionRateStatistics",
+        loadChildren: () => import("../building-inspection-rate-statistics/building-inspection-rate-statistics.module").then((m) => m.BuildingInspectionRateStatisticsModule),
+      },
       // 轮巡计划列表
       {
         path: "roundRobin",