Merge branch 'lmm' into develop

package-lock.json

@@ -2608,9 +2608,9 @@
       }
     },
     "core-js": {
-      "version": "3.15.2",
-      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.15.2.tgz?cache=0&sync_timestamp=1624966056491&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-js%2Fdownload%2Fcore-js-3.15.2.tgz",
-      "integrity": "sha1-dAZg0v9V7zTOZk1+JFURnFvdPWE="
+      "version": "3.16.0",
+      "resolved": "https://registry.nlark.com/core-js/download/core-js-3.16.0.tgz",
+      "integrity": "sha1-HUb7M3ILwfp/kNIEMfNqVUCFiYY="
     },
     "core-util-is": {
       "version": "1.0.2",

package.json

@@ -24,7 +24,7 @@
     "@angular/router": "~8.1.1",
     "@types/crypto-js": "^3.1.47",
     "@types/overlayscrollbars": "^1.12.1",
-    "core-js": "^3.15.2",
+    "core-js": "^3.16.0",
     "crypto-js": "^3.3.0",
     "datatables.net": "^1.10.25",
     "date-fns": "^2.23.0",

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

@@ -31,7 +31,7 @@
         </div>
         <div class="searchItem">
           <span>&nbsp;&nbsp;</span>
-          <nz-select style="width: 135px;" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+          <nz-select style="width: 135px;" [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>

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

@@ -9,8 +9,8 @@
           <br />
         </div>
         <div class="list-template__searchItem ml8">
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
-            nzPlaceHolder="请选择时间" [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+          <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>
@@ -22,8 +22,8 @@
       </div>
     </div>
     <div class="list-template__bottom">
-      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle"
-        [nzShowPagination]="false" [nzLoading]="loading1">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>

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

@@ -359,7 +359,8 @@
             }
           }
           .modalBody_left_box {
-            height: calc(100vh - 279px);
+            min-height: calc(100vh - 279px);
+            height: 100%;
             box-sizing: border-box;
             padding: 8px;
             display: flex;

src/app/views/inspect-active-detail/inspect-active-detail-routing.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes, RouterModule } from "@angular/router";
-import { InspectActiveDetailComponent } from "./inspect-active-detail.component";
-import { OrderDetailComponent } from "src/app/share/order-detail/order-detail.component";
+import { InspectActiveDetailComponent } from './inspect-active-detail.component';
 
 const routes: Routes = [
   {
@@ -9,9 +8,11 @@ const routes: Routes = [
     component: InspectActiveDetailComponent,
     children: [
       {
-        // 查看详情
-        path: "orderDetail/:id/:type",
-        component: OrderDetailComponent,
+        path: "inspectActiveOrderList/:deptId/:startTime/:endTime/:workerId", //id是deptId，startTime是开始时间,endTime是结束时间,workerId是支助人员ID
+        loadChildren: () =>
+          import(
+            "../inspect-active-order-list/inspect-active-order-list.module"
+          ).then((m) => m.InspectActiveOrderListModule),
       },
     ],
   },

src/app/views/inspect-active-detail/inspect-active-detail.component.html

@@ -1,6 +1,6 @@
 <div class="detail">
   <div class="title">
-    工单详情
+    人员预约检查情况
     <i class="icon_transport transport-guanbi" (click)="close()"></i>
   </div>
   <div class="box">
@@ -9,28 +9,26 @@
       <thead>
         <tr class="thead">
           <th nzWidth="5%">序号</th>
-          <th nzWidth="10%">工单单号</th>
-          <th nzWidth="15%">申请科室</th>
-          <th nzWidth="10%">工单类型</th>
-          <th nzWidth="15%">任务类型</th>
-          <th nzWidth="10%">发起时间</th>
-          <th nzWidth="10%">执行时长</th>
-          <th nzWidth="5%">积分</th>
-          <th nzWidth="10%">是否特殊关闭</th>
+          <th nzWidth="15%">时间</th>
+          <th nzWidth="10%">支助人员名称</th>
+          <th nzWidth="15%">可预约检查总数</th>
+          <th nzWidth="15%">系统自动建单数</th>
+          <th nzWidth="10%">主动建单数</th>
+          <th nzWidth="10%">科室派单数</th>
+          <th nzWidth="10%">未建单</th>
           <th nzWidth="10%">操作</th>
         </tr>
       </thead>
       <tbody>
         <tr *ngFor="let data of listOfData;let index=index;">
           <td>{{index+(pageIndex-1)*10+1}}</td>
-          <td>{{ data.gdcode }}</td>
-          <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
-          <td>{{ data.taskType.associationType.name }}</td>
-          <td>{{ data.taskType.taskName }}</td>
-          <td>{{data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
-          <td>{{ data.showTimeNum }}</td>
-          <td>{{data.grade?data.grade.gradeTotal:'-'}}</td>
-          <td>{{data.specialCloseReason?'是':'否'}}</td>
+          <td>{{data.datetime|date:'yyyy-MM-dd hh:mm'}}</td>
+          <td>{{data.userName}}</td>
+          <td>{{data.count5}}</td>
+          <td>{{data.count1}}</td>
+          <td>{{data.count2}}</td>
+          <td>{{data.count3}}</td>
+          <td>{{data.count4}}</td>
           <td>
             <div class="coop">
               <span (click)="integralDetail(data)">查看</span>
@@ -41,8 +39,8 @@
     </nz-table>
     <div class="pagination">
       <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
-        (nzPageIndexChange)="getOrdersByPerson(hosId,currentPersonId)"
-        (nzPageSizeChange)="getOrdersByPerson(hosId,currentPersonId)">
+        (nzPageIndexChange)="getListByDept(hosId,currentDeptId)"
+        (nzPageSizeChange)="getListByDept(hosId,currentDeptId)">
       </nz-pagination>
     </div>
   </div>

src/app/views/inspect-active-detail/inspect-active-detail.component.ts

@@ -10,13 +10,12 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./inspect-active-detail.component.less"],
 })
 export class InspectActiveDetailComponent implements OnInit {
-  loading1 = false; //获取选中支助人员的工单列表loading
+  loading1 = false; //获取选中支助人员列表loading
   hosId; //当前院区id
-  currentPersonId; //当前支助人员id
+  currentDeptId; //当前支助人员id
   startTime; //当前开始时间
   endTime; //当前结束时间
-  groupId; //当前组ID
-  listOfData = []; //获取选中支助人员的工单列表
+  listOfData = []; //获取选中支助人员列表
   pageIndex: number = 1; //页码
   listLength: number = 0; //总数据条目数
   pageSize: number = 10; //每页条数
@@ -30,25 +29,24 @@ export class InspectActiveDetailComponent implements OnInit {
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
-    this.currentPersonId = this.route.snapshot.params.workerId;
+    this.currentDeptId = this.route.snapshot.params.deptId;
     this.startTime = this.route.snapshot.params.startTime;
     this.endTime = this.route.snapshot.params.endTime;
-    this.groupId = this.route.snapshot.params.groupId;
-    this.getOrdersByPerson(this.hosId, this.currentPersonId);
+    this.getListByDept(this.hosId, this.currentDeptId);
   }
-  //获取选中支助人员的工单列表
-  getOrdersByPerson(hosId: number, currentPersonId: number) {
+  //获取选中科室的列表
+  getListByDept(hosId: number, currentDeptId: number) {
     this.loading1 = true;
     let postData = {
+      type: "date",
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       startTime: this.startTime,
       endTime: this.endTime,
       hosId,
-      groupId: this.groupId == "null" ? "" : this.groupId,
-      worker: currentPersonId,
+      deptId: currentDeptId,
     };
-    this.mainService.postCustom("report", "userDetails", postData).subscribe(
+    this.mainService.postReportCount("deptInspect", postData).subscribe(
       (result) => {
         this.loading1 = false;
         if (result.status == 200) {
@@ -64,14 +62,14 @@ export class InspectActiveDetailComponent implements OnInit {
       }
     );
   }
-  //查看积分详情
+  //查看工单列表
   integralDetail(obj) {
     this.router.navigateByUrl(
-      `/main/workerStatistics/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/orderDetail/${obj.id}/3`
+      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${obj.userId}`
     );
   }
   //关闭
   close() {
-    this.router.navigateByUrl("/main/workerStatistics");
+    this.router.navigateByUrl(`/main/inspectActive`);
   }
 }

src/app/views/inspect-active-order-list/inspect-active-order-list-routing.module.ts

@@ -0,0 +1,24 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { InspectActiveOrderListComponent } from './inspect-active-order-list.component';
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: InspectActiveOrderListComponent,
+    children: [
+      {
+        // 查看详情
+        path: "orderDetail/:id/:type",
+        component: OrderDetailComponent,
+      },
+    ],
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class InspectActiveOrderListRoutingModule {}

src/app/views/inspect-active-order-list/inspect-active-order-list.component.html

@@ -0,0 +1,49 @@
+<div class="detail">
+  <div class="title">
+    工单详情
+    <i class="icon_transport transport-guanbi" (click)="close()"></i>
+  </div>
+  <div class="box">
+    <nz-table class="hospitalTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+      [nzLoading]="loading1" [nzScroll]="{y:'350px'}">
+      <thead>
+        <tr class="thead">
+          <th nzWidth="5%">序号</th>
+          <th nzWidth="15%">工单单号</th>
+          <th nzWidth="15%">发起时间</th>
+          <th nzWidth="15%">执行时长</th>
+          <th nzWidth="15%">积分</th>
+          <th nzWidth="15%">建单类型</th>
+          <th nzWidth="10%">是否特殊关闭</th>
+          <th nzWidth="10%">操作</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let data of listOfData;let index=index;">
+          <td>{{index+(pageIndex-1)*10+1}}</td>
+          <td>{{data.gdcode}}</td>
+          <td>{{data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
+          <td>{{data.showTimeNum}}</td>
+          <td>{{data.grade?data.grade.gradeTotal:''}}</td>
+          <td>{{data.sourceType}}</td>
+          <td>{{data.specialCloseReason?'是':'否'}}</td>
+          <td>
+            <div class="coop">
+              <span (click)="integralDetail(data)">查看</span>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </nz-table>
+    <div class="pagination">
+      <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+        (nzPageIndexChange)="getListByWorker(hosId,currentDeptId)"
+        (nzPageSizeChange)="getListByWorker(hosId,currentDeptId)">
+      </nz-pagination>
+    </div>
+  </div>
+  <div class="btns">
+    <button class=" btn cancel" nz-button nzType="default" (click)="close()">关闭</button>
+  </div>
+</div>
+<router-outlet></router-outlet>

src/app/views/inspect-active-order-list/inspect-active-order-list.component.less

@@ -0,0 +1,591 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  left: 0;
+  top: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.detail {
+  width: 1200px;
+  height: 580px;
+  border-radius: 5px;
+  background: #fff;
+  color: #333;
+  font-size: 14px;
+  padding: 12px 20px;
+  position: relative;
+  padding-bottom: 70px;
+
+  .title {
+    font-size: 18px;
+    text-align: center;
+    line-height: 24px;
+    margin: 0;
+    margin-bottom: 12px;
+    position: relative;
+
+    i {
+      position: absolute;
+      right: 0;
+      top: 0;
+      font-size: 20px;
+      color: #666;
+      cursor: pointer;
+      padding: 0 5px;
+    }
+  }
+
+  & > .box {
+    border: 1px solid #e5e9ed;
+    border-radius: 5px;
+    overflow: hidden;
+
+    .tab {
+      width: 100%;
+      height: 60px;
+      border-bottom: 1px solid #e5e9ed;
+
+      .item {
+        text-align: center;
+        line-height: 60px;
+        height: 100%;
+        border-right: 1px solid #e5e9ed;
+
+        &:nth-last-child(1) {
+          border: none;
+        }
+
+        &.checked {
+          background: #f9fafb;
+        }
+      }
+    }
+
+    .content {
+      width: 100%;
+      min-height: 453px;
+      max-height: 500px;
+
+      &.orders {
+        background: #f9fafb;
+      }
+
+      & > .top {
+        padding: 10px 32px;
+        border-bottom: 1px solid #e5e9ed;
+        overflow: hidden;
+        background: #fff;
+
+        .num {
+          font-size: 16px;
+          overflow: hidden;
+          margin-bottom: 6px;
+
+          .left {
+            float: left;
+            font-weight: 600;
+          }
+
+          .right {
+            float: right;
+          }
+        }
+
+        .info {
+          color: #666;
+
+          & > div {
+            margin: 4px 0;
+          }
+
+          .jiaji {
+            margin: 0;
+            margin-top: 8px;
+          }
+        }
+      }
+
+      & > .center {
+        padding: 27px 0 17px 0;
+        border-bottom: 1px solid #e5e9ed;
+        font-size: 12px;
+        background: #fff;
+
+        .box {
+          display: flex;
+          justify-content: center;
+
+          .steps {
+            &:nth-last-child(1) {
+              .line {
+                display: none !important;
+              }
+            }
+
+            .step {
+              .info {
+                width: 90px;
+                text-align: center;
+                display: inline-block;
+                vertical-align: top;
+
+                i {
+                  color: #e5e9ed;
+
+                  &.green {
+                    color: #bee1a7;
+                  }
+                }
+              }
+
+              p {
+                margin: 0;
+              }
+
+              .line {
+                display: inline-block;
+                width: 60px;
+                height: 2px;
+                background: #e5e9ed;
+              }
+            }
+          }
+        }
+      }
+
+      & > .bottom {
+        padding: 25px 32px;
+        background: #f9fafb;
+
+        .urgent {
+          input {
+            width: 600px;
+          }
+
+          .candelBtn {
+            margin-left: 20px;
+          }
+        }
+
+        .table {
+          width: 100%;
+          height: 100%;
+          min-height: 160px;
+          background: #fff;
+          border-radius: 5px;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+            }
+          }
+
+          .detailDrugTable {
+            .thead {
+              background-image: repeating-linear-gradient(
+                to right,
+                @bg-start,
+                @bg-end 50%
+              ) !important;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+
+        .info {
+          width: 100%;
+          height: 100%;
+          background: #fff;
+          border-radius: 5px;
+          border: 1px solid #e5e9ed;
+          padding: 24px 28px 14px 28px;
+          margin-bottom: 8px;
+
+          .top {
+            .left {
+              border-right: 1px dashed #e5e9ed;
+
+              p {
+                padding: 0 70px 0 102px;
+                overflow: hidden;
+
+                & > span:nth-child(1) {
+                  float: left;
+                }
+
+                & > span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                  max-width: 175px;
+                }
+              }
+            }
+
+            .right {
+              p {
+                padding: 0 102px 0 70px;
+                overflow: hidden;
+
+                span:nth-child(1) {
+                  float: left;
+                }
+
+                span:nth-child(2) {
+                  float: right;
+                  color: #666;
+                  text-align: right;
+                }
+              }
+            }
+          }
+
+          .wait {
+            text-align: center;
+            margin-top: 7px;
+
+            i {
+              font-size: 24px;
+              color: #62c26d;
+            }
+
+            span {
+              color: #62c26d;
+            }
+          }
+        }
+      }
+
+      &.pingjia {
+        .msg {
+          width: 100%;
+          height: 50px;
+          line-height: 50px;
+          padding-left: 32px;
+          border-bottom: 1px solid #e5e9ed;
+
+          div {
+            display: inline-block;
+            margin-right: 100px;
+          }
+        }
+
+        .con {
+          padding: 16px 32px;
+          min-height: 360px;
+        }
+      }
+
+      & > .form {
+        .ant-form-item {
+          padding: 0 32px 13px 32px;
+          margin-bottom: 0;
+          border-bottom: 1px solid #e5e9ed;
+
+          &:nth-last-child(1) {
+            border: none;
+          }
+        }
+
+        .ant-form-item-label {
+          line-height: 34px;
+          text-align: left;
+        }
+      }
+
+      & > .mediation {
+        padding: 16px 32px;
+
+        .item {
+          border-bottom: 1px solid #e5e9ed;
+          padding-top: 10px;
+
+          .label {
+            line-height: 28px;
+            margin-top: 10px;
+          }
+
+          .info {
+            line-height: 28px;
+            color: #999;
+            padding-bottom: 20px;
+          }
+        }
+      }
+
+      &.jifen {
+        padding: 32px;
+
+        & > .table {
+          width: 100%;
+          height: 100%;
+          min-height: 160px;
+          padding: 6px;
+          background: #fff;
+          border: 1px solid #e5e9ed;
+          border-radius: 5px;
+          overflow: hidden;
+
+          .thead {
+            background-image: repeating-linear-gradient(
+              to right,
+              @bg-start,
+              @bg-end 100%
+            ) !important;
+
+            th {
+              color: #fff !important;
+              text-align: center;
+              font-size: 12px;
+              border: none;
+              background: transparent;
+            }
+          }
+
+          .ant-table-tbody {
+            tr {
+              text-align: center;
+              font-size: 12px;
+              border: none;
+
+              td {
+                border: none;
+              }
+            }
+
+            tr:nth-child(2n) {
+              background: #f9fafb;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .btns {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 60%;
+    margin: 48px auto 0;
+
+    .btn {
+      margin: 9px;
+      margin-bottom: 0;
+    }
+  }
+
+  .ant-table {
+    border: none !important;
+  }
+}
+
+// 撤回工单
+.recallOrder {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    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: 310px;
+      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: #ff3b53;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+
+      .conditions {
+        padding: 16px 20px;
+
+        div {
+          text-align: left;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+}
+
+.txtC {
+  text-align: center;
+}
+.ji {
+  position: absolute;
+  right: 0px;
+  top: -3px;
+  width: 30px;
+}
+.hospitalTable {
+  padding: 21px 12px;
+  padding-bottom: 0;
+
+  .thead {
+    background-image: linear-gradient(to right, @bg-start, @bg-end);
+
+    th {
+      background: transparent;
+      color: #fff;
+      text-align: center;
+      font-size: 14px;
+    }
+  }
+
+  .ant-table-body {
+    border-bottom: 1px solid #e5e9ed;
+  }
+
+  .ant-table-tbody {
+    tr {
+      text-align: center;
+      font-size: 14px;
+      border: none;
+      color: #333;
+
+      td {
+        border: none;
+
+        .coop {
+          span {
+            display: inline-block;
+            width: 60px;
+            cursor: pointer;
+
+            &::after {
+              content: "|";
+              float: right;
+            }
+
+            &:hover {
+              color: @primary-color;
+            }
+
+            &:active {
+              color: @primary-color;
+            }
+
+            &:nth-last-child(1) {
+              &::after {
+                content: "";
+              }
+            }
+          }
+        }
+      }
+    }
+
+    tr:nth-child(2n-1) {
+      background: #f9fafb;
+    }
+  }
+}
+.pagination {
+  margin-top: 14px;
+  position: absolute;
+  right: 5px;
+}
+.filters {
+  position: absolute;
+  left: 0;
+  top: 0;
+}

src/app/views/inspect-active-order-list/inspect-active-order-list.component.ts

@@ -0,0 +1,100 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { NzMessageService } from "ng-zorro-antd";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
+
+@Component({
+  selector: "app-inspect-active-order-list",
+  templateUrl: "./inspect-active-order-list.component.html",
+  styleUrls: ["./inspect-active-order-list.component.less"],
+})
+export class InspectActiveOrderListComponent implements OnInit {
+  loading1 = false; //获取选中支助人员的工单列表loading
+  hosId; //当前院区id
+  currentDeptId; //当前科室id
+  workerId; //当前支助人员id
+  startTime; //当前开始时间
+  endTime; //当前结束时间
+  listOfData = []; //获取选中支助人员的工单列表
+  pageIndex: number = 1; //页码
+  listLength: number = 0; //总数据条目数
+  pageSize: number = 10; //每页条数
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) {}
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDeptId = this.route.snapshot.params.deptId;
+    this.startTime = this.route.snapshot.params.startTime;
+    this.endTime = this.route.snapshot.params.endTime;
+    this.workerId = this.route.snapshot.params.workerId;
+    this.getListByWorker(this.hosId, this.currentDeptId);
+  }
+  //获取选中工单列表
+  getListByWorker(hosId: number, currentDeptId: number) {
+    this.loading1 = true;
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      workOrder: {
+        abnormityType: 0,
+        timeOut: 0,
+        startTime1: this.startTime,
+        endTime1: this.endTime,
+        hosId,
+        createDept: currentDeptId,
+        worker: {
+          id: this.workerId,
+        },
+      },
+    };
+    this.mainService.getFetchDataList("data", "workOrder", postData).subscribe(
+      (result) => {
+        this.loading1 = false;
+        if (result.status == 200) {
+          this.listOfData = result.list;
+          this.listOfData.forEach((v) => {
+            switch (v.sourceId) {
+              case 2:
+                v.sourceType = "科室派单";
+                break;
+              case 3:
+                v.sourceType = "系统自动建单";
+                break;
+              case 4:
+                v.sourceType = "主动建单";
+                break;
+              default:
+                v.sourceType = "";
+            }
+          });
+          this.listLength = result.totalNum;
+        } else {
+          this.message.error("获取数据失败");
+        }
+      },
+      (err) => {
+        this.loading1 = false;
+        this.message.error("获取数据失败");
+      }
+    );
+  }
+  //查看积分详情
+  integralDetail(obj) {
+    this.router.navigateByUrl(
+      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${this.workerId}/orderDetail/${obj.id}/3`
+    );
+  }
+  //关闭
+  close() {
+    this.router.navigateByUrl(
+      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}`
+    );
+  }
+}

src/app/views/inspect-active-order-list/inspect-active-order-list.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { InspectActiveOrderListRoutingModule } from './inspect-active-order-list-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { InspectActiveOrderListComponent } from './inspect-active-order-list.component';
+
+
+@NgModule({
+  declarations: [InspectActiveOrderListComponent],
+  imports: [
+    CommonModule,
+    InspectActiveOrderListRoutingModule,
+    ShareModule
+  ]
+})
+export class InspectActiveOrderListModule { }

src/app/views/inspect-active/inspect-active-routing.module.ts

@@ -8,7 +8,7 @@ const routes: Routes = [
     component: InspectActiveComponent,
     children: [
       {
-        path: "inspectActiveDetail/:workerId/:startTime/:endTime/:groupId", //id是workid，startTime是开始时间,endTime是结束时间，groupId是组ID
+        path: "inspectActiveDetail/:deptId/:startTime/:endTime", //id是deptId，startTime是开始时间,endTime是结束时间
         loadChildren: () =>
           import("../inspect-active-detail/inspect-active-detail.module").then(
             (m) => m.InspectActiveDetailModule

src/app/views/inspect-active/inspect-active.component.html

@@ -15,13 +15,13 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label">支助人员</span>：
+          <span class="label">临床科室</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeUser($event)" nzPlaceHolder="请选择支助人员" [(ngModel)]="worker"
-            (ngModelChange)="searchWorker($event)">
+            (nzOnSearch)="changeDept($event)" nzPlaceHolder="请选择临床科室" [(ngModel)]="dept"
+            (ngModelChange)="searchDept($event)">
             <nz-option *ngIf="!isLoading" nzLabel="全部" [nzValue]="0"></nz-option>
-            <ng-container *ngFor="let option of allWorker">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            <ng-container *ngFor="let option of depts">
+              <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> 搜索中...
@@ -41,33 +41,27 @@
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="10%">支助人员名称</th>
-            <th nzWidth="10%">预约检查总数</th>
-            <th nzWidth="12%">系统自动建单数</th>
-            <th nzWidth="8%">主动建单数</th>
-            <th nzWidth="8%">科室派单数</th>
-            <th nzWidth="7%">未建单</th>
-            <th nzWidth="10%">特殊关闭数量</th>
-            <th nzWidth="10%">主动服务占比</th>
-            <th nzWidth="10%">科室服务占比</th>
+            <th nzWidth="15%">临床科室</th>
+            <th nzWidth="15%">可预约检查总数</th>
+            <th nzWidth="15%">系统自动建单数</th>
+            <th nzWidth="15%">主动建单数</th>
+            <th nzWidth="15%">科室派单数</th>
+            <th nzWidth="10%">未建单</th>
             <th nzWidth="10%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1)*10+1}}</td>
-            <td>{{ data.name }}</td>
-            <td>{{ data.total||0}}</td>
-            <td>{{data.order||0}}</td>
-            <td>{{data.num||0}}</td>
-            <td>{{data.specialCloseNum}}</td>
-            <td>{{data.avePer+'%'}}</td>
-            <td>{{data.arriveTime}}</td>
-            <td>{{data.arriveTime}}</td>
-            <td>{{data.completeTime}}</td>
+            <td>{{data.deptName}}</td>
+            <td>{{data.count5}}</td>
+            <td>{{data.count1}}</td>
+            <td>{{data.count2}}</td>
+            <td>{{data.count3}}</td>
+            <td>{{data.count4}}</td>
             <td>
               <div class="coop">
-                <span *ngIf="coopBtns.look" (click)="personDetail(data.workerId)">查看</span>
+                <span *ngIf="coopBtns.look" (click)="personDetail(data.deptId)">查看</span>
               </div>
             </td>
           </tr>

src/app/views/inspect-active/inspect-active.component.ts

@@ -104,15 +104,17 @@ export class InspectActiveComponent implements OnInit {
   // 导出
   loading2 = false;
   export() {
-    let that = this;
-    let postData = {
-      hosId: that.hospital,
+    let postData: any = {
+      type: "total",
+      hosId: this.hospital,
       startTime: this.startDate + " " + "00:00:00",
       endTime: this.endDate + " " + "23:59:59",
-      groupId: that.worker || "",
     };
+    if (this.dept !== 0) {
+      postData.deptId = this.dept;
+    }
     this.loading2 = true;
-    that.mainService.exportReport("user", postData).subscribe(
+    this.mainService.exportReport("deptInspect", postData).subscribe(
       (data) => {
         this.loading2 = false;
         this.showPromptModal("导出", true, "");
@@ -124,7 +126,7 @@ export class InspectActiveComponent implements OnInit {
         var a = document.createElement("a");
         a.href = fileURL;
         a.target = "_blank";
-        a.download = "支助人员统计.xls";
+        a.download = "人员检查主动服务统计.xls";
         document.body.appendChild(a);
         a.click();
       },
@@ -137,7 +139,7 @@ export class InspectActiveComponent implements OnInit {
   // 重置
   reset() {
     this.changeDateRange("1");
-    this.worker = 0;
+    this.dept = 0;
     this.search();
   }
   // 表格数据
@@ -146,17 +148,20 @@ export class InspectActiveComponent implements OnInit {
     if (num !== undefined) {
       this.pageIndex = num;
     }
-    let postData = {
+    let postData: any = {
+      type: "total",
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       startTime: this.searchData.dateRange.start,
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
-      groupId: this.worker || "",
     };
+    if (this.dept !== 0) {
+      postData.deptId = this.dept;
+    }
     this.loading1 = true;
     this.mainService
-      .postCustom("report", "user", postData)
+      .postReportCount("deptInspect", postData)
       .subscribe((result) => {
         this.loading1 = false;
         this.listOfData = result.list || [];
@@ -165,34 +170,34 @@ export class InspectActiveComponent implements OnInit {
   }
   // 获取院区/分组
   hospital: string; //选中院区
-  allWorker: any = []; //支助人员列表
+  depts: any = []; //支助人员列表
   getAllHos() {
     this.hospital = this.tool.getCurrentHospital().id + "";
     this.getAllWorker();
   }
-  // 用户输入搜索支助人员
-  changeUser(e = "") {
+  // 用户输入搜索科室
+  changeDept(e = "") {
     this.isLoading = true;
     this.searchTimerSubject.next(e);
   }
-  // 获取支助人员列表
-  worker: number = 0; //选中的支助人员
+  // 获取护理单元科室列表
+  dept: number = 0; //选中的科室
   isLoading = false;
   getAllWorker(e: any = "") {
     let postData = {
-      user: {
-        name: e || "",
+      department: {
+        dept: e || "",
         hospital: { id: this.hospital },
-        usertype: { id: 106 }, //支助人员
+        type: { id: "281" }, //护理单元
       },
       idx: 0,
       sum: 10,
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "user", postData)
+      .getFetchDataList("data", "department", postData)
       .subscribe((data) => {
-        this.allWorker = data.list;
+        this.depts = data.list;
         this.isLoading = false;
       });
   }
@@ -226,9 +231,9 @@ export class InspectActiveComponent implements OnInit {
       result[1].getDate();
     this.search();
   }
-  // 修改搜索条件支助人员
-  searchWorker(e) {
-    this.worker = e;
+  // 修改搜索条件科室
+  searchDept(e) {
+    this.dept = e;
     this.search();
   }
   // 日期选择 快速修改时间区间
@@ -297,12 +302,11 @@ export class InspectActiveComponent implements OnInit {
     }
   }
   //获取支助人员工单详情列表
-  personDetail(workerId) {
+  personDetail(deptId) {
     let startDate = this.startDate + " " + "00:00:00";
     let endDate = this.endDate + " " + "23:59:59";
-    let worker = this.worker || "null";
     this.router.navigateByUrl(
-      `/main/inspectActive/inspectActiveDetail/${workerId}/${startDate}/${endDate}/${worker}`
+      `/main/inspectActive/inspectActiveDetail/${deptId}/${startDate}/${endDate}`
     );
   }
 }

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

@@ -28,7 +28,7 @@
           </nz-year-picker>
         </div>
         <div class="list-template__searchItem ml8">
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+          <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>

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

@@ -9,7 +9,7 @@
           <br />
         </div>
         <div class="list-template__searchItem ml8">
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+          <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>

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

@@ -9,15 +9,16 @@
           <br />
         </div>
         <div class="list-template__searchItem ml8">
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
-            nzPlaceHolder="请选择时间" [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+          <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" [nzShowSearch]="false" nzAllowClear
-            nzPlaceHolder="请选择分组" [ngModel]="group" (ngModelChange)="searchGroup($event)">
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择分组"
+            [ngModel]="group" (ngModelChange)="searchGroup($event)">
+            <nz-option nzLabel="全部" [nzValue]="0"></nz-option>
             <nz-option nzLabel="{{data.groupName}}" nzValue="{{data.id}}" *ngFor="let data of groupList"></nz-option>
           </nz-select>
         </div>

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

@@ -132,7 +132,7 @@ export class WorkerStatisticsComponent implements OnInit {
   // 重置
   reset() {
     this.changeDateRange("1");
-    this.group = null;
+    this.group = 0;
     this.search();
   }
   // 表格数据
@@ -160,7 +160,7 @@ export class WorkerStatisticsComponent implements OnInit {
   }
   // 获取院区/分组
   hospital: string; //选中院区
-  group: string; //选中组
+  group: number = 0; //选中组
   groupList: any = []; //分组
   getAllHos() {
     this.hospital = this.tool.getCurrentHospital().id + "";