Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -175,12 +175,12 @@ export class ConfigurationDrugComponent implements OnInit {
       return;
     }
 
-    if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.length){
+    if(this.activeDictionary.postData.drugsStartCheck[0].checked && !this.activeDictionary.postData.drugsStartCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择起点科室的核对方式！");
       return;
     }
 
-    if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.length){
+    if(this.activeDictionary.postData.drugsEndCheck[0].checked && !this.activeDictionary.postData.drugsEndCheckScanIds.filter(v => v.checked).length){
       this.msg.create("warning", "请选择终点科室的核对方式！");
       return;
     }

src/app/components/incidentManagement/incident-create/incident-create.component.html

@@ -8,7 +8,7 @@
 <!-- 新建工单 -->
 <div class="newOrder display_flex justify-content_flex-center align-items_center">
   <div class="modalBody">
-    <div class="title" *ngIf="currentTabIndex === '99999'">
+    <div class="title" *ngIf="currentTabIndex === '故障报修'">
       <div class="newTop">
         <div class="name">故障工单编辑</div>
         <div class="newTopItem">
@@ -55,9 +55,9 @@
         <div class="tabs">
           <div class="tabs__inner" #tab>
             <div class="tabs__wrap" [style.transform]="'translateX(' + disX + 'px)'">
-              <ng-container *ngFor="let item of workTypesArrange | keyvalue">
+              <ng-container *ngFor="let item of workTypesArrange;let index = index;">
                 <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)">
-                  {{ item.value[0].associationTypeName }}
+                  {{ item.key }}
                 </div>
               </ng-container>
             </div>
@@ -75,9 +75,9 @@
         </div>
         <!-- 底部tab页 -->
         <div class="bottomWrap">
-          <ng-container *ngFor="let item of workTypesArrange | keyvalue">
+          <ng-container *ngFor="let item of workTypesArrange;let index = index;">
             <!-- 故障报修 -->
-            <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '99999'">
+            <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '故障报修'">
               <div class="req">
                 <div class="row">
                   <div class="col flex4">
@@ -309,7 +309,7 @@
       </div>
     </div>
     <div class="btns display_flex justify-content_flex-center align-items_center">
-      <ng-container *ngIf="currentTabIndex === '99999' && buildType !== '编辑事件'">
+      <ng-container *ngIf="currentTabIndex === '故障报修' && buildType !== '编辑事件'">
         <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件'">是否连续建单</label>
         <button nz-button class="btn" nzType="primary" (click)="directOrder()">
           直接解决
@@ -321,7 +321,7 @@
           暂存
         </button>
       </ng-container>
-      <ng-container *ngIf="currentTabIndex === '99999' && buildType === '编辑事件'">
+      <ng-container *ngIf="currentTabIndex === '故障报修' && buildType === '编辑事件'">
         <button nz-button class="btn" nzType="primary" (click)="saveOrder()">
           保存
         </button>

src/app/components/incidentManagement/incident-create/incident-create.component.less

@@ -126,6 +126,7 @@
   display: inline-block;
   height: 24px;
   line-height: 24px;
