支助人员改为配送人员

src/app/services/main.service.ts

@@ -107,7 +107,7 @@ export class MainService {
     );
   }
 
-  // 调度台 获取支助人员信息
+  // 调度台 获取配送人员信息
   getSerInfo(type, data): any {
     return this.http.post(host.host + "/ser/" + type, data, {
       headers: this.headers,

src/app/share/allocation-worker/allocation-worker.component.html

@@ -1,5 +1,5 @@
 <div class="detail">
-  <div class="title">分配支助人员<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
+  <div class="title">分配配送人员<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
   <div class="content">
     <div nz-row class="select">
       <div nz-col nzSpan="6">

src/app/share/allocation-worker/allocation-worker.component.ts

@@ -19,7 +19,7 @@ export class AllocationWorkerComponent implements OnInit {
     ).user.scope.groupIds;
     this.getWorkerList();
   }
-  // 支助人员数据
+  // 配送人员数据
   workerList = [];
 
   id; //工单id
@@ -39,7 +39,7 @@ export class AllocationWorkerComponent implements OnInit {
 
   btnLoading: boolean = false; //提交按钮loading状态
 
-  // 支助人员数据
+  // 配送人员数据
   groupList: Array<{ groupName: string; id: string }> = []; //分组下拉框
   snum = 0;
   loading1 = false;
@@ -100,8 +100,8 @@ export class AllocationWorkerComponent implements OnInit {
     }
   }
 
-  // 选择分配支助人员
-  worderId = 0; //支助人员id
+  // 选择分配配送人员
+  worderId = 0; //配送人员id
   checkAllotWorker(id, flag?): void {
     this.mapOfCheckedId = {
       [id]: flag ? !this.mapOfCheckedId[id] : this.mapOfCheckedId[id],

src/app/share/appraise-detail/appraise-detail.component.html

@@ -19,7 +19,7 @@
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
           <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
-          <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="6">
@@ -68,7 +68,7 @@
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
           <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
-          <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="6">
@@ -159,7 +159,7 @@
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
           <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
-          <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="6">
@@ -262,7 +262,7 @@
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
           <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
-          <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
+          <div nz-col nzSpan="4">配送人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="6">

src/app/share/detail-blood/detail-blood.component.html

@@ -17,7 +17,7 @@
           </div>
           <div nz-col nzSpan="8">起点科室：{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
           <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8">应收数量：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:'无'}}</div>
           <div nz-col nzSpan="8">实收数量：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:'无'}}</div>
           <div nz-col nzSpan="8">送达数量：{{orderInfo.deliveryNum?orderInfo.deliveryNum:'无'}}</div>

src/app/share/detail-drug/detail-drug.component.html

@@ -21,7 +21,7 @@
           <div nz-col nzSpan="8">
             目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
           </div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.drugs">药包编码：{{orderInfo.drugs.packid}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.staticDistri">药包编码：{{orderInfo.staticDistri.packid}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">

src/app/share/detail-others/detail-others.component.html

@@ -19,7 +19,7 @@
             起点科室：{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'-'}}
           </div>
           <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsers">执行人员：{{orderInfo.inspectUsers}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsersNum">执行人数：{{orderInfo.inspectUsersNum}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}</div>

src/app/share/detail-patients/detail-patients.component.html

@@ -27,7 +27,7 @@
           </div>
           <div nz-col nzSpan="8">陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
           <div nz-col nzSpan="8">预约时间：{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
             是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.inspectScore">

src/app/share/detail-sample/detail-sample.component.html

@@ -17,7 +17,7 @@
           </div>
           <div nz-col nzSpan="8">起点科室：{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
           <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
-          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
           <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
           <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}

src/app/share/order-detail/order-detail.component.html

@@ -59,7 +59,7 @@
               >
             </div>
             <div nz-col nzSpan="6">
-              支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+              配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -182,7 +182,7 @@
               >
             </div>
             <div nz-col nzSpan="6">
-              支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+              配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -371,7 +371,7 @@
               >
             </div>
             <div nz-col nzSpan="4">
-              支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+              配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -543,7 +543,7 @@
               >
             </div>
             <div nz-col nzSpan="6">
-              支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+              配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -738,7 +738,7 @@
               >
             </div>
             <div nz-col nzSpan="6">
-              支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+              配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -983,7 +983,7 @@
             >
           </div>
           <div nz-col nzSpan="6">
-            支助人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
+            配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
           </div>
         </div>
         <div class="info" nz-row>

src/app/views/appraise-management/appraise-management.component.html

@@ -12,9 +12,9 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label label--big">执行支助人员</span>：
+          <span class="label label--big">执行配送人员</span>：
           <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行支助人员" [(ngModel)]="worker">
+            (nzOnSearch)="changeUser($event)" nzAllowClear nzPlaceHolder="请选择执行配送人员" [(ngModel)]="worker">
             <ng-container *ngFor="let option of allWorker">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
@@ -60,7 +60,7 @@
             <th nzWidth="10%">发起时间</th>
             <th nzWidth="10%">评价描述</th>
             <th nzWidth="7%">评价等级</th>
-            <th nzWidth="10%">执行支助人员</th>
+            <th nzWidth="10%">执行配送人员</th>
             <th nzWidth="7%">处理状态</th>
             <th nzWidth="7%">调解人</th>
             <th nzWidth="17%">操作</th>

src/app/views/appraise-management/appraise-management.component.ts

@@ -75,9 +75,9 @@ export class AppraiseManagementComponent implements OnInit {
     this.getAllMediUser();
   }
 
-  // 获取支助人员
-  worker: number; //支助人员
-  allWorker: any = []; //所有支助人员
+  // 获取配送人员
+  worker: number; //配送人员
+  allWorker: any = []; //所有配送人员
   snum1 = 0;
   getAllWorker(e?, those?) {
     let that = those || this;
@@ -85,7 +85,7 @@ export class AppraiseManagementComponent implements OnInit {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 106 }, //支助人员
+        usertype: { id: 106 }, //配送人员
       },
       idx: 0,
       sum: 20,
@@ -103,7 +103,7 @@ export class AppraiseManagementComponent implements OnInit {
   }
 
   // 指派人员
-  allDesUser: any = []; //所有支助人员
+  allDesUser: any = []; //所有配送人员
   getAllDesUser(id) {
     this.isLoading = true;
     this.mainService

src/app/views/blood-search/blood-search.component.ts

@@ -18,7 +18,7 @@ export class BloodSearchComponent implements OnInit {
     bloodCode: "", //血袋号
     dateRange: [],
   };
-  deptList = []; // 院区下的支助人员列表(搜索框)
+  deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码

src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -289,7 +289,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
   // 选择用户类型
   usertypeChange() {
     if (this.validateForm.value.usertype == 106) {
-      //支助人员
+      //配送人员
       this.wxRequired = true;
       this.validateForm.get("weixin")!.setValidators(Validators.required);
       this.validateForm.get("weixin")!.markAsDirty();

src/app/views/drug-search/drug-search.component.ts

@@ -19,7 +19,7 @@ export class DrugSearchComponent implements OnInit {
     launch: null, //发药科室
     target: null, //发药科室
   };
-  deptList = []; // 院区下的支助人员列表(搜索框)
+  deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码

src/app/views/fuwutai/fuwutai.component.html

@@ -35,9 +35,9 @@
       </div>
       <div class="timer">{{ workerRefreshTime }}s</div>
     </div>
-    <!-- 支助人员信息内容 -->
+    <!-- 配送人员信息内容 -->
     <div class="message_cot">
-      <!-- 支助人员信息 -->
+      <!-- 配送人员信息 -->
       <div class="cot_hid" [style.height]="cotHeight + 'px'">
         <div id="cotAll" class="cot_all" *ngIf="patientCareCol != 6">
           <div
@@ -1629,7 +1629,7 @@
             </div>
           </div>
           <div nz-row>
-            <div nz-col nzSpan="6">支助人员刷新：</div>
+            <div nz-col nzSpan="6">配送人员刷新：</div>
             <div nz-col nzSpan="15">
               <div nz-row>
                 <div nz-col nzSpan="">
@@ -1639,7 +1639,7 @@
                       [(ngModel)]="workerInfoTime"
                       [nzMin]="10"
                       [nzStep]="1"
-                      placeholder="请输入支助人员刷新时间"
+                      placeholder="请输入配送人员刷新时间"
                     ></nz-input-number>
                   </nz-input-group>
                 </div>

src/app/views/fuwutai/fuwutai.component.less

@@ -137,7 +137,7 @@
     }
   }
 
-  /* 支助人员信息内容 */
+  /* 配送人员信息内容 */
   .message_cot {
     width: 100%;
     min-height: 140px;

src/app/views/fuwutai/fuwutai.component.ts

@@ -616,7 +616,7 @@ export class FuwutaiComponent implements OnInit {
   patientCareCol: number = 6; //顶部工单列数(4列-8人，7列-14人，6列-单排 ）
   hurseInfoHiding = '1'; //护工信息隐藏
   txtLabelCol: number = 1; //工单信息列数
-  workerInfoTime: number = 30; //支助人员刷新时间
+  workerInfoTime: number = 30; //配送人员刷新时间
   orderInfoTime: number = 30; //工单刷新时间
   audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
   cotHeight: number; //工单初始化高度
@@ -626,7 +626,7 @@ export class FuwutaiComponent implements OnInit {
   unassignedListClone: any = null; //未分派数据clone
   arriveListClone: any = null; //待到达数据clone
   executionListClone: any = null; //执行中数据clone
-  workerRefreshTime: number = 30; //支助人员刷新倒计时
+  workerRefreshTime: number = 30; //配送人员刷新倒计时
   orderRefreshTime: number = 30; //工单刷新倒计时
   recallOrderShow: boolean = false; //撤回模态框
   delOrderShow: boolean = false; //删除模态框

src/app/views/home/home.component.html

@@ -167,7 +167,7 @@
                       <tr class="thead">
                         <th nzWidth="20%">工单号</th>
                         <th nzWidth="20%">所属小组</th>
-                        <th nzWidth="22%">执行支助人员</th>
+                        <th nzWidth="22%">执行配送人员</th>
                         <th nzWidth="18%">操作</th>
                       </tr>
                     </thead>
@@ -210,7 +210,7 @@
                   </div>
                   <div nz-row class="title">
                     <div nz-col nzSpan="12">起点科室：{{data.startDept.dept}}</div>
-                    <div nz-col nzSpan="12">执行支助人员：{{data.workOrderObj.worker.name}}</div>
+                    <div nz-col nzSpan="12">执行配送人员：{{data.workOrderObj.worker.name}}</div>
                   </div>
                   <div [title]="data.evaluationDetails.remark"
                     [ngClass]="{'over':true,'noOver':(isOpen&&coopOpenId==data.id)}">

src/app/views/home/home.component.ts

@@ -392,7 +392,7 @@ export class HomeComponent implements OnInit {
   }
 
   // 指派人员
-  allDesUser: any = []; //所有支助人员
+  allDesUser: any = []; //所有配送人员
   getAllDesUser(id) {
     let that = this;
     that.mainService

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

@@ -144,8 +144,8 @@
                     nz-tooltip
                     [nzTooltipTitle]="
                       item.focusPatient === 0
-                        ? '白色心为非特殊关注，需手动建单后支助人员上门送检'
-                        : '红色心为特殊关注，患者所有检查会自动建单，支助人员主动上门送检'
+                        ? '白色心为非特殊关注，需手动建单后配送人员上门送检'
+                        : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'
                     "
                   ></span>
                   <span nz-col nzSpan="2"></span>
@@ -274,8 +274,8 @@
                     nz-tooltip
                     [nzTooltipTitle]="
                       item.focusPatient === 0
-                        ? '白色心为非特殊关注，需手动建单后支助人员上门送检'
-                        : '红色心为特殊关注，患者所有检查会自动建单，支助人员主动上门送检'
+                        ? '白色心为非特殊关注，需手动建单后配送人员上门送检'
+                        : '红色心为特殊关注，患者所有检查会自动建单，配送人员主动上门送检'
                     "
                   ></span>
                   <span nz-col nzSpan="2"></span>
@@ -3234,7 +3234,7 @@
   (hideDelModalEvent)="closeRecallOrderModal()"
   [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmRec()"
-  content="您确认要撤销工单吗？撤销工单我们会通知服务台、支助人员不再执行此工单，请谨慎操作，如确认撤销请点击确认。"
+  content="您确认要撤销工单吗？撤销工单我们会通知服务台、配送人员不再执行此工单，请谨慎操作，如确认撤销请点击确认。"
 ></app-dialog-delete>
 <!-- 立即执行定时预约工单 -->
 <app-dialog-delete

src/app/views/info-search/info-search.component.html

@@ -111,7 +111,7 @@
                     <th nzWidth="130px">序号</th>
                     <th nzWidth="130px">ID</th>
                     <th nzWidth="130px">院区</th>
-                    <th nzWidth="130px">支助人员</th>
+                    <th nzWidth="130px">配送人员</th>
                     <th nzWidth="130px">创建人</th>
                     <th nzWidth="130px">工单状态</th>
                     <th nzWidth="130px">患者姓名</th>
@@ -126,7 +126,7 @@
                       <!-- 13 -->
                     </th>
                     <th nzWidth="130px">院区ID</th>
-                    <th nzWidth="130px">支助人员ID</th>
+                    <th nzWidth="130px">配送人员ID</th>
                     <th nzWidth="130px">创建人ID</th>
                     <th nzWidth="130px">工单状态ID</th>
                     <th nzWidth="130px">患者ID</th>

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

@@ -8,7 +8,7 @@ const routes: Routes = [
     component: InspectActiveDetailComponent,
     children: [
       {
-        path: "inspectActiveOrderList/:deptId/:startTime/:endTime/:date/:workerId", //date是选中的日期，id是deptId，startTime是开始时间,endTime是结束时间,workerId是支助人员ID
+        path: "inspectActiveOrderList/:deptId/:startTime/:endTime/:date/:workerId", //date是选中的日期，id是deptId，startTime是开始时间,endTime是结束时间,workerId是配送人员ID
         loadChildren: () =>
           import(
             "../inspect-active-order-list/inspect-active-order-list.module"

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

@@ -10,7 +10,7 @@
         <tr class="thead">
           <th nzWidth="5%">序号</th>
           <th nzWidth="15%">时间</th>
-          <th nzWidth="10%">支助人员名称</th>
+          <th nzWidth="10%">配送人员名称</th>
           <th nzWidth="15%">可预约检查总数</th>
           <th nzWidth="15%">系统自动建单数</th>
           <th nzWidth="10%">主动建单数</th>

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

@@ -10,12 +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
-  currentDeptId; //当前支助人员id
+  currentDeptId; //当前配送人员id
   startTime; //当前开始时间
   endTime; //当前结束时间
-  listOfData = []; //获取选中支助人员列表
+  listOfData = []; //获取选中配送人员列表
   pageIndex: number = 1; //页码
   listLength: number = 0; //总数据条目数
   pageSize: number = 10; //每页条数

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

@@ -11,14 +11,14 @@ import { format } from "date-fns";
   styleUrls: ["./inspect-active-order-list.component.less"],
 })
 export class InspectActiveOrderListComponent implements OnInit {
-  loading1 = false; //获取选中支助人员的工单列表loading
+  loading1 = false; //获取选中配送人员的工单列表loading
   hosId; //当前院区id
   currentDeptId; //当前科室id
-  workerId; //当前支助人员id
+  workerId; //当前配送人员id
   startTime; //当前开始时间
   endTime; //当前结束时间
   date; //选中的日期
-  listOfData = []; //获取选中支助人员的工单列表
+  listOfData = []; //获取选中配送人员的工单列表
   pageIndex: number = 1; //页码
   listLength: number = 0; //总数据条目数
   pageSize: number = 10; //每页条数

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

@@ -175,7 +175,7 @@ export class InspectActiveComponent implements OnInit {
   }
   // 获取院区/分组
   hospital: string; //选中院区
-  depts: any = []; //支助人员列表
+  depts: any = []; //配送人员列表
   getAllHos() {
     this.hospital = this.tool.getCurrentHospital().id + "";
     this.getAllWorker();
@@ -306,7 +306,7 @@ export class InspectActiveComponent implements OnInit {
       return con;
     }
   }
-  //获取支助人员工单详情列表
+  //获取配送人员工单详情列表
   personDetail(deptId) {
     let startDate = this.startDate + " " + "00:00:00";
     let endDate = this.endDate + " " + "23:59:59";

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

@@ -11,9 +11,9 @@
           <input nz-input class="formItem" placeholder="请输入检查单号" [(ngModel)]="searchCriteria.inspectCode" />
         </div>
         <div class="list-template__searchItem">
-          <span class="label">支助人员：</span>
+          <span class="label">配送人员：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
-            nzPlaceHolder="请选择支助人员" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
+            nzPlaceHolder="请选择配送人员" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
             (nzOpenChange)="changeSearch($event)">
             <ng-container *ngFor="let data of workerSearch">
               <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
@@ -45,7 +45,7 @@
             <th nzWidth="11%">预约时间</th>
             <th nzWidth="11%">到达时间</th>
             <th nzWidth="8%">检查状态</th>
-            <th nzWidth="8%">支助人员</th>
+            <th nzWidth="8%">配送人员</th>
           </tr>
         </thead>
         <tbody>

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

@@ -19,7 +19,7 @@ export class InspectSearchComponent implements OnInit {
     hospital: null,
     workerId: null,
   };
-  workerSearch = []; // 院区下的支助人员列表(搜索框)
+  workerSearch = []; // 院区下的配送人员列表(搜索框)
   allHospital: any = []; //院区下拉框
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
@@ -79,7 +79,7 @@ export class InspectSearchComponent implements OnInit {
     this.isLoading = true;
     this.changeInpSubject.next(worker);
   }
-  // 搜索支助人员
+  // 搜索配送人员
   searchWorker(worker) {
     let postData = {
       user: {

src/app/views/jp-search/jp-search.component.ts

@@ -18,7 +18,7 @@ export class JpSearchComponent implements OnInit {
     launch: null, //发药科室
     target: null, //发药科室
   };
-  deptList = []; // 院区下的支助人员列表(搜索框)
+  deptList = []; // 院区下的配送人员列表(搜索框)
   hosId;
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码

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

@@ -183,7 +183,7 @@ const routes: Routes = [
         path: "orderStatistics",
         loadChildren: () => import("../order-statistics/order-statistics.module").then((m) => m.OrderStatisticsModule),
       },
-      // 统计分析-支助人员统计
+      // 统计分析-配送人员统计
       {
         path: "workerStatistics",
         loadChildren: () => import("../worker-statistics/worker-statistics.module").then((m) => m.WorkerStatisticsModule),

src/app/views/order-management/order-management.component.ts

@@ -50,9 +50,9 @@ export class OrderManagementComponent implements OnInit {
   allAssociation: any = []; //当前院区所有工单类型
   department: any; //所属科室
   alldepart: any = []; //当前院区所属科室
-  worker: number; //选择执行支助人员
+  worker: number; //选择执行配送人员
   tasktype: number; //选择任务类型
-  allWorker: any = []; //当前院区执行支助人员列表
+  allWorker: any = []; //当前院区执行配送人员列表
   allTasktype: any = []; //当前院区任务类型列表
   gdState: number; //选择工单状态
   specialCloseFlag: any; //特殊情况关闭
@@ -117,7 +117,7 @@ export class OrderManagementComponent implements OnInit {
     this.hospital = this.tool.getCurrentHospital().id + "";
     this.changeHos();
   }
-  // 修改院区获取对应科室,工单类型，执行支助人员
+  // 修改院区获取对应科室,工单类型，执行配送人员
   changeHos() {
     this.department = null;
     this.worker = null;
@@ -140,14 +140,14 @@ export class OrderManagementComponent implements OnInit {
       });
   }
 
-  // 获取支助人员
+  // 获取配送人员
   getAllWorker(e?, those?) {
     let that = those || this;
     let postData = {
       user: {
         name: e || "",
         hospital: { id: that.hospital },
-        usertype: { id: 106 }, //支助人员
+        usertype: { id: 106 }, //配送人员
       },
       idx: 0,
       sum: 20,
@@ -301,7 +301,7 @@ export class OrderManagementComponent implements OnInit {
           this.department = this.loginUser.dept.id;
         }
         if (dept === undefined && this.coopBtns.currentUser && !this.coopBtns.allOrders) {
-          // 初次渲染，权限有当前人员工单,没有全部工单，则回显执行支助人员
+          // 初次渲染，权限有当前人员工单,没有全部工单，则回显执行配送人员
           this.allWorker = [this.loginUser];
           this.worker = this.loginUser.id;
         }
@@ -504,7 +504,7 @@ export class OrderManagementComponent implements OnInit {
     this.searchTimer(this.getDeparts, e);
   }
 
-  // 用户输入搜索支助人员
+  // 用户输入搜索配送人员
   changeUser(e) {
     this.searchTimer(this.getAllWorker, e);
   }

src/app/views/specimen-view2/specimen-view2.component.ts

@@ -177,7 +177,7 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
   }
    // 查看工单列表弹窗
    orderPromptModalShow = false; //弹窗开关
-   workId = ""; //支助人员ID
+   workId = ""; //配送人员ID
    showOrderList(data) {
      clearInterval(this.logTimer);
      this.workId = data.workerid;

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

@@ -295,7 +295,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td>支助人员响应时间</td>
+                  <td>配送人员响应时间</td>
                   <td>
                     <nz-input-number [(ngModel)]="integralDetailedRulesData[0].responseTime" [nzMin]="0" [nzMax]="10000"
                       [nzStep]="1" [nzSize]="'small'" (ngModelChange)='Change(integralDetailedRulesData[0])'>
@@ -483,7 +483,7 @@
               </thead>
               <tbody>
                 <tr>
-                  <td>支助人员响应时间</td>
+                  <td>配送人员响应时间</td>
                   <td>
                     <nz-input-number [(ngModel)]="integralDetailedRulesData[1].responseTime" [nzMin]="0" [nzMax]="10000"
                       [nzStep]="1" [nzSize]="'small'" (ngModelChange)='Change1(integralDetailedRulesData[1])'>

src/app/views/task-type-management/task-type-management.component.ts

@@ -166,7 +166,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ResponseTimeoutDeduct: 0, //二级扣分
         level3ResponseTimeoutTime: 0, //三级超时
         level3ResponseTimeoutDeduct: 0, //三级扣分
-        arriveTime: 0, //支助人员时长
+        arriveTime: 0, //配送人员时长
         arriveScore: 0, //积分
         level1ArriveTimeoutTime: 0, //一级超时
         level1ArriveTimeoutDeduct: 0, //一级扣分
@@ -174,7 +174,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ArriveTimeoutDeduct: 0, //二级扣分
         level3ArriveTimeoutTime: 0, //三级超时
         level3ArriveTimeoutDeduct: 0, //三级扣分
-        executeTime: 0, //支助人员时长
+        executeTime: 0, //配送人员时长
         executeScore: 0, //积分
         level1ExecuteTimeoutTime: 0, //一级超时
         level1ExecuteTimeoutDeduct: 0, //一级扣分
@@ -197,7 +197,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ResponseTimeoutDeduct: 0, //二级扣分
         level3ResponseTimeoutTime: 0, //三级超时
         level3ResponseTimeoutDeduct: 0, //三级扣分
-        arriveTime: 0, //支助人员时长
+        arriveTime: 0, //配送人员时长
         arriveScore: 0, //积分
         level1ArriveTimeoutTime: 0, //一级超时
         level1ArriveTimeoutDeduct: 0, //一级扣分
@@ -205,7 +205,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ArriveTimeoutDeduct: 0, //二级扣分
         level3ArriveTimeoutTime: 0, //三级超时
         level3ArriveTimeoutDeduct: 0, //三级扣分
-        executeTime: 0, //支助人员时长
+        executeTime: 0, //配送人员时长
         executeScore: 0, //积分
         level1ExecuteTimeoutTime: 0, //一级超时
         level1ExecuteTimeoutDeduct: 0, //一级扣分
@@ -1524,7 +1524,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ResponseTimeoutDeduct: 0, //二级扣分
         level3ResponseTimeoutTime: 0, //三级超时
         level3ResponseTimeoutDeduct: 0, //三级扣分
-        arriveTime: 0, //支助人员时长
+        arriveTime: 0, //配送人员时长
         arriveScore: 0, //积分
         level1ArriveTimeoutTime: 0, //一级超时
         level1ArriveTimeoutDeduct: 0, //一级扣分
@@ -1532,7 +1532,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ArriveTimeoutDeduct: 0, //二级扣分
         level3ArriveTimeoutTime: 0, //三级超时
         level3ArriveTimeoutDeduct: 0, //三级扣分
-        executeTime: 0, //支助人员时长
+        executeTime: 0, //配送人员时长
         executeScore: 0, //积分
         level1ExecuteTimeoutTime: 0, //一级超时
         level1ExecuteTimeoutDeduct: 0, //一级扣分
@@ -1555,7 +1555,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ResponseTimeoutDeduct: 0, //二级扣分
         level3ResponseTimeoutTime: 0, //三级超时
         level3ResponseTimeoutDeduct: 0, //三级扣分
-        arriveTime: 0, //支助人员时长
+        arriveTime: 0, //配送人员时长
         arriveScore: 0, //积分
         level1ArriveTimeoutTime: 0, //一级超时
         level1ArriveTimeoutDeduct: 0, //一级扣分
@@ -1563,7 +1563,7 @@ export class TaskTypeManagementComponent implements OnInit {
         level2ArriveTimeoutDeduct: 0, //二级扣分
         level3ArriveTimeoutTime: 0, //三级超时
         level3ArriveTimeoutDeduct: 0, //三级扣分
-        executeTime: 0, //支助人员时长
+        executeTime: 0, //配送人员时长
         executeScore: 0, //积分
         level1ExecuteTimeoutTime: 0, //一级超时
         level1ExecuteTimeoutDeduct: 0, //一级扣分

src/app/views/users-management/users-management.component.ts

@@ -265,7 +265,7 @@ export class UsersManagementComponent implements OnInit {
   // 选择用户类型
   usertypeChange() {
     if (this.validateForm.value.usertype == 106) {
-      //支助人员
+      //配送人员
       this.wxRequired = true;
       this.validateForm.get("weixin")!.setValidators(Validators.required);
       this.validateForm.get("weixin")!.markAsDirty();

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

@@ -10,13 +10,13 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./worker-statistics-detail.component.less"],
 })
 export class WorkerStatisticsDetailComponent implements OnInit {
-  loading1 = false; //获取选中支助人员的工单列表loading
+  loading1 = false; //获取选中配送人员的工单列表loading
   hosId; //当前院区id
-  currentPersonId; //当前支助人员id
+  currentPersonId; //当前配送人员id
   startTime; //当前开始时间
   endTime; //当前结束时间
   groupId; //当前组ID
-  listOfData = []; //获取选中支助人员的工单列表
+  listOfData = []; //获取选中配送人员的工单列表
   pageIndex: number = 1; //页码
   listLength: number = 0; //总数据条目数
   pageSize: number = 10; //每页条数
@@ -51,7 +51,7 @@ export class WorkerStatisticsDetailComponent implements OnInit {
       this.getOrdersByPerson(this.hosId, this.currentPersonId);
     }
   }
-  //获取选中支助人员的工单列表
+  //获取选中配送人员的工单列表
   getOrdersByPerson(
     hosId: number,
     currentPersonId: number,

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

@@ -150,7 +150,7 @@ export class WorkerStatisticsComponent 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();
       },
@@ -313,7 +313,7 @@ export class WorkerStatisticsComponent implements OnInit {
       return con;
     }
   }
-  //获取支助人员工单详情列表
+  //获取配送人员工单详情列表
   personDetail(workerId) {
     let startDate = this.startDate + " " + "00:00:00";
     let endDate = this.endDate + " " + "23:59:59";