+  word-break: keep-all;
 }
 
 /* 头部Tab */

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -74,7 +74,7 @@ export class IncidentCreateComponent implements OnInit {
   disStep = 0; //移动的步长
   // tab任务类型向左移动
   toLeft() {
-    let maxStep = Object.keys(this.workTypesArrange).length - 5;
+    let maxStep = this.workTypesArrange.length - 5;
     this.disStep = Math.max(-maxStep, --this.disStep);
     this.disX = (this.disStep * this.elementView.nativeElement.offsetWidth) / 5;
   }
@@ -729,7 +729,7 @@ export class IncidentCreateComponent implements OnInit {
   changeApplyDept(e) {
     console.log(e, this.applicationDeptList);
 
-    if(this.incidentModel.department && this.currentTabIndex === '99999'){
+    if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
       this.rightTitle_tab = [
         { id: 2, name: '近期维修' },
         { id: 3, name: '知识库' },
@@ -1350,18 +1350,18 @@ export class IncidentCreateComponent implements OnInit {
   }
 
   // 新建工单->获取新建类型
-  workTypesArrange = {}; //整理后的任务类型
+  workTypesArrange = []; //整理后的任务类型
   workTypesFlag = false; //任务类型是否显示操作项
   getAutoWorkTypes(isFirst, isInit) {
-    this.workTypesArrange = {};
+    this.workTypesArrange = [];
     // 运维
-    this.workTypesArrange = { 99999: [{associationTypeName: '故障报修'}] };
+    this.workTypesArrange = [{key:'故障报修', value: []}];
     console.log('workTypesArrange', this.workTypesArrange);
     // 是否显示操作项
-    this.workTypesFlag = Object.keys(this.workTypesArrange).length >= 5;
+    this.workTypesFlag = this.workTypesArrange.length >= 5;
     // 默认选中第一项
-    if (Object.keys(this.workTypesArrange).length > 0) {
-      this.tabClick(Object.keys(this.workTypesArrange)[0], isInit);
+    if (this.workTypesArrange.length > 0) {
+      this.tabClick(this.workTypesArrange[0].key, isInit);
     }
   }
 
@@ -1369,7 +1369,7 @@ export class IncidentCreateComponent implements OnInit {
   tabClick(key, isInit = false) {
     this.currentTabIndex = key;
 
-    if(this.currentTabIndex === '99999'){
+    if(this.currentTabIndex === '故障报修'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
           { id: 2, name: '近期维修' },

src/app/services/main.service.ts

@@ -426,6 +426,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //调度台建单获取可搜索的任务类型列表-统计备注
+  getTaskTypeCountRemarkList(data): any {
+    return this.http.post(host.host + "/ser/getTaskTypeCountRemarkList", data, {
+      headers: this.headers,
+    });
+  }
   //切换院区
   changeHospital(data): any {
     return this.http.post(host.host + "/auth/changeHospital", data, {
@@ -1032,5 +1038,5 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
-	
+
 }

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

@@ -1,6 +1,6 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" style="width: 1200px;">
-    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">药品详情<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title" *ngIf="(type === 'drugsJpbag' || type === 'drugsWestern' || type === 'drugsReturn' || type === 'drugsPoison' || type === 'drugsHerbal');else elseTpl">{{configs.drugsModel === 1 ? '药品详情' : '药包详情'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <ng-template #elseTpl>
       <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     </ng-template>
@@ -71,8 +71,8 @@
             <th nzWidth="10%">收取交接人</th>
             <th nzWidth="14%">收取时间</th>
             <th nzWidth="10%">送达人</th>
-            <th nzWidth="14%">送达交接人</th>
-            <th nzWidth="10%">送达时间</th>
+            <th nzWidth="10%">送达交接人</th>
+            <th nzWidth="14%">送达时间</th>
           </tr>
         </thead>
         <tbody>
@@ -81,12 +81,12 @@
             <td>{{ data.batchNo }}</td>
             <td>{{ data.drugsTypeCount }}</td>
             <td>{{ data.drugsCount }}</td>
-            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.username}}</ng-container></td>
-            <td><ng-container *ngIf="handoverStartObj && handoverStartObj.handoverUserid">{{handoverStartObj.handoverUserid.name}}</ng-container></td>
-            <td><ng-container *ngIf="handoverStartObj">{{handoverStartObj.operationTime}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.username}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj && handoverEndObj.handoverUserid">{{handoverEndObj.handoverUserid.name}}</ng-container></td>
-            <td><ng-container *ngIf="handoverEndObj">{{handoverEndObj.operationTime}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.username}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.handoverName}}</ng-container></td>
+            <td><ng-container *ngIf="data.startLog">{{data.startLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.username}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.handoverName}}</ng-container></td>
+            <td><ng-container *ngIf="data.endLog">{{data.endLog.operationTime | date:'yyyy-MM-dd HH:mm'}}</ng-container></td>
           </tr>
         </tbody>
       </nz-table>

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

@@ -248,8 +248,6 @@ export class BusinessDataDetailModalComponent implements OnInit {
   // 获取新药品一单多码列表
   drugsBugMultipleList: any = [];// 药包列表
   workOrder:any = {};// 工单
-  handoverStartObj:any = {};// 接收人
-  handoverEndObj:any = {};// 送达人
   getDrugsBugMultiple(idx, drugsModel) {
     if (idx) {
       this.pageIndex = 1;
@@ -268,9 +266,6 @@ export class BusinessDataDetailModalComponent implements OnInit {
           this.workOrder = res.data.workOrder || {};
           this.total = this.drugsBugMultipleList.length;
 
-          this.handoverStartObj = this.workOrder.record.find(v => v.operation.value == 8);
-          this.handoverEndObj = this.workOrder.record.find(v => v.operation.value == 10);
-
           if(drugsModel === 1){
             // 一单一码
             if(this.drugsBugMultipleList.length){

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

@@ -1,4 +1,4 @@
-<!-- 标本 -->
+<!-- 万能交接 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
   <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
@@ -18,9 +18,11 @@
           <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">应收数量：{{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>
+          <ng-container *ngIf="!(orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal')">
+            <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>
+          </ng-container>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
           </div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
@@ -118,7 +120,10 @@
       (click)="openRecallModal()">撤回</button>
     <button *ngIf="showCoop&&(orderInfo.gdState.value==2||orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button
       nzType="danger" (click)="openDelModal()">删除</button> -->
-    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo)">
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
+      业务数据
+    </button>
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && (orderInfo.taskType.ordinaryField.value == 'drugsJpbag' || orderInfo.taskType.ordinaryField.value == 'drugsWestern' || orderInfo.taskType.ordinaryField.value == 'drugsReturn' || orderInfo.taskType.ordinaryField.value == 'drugsPoison' || orderInfo.taskType.ordinaryField.value == 'drugsHerbal')" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, orderInfo.taskType.ordinaryField.value)">
       业务数据
     </button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
@@ -160,7 +165,7 @@
 <app-businessData-detail-modal
   *ngIf="bloodModalShow"
   [show]="bloodModalShow"
-  type="blood"
+  [type]="businessDataModalType"
   [orderId]="orderId"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-modal>

src/app/share/detail-ordinary/detail-ordinary.component.ts

@@ -74,8 +74,10 @@ export class DetailOrdinaryComponent implements OnInit {
   // 查看业务数据
   bloodModalShow = false; //业务数据弹窗开关
   orderId = ""; //查看业务数据携带
-  viewDetail(data) {
+  businessDataModalType = ''; //业务数据类型
+  viewDetail(data, type) {
     this.orderId = data.id;
+    this.businessDataModalType = type;
     this.bloodModalShow = true;
   }
   // 关闭业务数据弹窗

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

@@ -877,7 +877,7 @@
             配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
           </div>
         </div>
-        <div class="info" nz-row>
+        <div class="info" nz-row *ngIf="!(orderInfo.taskType.associationType.value === 'ordinary' && (orderInfo.taskType.ordinaryField.value === 'drugsJpbag' || orderInfo.taskType.ordinaryField.value === 'drugsWestern' || orderInfo.taskType.ordinaryField.value === 'drugsReturn' || orderInfo.taskType.ordinaryField.value === 'drugsPoison' || orderInfo.taskType.ordinaryField.value === 'drugsHerbal'))">
           <div nz-col nzSpan="6">
             应收数量：{{ orderInfo.expectReceiveNum || "无" }}
           </div>

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

@@ -975,9 +975,9 @@
   </div>
 
   <!-- 右侧悬浮框-录音盒或呼叫中心状态 -->
-  <div id="fixedMenuAll" class="fixedAll">
+  <div id="fixedMenuAll" class="fixedAll" *ngIf="!websocketLoading && (incomingService.getPhoneNumber() || (incomingService.getSign() === 'callCenter' && (jry_state=='laidian' || jry_state=='shimang' || jry_state=='shixian' || jry_state=='tonghuazhong')))">
     <div class="right">
-      <div class="fixedMenuWrap" *ngIf="!websocketLoading">
+      <div class="fixedMenuWrap">
         <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
           <div class="menuItems">
             <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
@@ -1132,7 +1132,7 @@
   <!-- 新建工单 -->
   <div class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="newOrderShow && newOrderShowOpen">
     <div class="modalBody">
-      <div class="title" *ngIf="currentTabIndex !== '99999'">
+      <div class="title" *ngIf="currentTabIndex !== '故障报修'">
         <div class="newTop">
           <div class="name">来电咨询</div>
           <div class="newTopItem">
@@ -1146,7 +1146,7 @@
               </nz-option>
             </nz-select>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="false">
             <span class="grayFont">任务类型：</span>
             <nz-select *ngIf="applyDept" style="width: 146px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="onSearchTaskBuild($event)" nzPlaceHolder="请选择任务类型" [(ngModel)]="taskBuild" (ngModelChange)="changeTaskBuild($event)">
               <ng-container *ngFor="let option of searchTaskList">
@@ -1163,7 +1163,7 @@
           </div>
         </div>
       </div>
-      <div class="title" *ngIf="currentTabIndex === '99999'">
+      <div class="title" *ngIf="currentTabIndex === '故障报修'">
         <div class="newTop">
           <div class="name">来电咨询</div>
           <div class="newTopItem">
@@ -1213,9 +1213,9 @@
           <div class="tabs">
             <div class="tabs__inner" #tab>
               <div class="tabs__wrap" [style.transform]="'translateX(' + disX + 'px)'">
-                <ng-container *ngFor="let item of workTypesArrange | keyvalue">
-                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)" *ngIf="buildType !== '编辑事件' || (buildType === '编辑事件' && item.key == 99999)">
-                    {{ item.value[0].associationTypeName }}
+                <ng-container *ngFor="let item of workTypesArrange;let index = index;">
+                  <div [ngClass]="{ tab: true, checked: currentTabIndex == item.key}" (click)="tabClick(item.key)" *ngIf="buildType !== '编辑事件' || (buildType === '编辑事件' && item.key == '故障报修')">
+                    {{ item.key }}
                   </div>
                 </ng-container>
               </div>
@@ -1233,16 +1233,16 @@
           </div>
           <!-- 底部tab页 -->
           <div class="bottomWrap">
-            <ng-container *ngFor="let item of workTypesArrange | keyvalue">
+            <ng-container *ngFor="let item of workTypesArrange;let index = index;">
               <ng-container *ngIf="applyDept">
-                <!-- 标本轮巡,标本配送 -->
-                <div class="bottom" *ngIf="currentTabIndex == item.key && item.key == 256 && !newLoading">
+                <!-- 标本配送 -->
+                <!-- <div class="bottom" *ngIf="currentTabIndex == item.key && item.key == '物品配送' && !newLoading">
                   <div class="bottom380256">
                     起点科室默认为申请科室，终点科室为检验科室，确定后即可新建工单！
                   </div>
-                </div>
+                </div> -->
                 <!-- 患者转运 -->
-                <overlay-scrollbars #osComponentRef9 *ngIf="currentTabIndex == item.key && item.key == 255 && !newLoading" class="bottom">
+                <overlay-scrollbars #osComponentRef9 *ngIf="currentTabIndex == item.key && item.key  == '患者转运' && !newLoading" class="bottom">
                   <div class="bottom255">
                     <form nz-form [formGroup]="validateFormZy">
                       <div nz-row [nzGutter]="24">
@@ -1266,7 +1266,7 @@
                                 <overlay-scrollbars #osComponentRef10 [ngStyle]="{ height: '100%' }">
                                   <nz-radio-group formControlName="taskType" nz-row [(ngModel)]="radioValueZy" (ngModelChange)="radioChangeZy(radioValueZy)">
                                     <div nz-row>
-                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[index].value">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>
@@ -1558,269 +1558,99 @@
                     </form>
                   </div>
                 </overlay-scrollbars>
-                <!-- 其他 -->
-                <overlay-scrollbars #osComponentRef13 class="bottom" *ngIf="currentTabIndex == item.key && item.key == 259 && !newLoading">
+                <!-- 物品配送 -->
+                <overlay-scrollbars #osComponentRef13 class="bottom" *ngIf="currentTabIndex == item.key && item.key  == '物品配送' && !newLoading">
                   <div class="bottom255">
                     <form nz-form [formGroup]="validateFormQt">
                       <div nz-row [nzGutter]="24">
                         <div nz-col [nzSpan]="24" style="height: 268px">
                           <nz-form-item>
-                            <nz-form-label
-                              class="label"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzRequired
-                              nzFor="taskTypeQt"
-                              >类型
-                            </nz-form-label>
-                            <nz-form-control
-                              class="control"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzErrorTip="请选择类型！"
-                            >
-                              <div class="radios" style="height: 225px">
+                            <nz-form-label class="label" [nzSm]="2" [nzXs]="2" nzRequired nzFor="taskTypeQt">类型</nz-form-label>
+                            <div class="ellipsis-oneline">
+                              <span class="customRemarks mr8 countRemark" [ngClass]="{ active: countRemarkIndex == i }" (click)="addCountRemark(item, index, i)" *ngFor="let item of countRemarkList;let i = index;">{{ item }}</span>
+                            </div>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择类型！">
+                              <div class="radios" style="height: 225px" *ngIf="!searchTaskLoading">
                                 <overlay-scrollbars #osComponentRef11 [ngStyle]="{ height: '100%' }">
                                   <nz-radio-group formControlName="taskTypeQt" nz-row [(ngModel)]="radioValueQt" (ngModelChange)="radioChangeQt(radioValueQt)">
                                     <div nz-row>
-                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[item.key]">{{ item1.taskTypeName }}</label>
+                                      <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[index].value">{{ item1.taskTypeName }}</label>
                                     </div>
                                   </nz-radio-group>
                                 </overlay-scrollbars>
                               </div>
+                              <div class="radios display_flex justify-content_flex-center align-items_center" style="height: 225px" *ngIf="searchTaskLoading">
+                                <nz-spin nzSimple></nz-spin>
+                              </div>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div
-                          nz-col
-                          [nzSpan]="12"
-                          style="height: 83px"
-                          [ngStyle]="{
-                            display:
-                              deptQtList['startStatus'] != 201 ? 'block' : 'none'
-                          }"
-                        >
+                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" style="height: 83px" [ngStyle]="{ display: deptQtList['startStatus'] != 201 ? 'block' : 'none' }">
                           <nz-form-item>
-                            <nz-form-label
-                              class="label"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzRequired
-                              nzFor="startDeptQt"
-                              >起点科室
-                            </nz-form-label>
-                            <nz-form-control
-                              class="control"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzErrorTip="请选择起点科室！"
-                            >
-                              <nz-select
-                                formControlName="startDeptQt"
-                                [nzDisabled]="
-                                  deptQtList.startStatus == 201 ||
-                                  deptQtList.startStatus == 203
-                                "
-                                [nzDropdownMatchSelectWidth]="false"
-                                nzServerSearch
-                                nzShowSearch
-                                (nzOnSearch)="
-                                  searchHosDepartmentQt(
-                                    checkedHos,
-                                    'start',
-                                    $event
-                                  )
-                                "
-                                nzAllowClear
-                                nzPlaceHolder="请选择起点科室"
-                                [(ngModel)]="startDeptQt"
-                              >
-                                <ng-container
-                                  *ngFor="let option of deptQtList.startDept"
-                                >
-                                  <nz-option
-                                    *ngIf="!isLoading"
-                                    [nzLabel]="option.dept"
-                                    [nzValue]="option.id"
-                                  ></nz-option>
+                            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startDeptQt">起点科室</nz-form-label>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室！">
+                              <nz-select formControlName="startDeptQt" [nzDisabled]="deptQtList.startStatus == 201 || deptQtList.startStatus == 203" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'start', $event)" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptQt">
+                                <ng-container *ngFor="let option of deptQtList.startDept">
+                                  <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 *ngIf="isLoading" nzDisabled nzCustomContent>
+                                  <i nz-icon nzType="loading" class="loading-icon"></i>
                                   搜索中...
                                 </nz-option>
                               </nz-select>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div nz-col [nzSpan]="12" style="height: 83px">
+                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" style="height: 83px">
                           <nz-form-item>
-                            <nz-form-label
-                              class="label"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzRequired
-                              nzFor="endDeptsQt"
-                              >终点科室
-                            </nz-form-label>
-                            <nz-form-control
-                              class="control"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzErrorTip="请选择终点科室！"
-                            >
-                              <nz-select
-                                formControlName="endDeptsQt"
-                                [nzDisabled]="
-                                  deptQtList.endStatus == 201 ||
-                                  deptQtList.endStatus == 203
-                                "
-                                [nzDropdownMatchSelectWidth]="false"
-                                nzServerSearch
-                                nzShowSearch
-                                (nzOnSearch)="
-                                  searchHosDepartmentQt(checkedHos, 'end', $event)
-                                "
-                                nzAllowClear
-                                nzPlaceHolder="请选择终点科室"
-                                [(ngModel)]="endDeptQt"
-                              >
-                                <ng-container
-                                  *ngFor="let option of deptQtList.endDept"
-                                >
-                                  <nz-option
-                                    *ngIf="!isLoading"
-                                    [nzLabel]="option.dept"
-                                    [nzValue]="option.id"
-                                  ></nz-option>
+                            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDeptsQt">终点科室</nz-form-label>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
+                              <nz-select formControlName="endDeptsQt" [nzDisabled]="deptQtList.endStatus == 201 || deptQtList.endStatus == 203" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'end', $event)"
+                                nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptQt">
+                                <ng-container *ngFor="let option of deptQtList.endDept">
+                                  <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 *ngIf="isLoading" nzDisabled nzCustomContent>
+                                  <i nz-icon nzType="loading" class="loading-icon"></i>
                                   搜索中...
                                 </nz-option>
                               </nz-select>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div
-                          nz-col
-                          [nzSpan]="24"
-                          *ngIf="
-                            deptQtList.taskType &&
-                            deptQtList.taskType.remarksSwitch == 1
-                          "
-                        >
+                        <div nz-col [nzSpan]="24" style="padding-bottom: 16px;" *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value === 'specimen'">
+                          起点科室默认为申请科室，终点科室为检验科室，确定后即可新建工单！
+                        </div>
+                        <div nz-col [nzSpan]="24" *ngIf="deptQtList.taskType && deptQtList.taskType.remarksSwitch == 1">
                           <nz-form-item>
-                            <nz-form-label
-                              class="label"
-                              [nzSm]="3"
-                              [nzXs]="3"
-                              nzFor="workOrderRemark"
-                              >工单备注
-                            </nz-form-label>
-                            <span
-                              class="customRemarks"
-                              *ngFor="
-                                let item of deptQtList.taskType.customRemarks
-                              "
-                              (click)="addRemarks(item)"
-                              >【{{ item }}】</span
-                            >
-                            <nz-form-control
-                              class="control"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzErrorTip="请填写工单备注！"
-                            >
-                              <textarea
-                                formControlName="workOrderRemark"
-                                nz-input
-                                [placeholder]="deptQtList.taskType.remarksPrompts"
-                                [nzAutosize]="{ minRows: 3, maxRows: 5 }"
-                                maxlength="100"
-                                [(ngModel)]="workOrderRemark"
-                                #remarksEle
-                              ></textarea>
+                            <nz-form-label class="label" [nzSm]="3" [nzXs]="3" nzFor="workOrderRemark">工单备注</nz-form-label>
+                            <span class="customRemarks" *ngFor="let item of deptQtList.taskType.customRemarks" (click)="addRemarks(item)">【{{ item }}】</span>
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请填写工单备注！">
+                              <textarea formControlName="workOrderRemark" nz-input [placeholder]="deptQtList.taskType.remarksPrompts" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" [(ngModel)]="workOrderRemark" #remarksEle></textarea>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
                         <!-- 预约建单时间-其他临床服务--start -->
-                        <div nz-col [nzSpan]="24" style="height: 83px" class="pos">
+                        <div nz-col [nzSpan]="24" style="height: 83px" class="pos" *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value === 'other'">
                           <!-- 需要预约检查 -->
                           <nz-form-item class="pos-item">
                             <nz-form-control>
-                              <label
-                                nz-checkbox
-                                [(ngModel)]="isYyInspect"
-                                (ngModelChange)="yyInspectChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                style="font-weight: bold"
-                                >需要预约检查</label
-                              >
+                              <label nz-checkbox [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
                             </nz-form-control>
                           </nz-form-item>
                           <!-- 预约建单时间 -->
-                          <nz-form-item
-                            class="yyTime"
-                            [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }"
-                          >
-                            <nz-form-label [nzSm]="24" [nzXs]="24"
-                              >预约建单时间</nz-form-label
-                            >
+                          <nz-form-item class="yyTime" [ngClass]="{ yyTimeError: (!yyTime || !yyDate) && clickYYFlag }">
+                            <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                             <nz-form-control [nzSm]="24" [nzXs]="24">
-                              <nz-date-picker
-                                [nzDisabled]="!isYyInspect"
-                                [(ngModel)]="yyDate"
-                                (ngModelChange)="yyDateChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                [nzAllowClear]="false"
-                                [nzDisabledDate]="disabledyyDate"
-                                [nzShowToday]="false"
-                              >
+                              <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDate" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDate" [nzShowToday]="false">
                               </nz-date-picker>
-                              <nz-time-picker
-                                [nzDisabled]="!isYyInspect || !yyDate"
-                                class="ml8"
-                                nzFormat="HH:mm"
-                                [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                                [nzSecondStep]="60"
-                                [(ngModel)]="yyTime"
-                                (ngModelChange)="yyTimeChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                [nzDisabledHours]="disabledHours"
-                                [nzDisabledMinutes]="disabledMinutes"
-                                [nzAllowEmpty]="false"
-                              >
+                              <nz-time-picker [nzDisabled]="!isYyInspect || !yyDate" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTime" (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                               </nz-time-picker>
-                              <button
-                                [disabled]="!isYyInspect || (isYyInspect && !yyDate)"
-                                nz-button
-                                nzType="primary"
-                                class="ml8"
-                                (click)="nextDay()"
-                              >
+                              <button [disabled]="!isYyInspect || (isYyInspect && !yyDate)" nz-button nzType="primary" class="ml8" (click)="nextDay()">
                                 下一日
                               </button>
                             </nz-form-control>
-                            <div
-                              class="red w100"
-                              *ngIf="(!yyTime || !yyDate) && clickYYFlag"
-                            >
+                            <div class="red w100" *ngIf="(!yyTime || !yyDate) && clickYYFlag">
                               请填写预约建单时间!
                             </div>
                           </nz-form-item>
@@ -1832,7 +1662,7 @@
                 </overlay-scrollbars>
               </ng-container>
               <!-- 故障报修 -->
-              <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '99999'">
+              <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '故障报修'">
                 <div class="req">
                   <div class="row">
                     <div class="col flex4">
@@ -1988,7 +1818,7 @@
             </div>
           </div>
           <!-- 底部信息提示 -->
-          <!-- <div class="bottomInfo" *ngIf="currentTabIndex !== '99999'">提示：临床科室建单会更简便哟！</div> -->
+          <!-- <div class="bottomInfo" *ngIf="currentTabIndex !== '故障报修'">提示：临床科室建单会更简便哟！</div> -->
         </div>
         <div nz-col nzSpan="9" class="col right">
           <div class="rightTitle">
@@ -2216,7 +2046,7 @@
         </div>
       </div>
       <div class="btns display_flex justify-content_flex-center align-items_center">
-        <ng-container *ngIf="applyDept && currentTabIndex !== '99999'">
+        <ng-container *ngIf="applyDept && currentTabIndex !== '故障报修'">
           <button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading">
             继续建单
           </button>
@@ -2224,7 +2054,7 @@
             {{isYyInspect ? '预约建单' :'直接建单'}}
           </button>
         </ng-container>
-        <ng-container *ngIf="currentTabIndex === '99999' && buildType !== '编辑事件'">
+        <ng-container *ngIf="currentTabIndex === '故障报修' && buildType !== '编辑事件'">
           <label nz-checkbox [(ngModel)]="isBuildOrderAgagin" *ngIf="buildType !== '报修转事件' && buildType !== '留言转事件' && buildType !== '继续建单'">是否连续建单</label>
           <button nz-button class="btn" nzType="primary" (click)="directOrder()">
             直接解决
@@ -2236,7 +2066,7 @@
             暂存
           </button>
         </ng-container>
-        <ng-container *ngIf="currentTabIndex === '99999' && buildType === '编辑事件'">
+        <ng-container *ngIf="currentTabIndex === '故障报修' && buildType === '编辑事件'">
           <button nz-button class="btn" nzType="primary" (click)="saveOrder()">
             保存
           </button>

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

@@ -147,6 +147,15 @@
     display: inline-block;
     height: 24px;
     line-height: 24px;
+    word-break: keep-all;
+    &.countRemark{
+      text-decoration: underline;
+      color: #000;
+    }
+    &.active{
+      font-weight: bold;
+      color: @primary-color;
+    }
   }
 
   /* 头部Tab */

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

@@ -128,7 +128,7 @@ export class FuwutaiComponent implements OnInit {
   applicationDepartmentList = []; //新建工单->申请科室列表（搜索）
   callNumber = ""; //来电号码
   workTypes = []; //任务类型
-  workTypesArrange = {}; //整理后的任务类型
+  workTypesArrange = []; //整理后的任务类型
   workTypesFlag = false; //任务类型是否显示操作项
   currentTabIndex = ""; //获取任务类型的key
   radioValueZy: any = ""; //转运->类型
@@ -395,7 +395,7 @@ export class FuwutaiComponent implements OnInit {
 
       // 预约日期
       let yyTime1;
-      if(this.isYyInspect && this.currentTabIndex == '255'){
+      if(this.isYyInspect && this.currentTabIndex == '患者转运'){
         let yyDateZy = (typeof this.yyDateZy === 'object') ? new Date(this.yyDateZy) : parse(this.yyDateZy, 'yyyy-MM-dd HH:mm:ss', new Date());
         let yyTimeZy = (typeof this.yyTimeZy === 'object') ? new Date(this.yyTimeZy) : parse(this.yyTimeZy, 'yyyy-MM-dd HH:mm:ss', new Date());
         yyTime1 = format(yyDateZy, "yyyy-MM-dd") + " " + format(yyTimeZy, "HH:mm") + ":00";
@@ -455,7 +455,7 @@ export class FuwutaiComponent implements OnInit {
       workOrder: {
         sourceId: SourceId.fuwutai,
         taskType: {
-          id: this.workTypesArrange[this.currentTabIndex][0].taskType.id,
+          id: this.validateFormQt.controls.taskTypeQt.value,
         },
         startDept: {
           id: this.applyDept,
@@ -500,7 +500,7 @@ export class FuwutaiComponent implements OnInit {
 
     // 预约日期
     let yyTime1;
-    if(this.isYyInspect && this.currentTabIndex == '259'){
+    if(this.isYyInspect && this.currentTabIndex == '物品配送'){
       let yyDate = (typeof this.yyDate === 'object') ? new Date(this.yyDate) : parse(this.yyDate, 'yyyy-MM-dd HH:mm:ss', new Date());
       let yyTime = (typeof this.yyTime === 'object') ? new Date(this.yyTime) : parse(this.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date());
       yyTime1 = format(yyDate, "yyyy-MM-dd") + " " + format(yyTime, "HH:mm") + ":00";
@@ -548,6 +548,60 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+  // 万能交接表单提交
+  submitFormOrdinary(go?) {
+    for (const i in this.validateFormQt.controls) {
+      this.validateFormQt.controls[i].markAsDirty();
+      this.validateFormQt.controls[i].updateValueAndValidity();
+      if (!this.validateFormQt.controls[i].valid) {
+        this.isOkLoading = false;
+        this.isGoLoading = false;
+        return;
+      }
+    }
+
+    let postData = {
+      workOrder: {
+        sourceId: SourceId.fuwutai,
+        workOrderRemark: this.validateFormQt.controls.workOrderRemark.value,
+        taskType: {
+          id: this.validateFormQt.controls.taskTypeQt.value,
+        },
+        startDept: {
+          id: this.validateFormQt.controls.startDeptQt.value,
+        },
+        createDept: this.applyDept,
+        endDepts: [
+          {
+            id: this.validateFormQt.controls.endDeptsQt.value,
+          },
+        ],
+      },
+    };
+    if (!this.noWorkerPhone) {
+      postData.workOrder["workOrderPhone"] = this.callNumber;
+    }
+    this.mainService.buildOrder(postData).subscribe((data) => {
+      this.isOkLoading = false;
+      this.isGoLoading = false;
+      if (data["status"] == 200) {
+        this.newOrderShow = false; //关闭弹窗
+        if (go === "&go&") {
+          this.applyDept = data["startDept"].id;
+          this.applyStartDept = data["startDept"];
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+          this.showPromptModal("建单", true, "", "closeGo");
+        } else {
+          if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+            this.jry_shixian();
+          }
+          this.showPromptModal("建单", true, "", "close");
+        }
+      } else {
+        this.showPromptModal("建单", false, data["msg"]);
+      }
+    });
+  }
   // 核酸打印
   nucleicAcidLoading = false;
   nucleicAcidList: any = [];
@@ -2332,6 +2386,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentMsg = isInit ? this.incidentMsg : {};
         this.isBuildOrderAgagin = false;
         this.applyDept = null;
+        this.countRemarkIndex = -1;
         this.incidentModel.department = isInit ? this.incidentModel.department : null;
 
         //正常初始化
@@ -2373,6 +2428,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentMsg = isInit ? this.incidentMsg : {};
     this.isBuildOrderAgagin = false;
     this.applyDept = null;
+    this.countRemarkIndex = -1;
     this.incidentModel.department = isInit ? this.incidentModel.department : null;
     console.log(des);
     if (des === "no") {
@@ -2397,7 +2453,7 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskLoading = false;
         this.searchTaskList = result.data;
         this.searchTaskList.forEach((item) => {
-          item.sid = item.associationTypeId + "_" + item.id;
+          item.sid = item.associationTypeId + "_" + item.id + "_" + item.associationTypeValue;
         });
         // if(phone){
         //   this.getAutoWorkTypes(true, isInit);
@@ -2411,13 +2467,14 @@ export class FuwutaiComponent implements OnInit {
   // 获取可选择的任务类型列表
   searchTaskList;
   searchTaskLoading = false;
-  getSearchTaskList(keyword) {
+  getSearchTaskList(keyword, countRemark = '') {
     if(!this.hsmsData.hsmsSwitch){
       return;
     }
     this.searchTaskLoading = true;
     return this.mainService.getTaskTypeBySearchKey({
-      searchKey: keyword,
+      searchKey: keyword || undefined,
+      countRemark: countRemark || undefined,
       hosId: this.checkedHos,
     });
   }
@@ -2455,7 +2512,7 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["startStatus"] = 0;
     this.deptQtList["endStatus"] = 0;
 
-    if(preCurrentTabIndex === '99999'){
+    if(preCurrentTabIndex === '故障报修'){
       if(this.applyDept){
         this.rightTitle_tab = [
           { id: 0, name: '近期配送' },
@@ -2470,7 +2527,7 @@ export class FuwutaiComponent implements OnInit {
         this.applyDept = this.incidentModel.department;
         this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
       }
-    }else if(this.currentTabIndex === '99999'){
+    }else if(this.currentTabIndex === '故障报修'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
           { id: 2, name: '近期维修' },
@@ -2509,7 +2566,7 @@ export class FuwutaiComponent implements OnInit {
 
   // tab任务类型向左移动
   toLeft() {
-    let maxStep = Object.keys(this.workTypesArrange).length - 5;
+    let maxStep = this.workTypesArrange.length - 5;
     this.disStep = Math.max(-maxStep, --this.disStep);
     this.disX = (this.disStep * this.elementView.nativeElement.offsetWidth) / 5;
   }
@@ -3213,7 +3270,7 @@ export class FuwutaiComponent implements OnInit {
     console.log(e, this.applicationDepartmentList);
     this.changeApplicationDepartment("&same&");
 
-    if(this.applyDept && this.currentTabIndex !== '99999'){
+    if(this.applyDept && this.currentTabIndex !== '故障报修'){
       this.rightTitle_tab = [
         { id: 0, name: '近期配送' },
         { id: 1, name: '转出院记录' },
@@ -3232,7 +3289,7 @@ export class FuwutaiComponent implements OnInit {
   changeApplyDept(e) {
     console.log(e, this.applicationDeptList);
 
-    if(this.incidentModel.department && this.currentTabIndex === '99999'){
+    if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
       this.rightTitle_tab = [
         { id: 2, name: '近期维修' },
         { id: 3, name: '知识库' },
@@ -3353,7 +3410,7 @@ export class FuwutaiComponent implements OnInit {
       console.log('filter', filter)
       // this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = filter[0].phone;
       console.log(this.callNumber); //ceshi
-      if (this.currentTabIndex == "255") {
+      if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
         this.getPatientList(this.applyDept, "");
@@ -3368,7 +3425,7 @@ export class FuwutaiComponent implements OnInit {
         this.getDictionaryList();
       }
     } else if (phone === "&go&") {
-      if (this.currentTabIndex == "255") {
+      if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
         this.getPatientList(this.applyDept, "");
@@ -3383,7 +3440,7 @@ export class FuwutaiComponent implements OnInit {
         this.getDictionaryList();
       }
     } else if (phone === "&same&") {
-      if (this.currentTabIndex == "255") {
+      if (this.currentTabIndex == "患者转运") {
         //患者转运
         //获取患者信息
         this.getPatientList(this.applyDept, "");
@@ -3745,50 +3802,121 @@ export class FuwutaiComponent implements OnInit {
     }
   }
 
+  // 选择统计备注
+  countRemarkIndex:number = -1;
+  addCountRemark(countRemark, index, i){
+    if(this.countRemarkIndex == i){
+      this.countRemarkIndex = -1;
+    }else{
+      this.countRemarkIndex = i;
+    }
+
+    this.getSearchTaskList('', this.countRemarkIndex > -1 ? countRemark : '').subscribe((result) => {
+      if (result.status == 200) {
+        this.searchTaskLoading = false;
+        // this.workTypesArrange[index].value = result.data || [];
+        this.workTypes = result['data'] || [];
+        // 整理后的任务类型
+        for (const value of this.workTypesArrange) {
+          value.value = [];
+        }
+        this.workTypes.forEach((item) => {
+          if(item.associationTypeValue === 'patientTransport'){
+            // 患者其他服务
+            let obj = this.workTypesArrange.find(v => v.key === '患者转运');
+            if(obj){
+              obj.value.push(item);
+            }else{
+              this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
+            }
+          }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
+            // 物品配送
+            let obj = this.workTypesArrange.find(v => v.key === '物品配送');
+            if(obj){
+              obj.value.push(item);
+            }else{
+              this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
+            }
+          }
+        });
+        console.log('workTypesArrange', this.workTypesArrange);
+        // 任务类型是否显示操作项
+        let arr = this.workTypesArrange;
+        this.workTypesFlag = arr.length >= 5;
+      }
+    });
+  }
+
   // 新建工单->获取新建类型
+  countRemarkList:any[] = [];
   getAutoWorkTypes(isFirst, isInit) {
-    this.workTypesArrange = {};
+    this.workTypesArrange = [];
     // 运维
     if(this.itsmData.mdv2Switch){
-      this.workTypesArrange = { 99999: [{associationTypeName: '故障报修'}] };
+      this.workTypesArrange = [{key:'故障报修', value: []}];
       if(!this.hsmsData.hsmsSwitch){
         console.log('workTypesArrange', this.workTypesArrange);
         // 是否显示操作项
-        this.workTypesFlag = Object.keys(this.workTypesArrange).length >= 5;
+        this.workTypesFlag = this.workTypesArrange.length >= 5;
         // 默认选中第一项
-        if (Object.keys(this.workTypesArrange).length > 0) {
-          this.tabClick(Object.keys(this.workTypesArrange)[0], isInit);
+        if (this.workTypesArrange.length > 0) {
+          this.tabClick(this.workTypesArrange[0].key, isInit);
         }
       }
     }
     // 配送
     if(this.hsmsData.hsmsSwitch){
       this.newLoading = true;
-      this.mainService.getAutoWorkTypes(this.checkedHos).subscribe((data) => {
+      this.mainService.getTaskTypeBySearchKey({
+        hosId: this.checkedHos,
+      }).subscribe((data) => {
         this.newLoading = false;
         if (data["status"] == 200) {
           this.workTypes = data["data"];
           // 整理后的任务类型
           this.workTypes.forEach((item) => {
-            if (this.workTypesArrange[item.associationTypeId]) {
-              this.workTypesArrange[item.associationTypeId].push(item);
-            } else {
-              this.workTypesArrange[item.associationTypeId] = [];
-              this.workTypesArrange[item.associationTypeId].push(item);
+            if(item.associationTypeValue === 'patientTransport'){
+              // 患者其他服务
+              let obj = this.workTypesArrange.find(v => v.key === '患者转运');
+              if(obj){
+                obj.value.push(item);
+              }else{
+                this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
+              }
+            }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
+              // 物品配送
+              let obj = this.workTypesArrange.find(v => v.key === '物品配送');
+              if(obj){
+                obj.value.push(item);
+              }else{
+                this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
+              }
             }
           });
           console.log('workTypesArrange', this.workTypesArrange);
           // 任务类型是否显示操作项
-          let arr = Object.keys(this.workTypesArrange);
+          let arr = this.workTypesArrange;
           this.workTypesFlag = arr.length >= 5;
           // 默认选中第一项
           if (arr.length > 0) {
-            isFirst ? this.tabClick(arr[0], isInit) : this.tabClick(arr[arr.length - 1], isInit);
+            isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 1].key, isInit);
           }
         }
       });
+      this.getTaskTypeCountRemarkList();
     }
   }
+  // 查类型
+  getTaskTypeCountRemarkList(){
+    this.mainService.getTaskTypeCountRemarkList({
+        hosId: this.checkedHos,
+        typeValues: 'other,specimen,ordinary',
+    }).subscribe((data) => {
+      if (data["status"] == 200){
+        this.countRemarkList = data.data || [];
+      }
+    })
+  }
   // 终点科室选中
   endDeptZyChange() {
     if (!this.applyDept || !this.endDeptZy) {
@@ -4126,7 +4254,7 @@ export class FuwutaiComponent implements OnInit {
         (data["endStatus"] == 201 || data["endStatus"] == 203) &&
         this.radioValueZy == this.deathTasktypeId
       ) {
-        if (this.currentTabIndex == "255") {
+        if (this.currentTabIndex == "患者转运") {
           //患者转运
           //获取患者信息
           this.getPatientList(this.endDeptZy, "");
@@ -4134,7 +4262,8 @@ export class FuwutaiComponent implements OnInit {
       }
     });
     // 获取携带物品
-    let arr = this.workTypesArrange[this.currentTabIndex];
+    let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
+    let arr = arrObj.value;
     this.goodsNow = arr.filter(
       (item) => item.id == value
     )[0].taskType.carryEquipmentIds;
@@ -4171,10 +4300,7 @@ export class FuwutaiComponent implements OnInit {
       this.yyDate = new Date();
       this.yyTime = null;
       // 预约end
-      this.deptQtList.taskType.customRemarks = this.deptQtList.taskType
-        .customRemarks
-        ? this.deptQtList.taskType.customRemarks.split("$")
-        : [];
+      this.deptQtList.taskType.customRemarks = this.deptQtList.taskType.customRemarks ? this.deptQtList.taskType.customRemarks.split("$") : [];
       // 起点科室
       if (data["startStatus"] == 201) {
         if (this.applyDept) {
@@ -4209,20 +4335,24 @@ export class FuwutaiComponent implements OnInit {
   //新建工单->确定提交
   isGoLoading = false;
   newOrderOk(go?): void {
-    if (this.isYyInspect && this.currentTabIndex == '259') {
+    console.log(this.radioValueQt);
+    let arr = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
+    let objQt = arr.value.find(v => v.id == this.radioValueQt);
+    let objZy = arr.value.find(v => v.id == this.radioValueZy);
+    if (this.isYyInspect && objQt && objQt.associationTypeValue === 'other') {
       this.clickYYFlag = true;
     } else {
       this.clickYYFlag = false;
     }
-    if (this.isYyInspect && this.currentTabIndex == '255') {
+    if (this.isYyInspect && objZy && objZy.associationTypeValue === 'patientTransport') {
       this.clickYYZyFlag = true;
     } else {
       this.clickYYZyFlag = false;
     }
 
     if (
-      (!this.yyTime && this.currentTabIndex == '259' && this.isYyInspect) ||
-      (!this.yyTimeZy && this.currentTabIndex == '255' && this.isYyInspect)
+      (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
+      (!this.yyTimeZy && objZy && objZy.associationTypeValue === 'patientTransport' && this.isYyInspect)
     ) {
       return;
     }
@@ -4232,15 +4362,18 @@ export class FuwutaiComponent implements OnInit {
     } else {
       this.isGoLoading = true;
     }
-    if (this.currentTabIndex == "255") {
+    if (objZy && objZy.associationTypeValue === 'patientTransport') {
       //患者转运
       go === "&go&" ? this.submitFormZy(go) : this.submitFormZy();
-    } else if (this.currentTabIndex == "256") {
+    } else if (objQt && objQt.associationTypeValue === 'specimen') {
       //标本配送
       go === "&go&" ? this.submitFormBbps(go) : this.submitFormBbps();
-    } else if (this.currentTabIndex == "259") {
+    } else if (objQt && objQt.associationTypeValue === 'other') {
       //其他配送
       go === "&go&" ? this.submitFormQt(go) : this.submitFormQt();
+    } else if (objQt && objQt.associationTypeValue === 'ordinary') {
+      //万能交接
+      go === "&go&" ? this.submitFormOrdinary(go) : this.submitFormOrdinary();
     }
   }
 
@@ -4677,7 +4810,7 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskLoading = false;
         this.searchTaskList = result.data;
         this.searchTaskList.forEach((item) => {
-          item.sid = item.associationTypeId + "_" + item.id;
+          item.sid = item.associationTypeId + "_" + item.id + "_" + item.associationTypeValue;
         });
       }
     });
@@ -4685,11 +4818,15 @@ export class FuwutaiComponent implements OnInit {
   //服务台建单任务类型回车,0_1,0是关联类型，1是任务类型
   changeTaskBuild(e) {
     let arr = e.split("_");
-    this.currentTabIndex = arr[0];
-    if (this.currentTabIndex == "255") {
+    if(arr[2] === 'other' || arr[2] === 'specimen' || arr[2] === 'ordinary'){
+      this.currentTabIndex = '物品配送';
+    }else if(arr[2] === 'patientTransport'){
+      this.currentTabIndex = '患者转运';
+    }
+    if (this.currentTabIndex == "患者转运") {
       //患者其他服务业务
       this.radioValueZy = +arr[1];
-    } else if (this.currentTabIndex == "259") {
+    } else if (this.currentTabIndex == "物品配送") {
       //其他临床服务
       this.radioValueQt = +arr[1];
     }

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

@@ -32,7 +32,7 @@
         <div class="left">
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
           <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
-          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
+          <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole || pageConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
           <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">

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

@@ -94,7 +94,7 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
-        <div class="mb8 w100" *ngIf="association.value == 'patientTransport'||association.value == 'specimen'||association.value == 'other'">
+        <div class="mb8 w100" *ngIf="association.value == 'patientTransport'||association.value == 'specimen'||association.value == 'other'||association.value == 'ordinary'">
           <nz-form-label class="label" nzRequired>调度台是否可以新建工单</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="autoFlag">
             <label nz-radio nzValue='1'>是</label>

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

@@ -2042,6 +2042,10 @@ export class TaskTypeManagementComponent implements OnInit {
     if (this.association.value == "other") {
       this.jyfsType = "other_method";
     }
+    //万能交接服务
+    if (this.association.value == "ordinary") {
+      this.jyfsType = "ordinary_strategy";
+    }
     this.yNum++;
     this.yLoading = true;
     that.mainService.getDictionary("list", this.jyfsType).subscribe((data) => {