优化

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

@@ -110,7 +110,7 @@
       <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag1 && !flagList.itsmFlag1) || flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag1 }">
         <virtual-scroller [items]="unassignedList" #osComponentRef2 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef2.viewPortItems">
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef2.viewPortItems;trackBy:trackById">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -265,7 +265,7 @@
       <div class="cots_body weifenpai twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag1 && !flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <virtual-scroller [items]="unassignedList" #osComponentRef1 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef1.viewPortItems">
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef1.viewPortItems;trackBy:trackById">
               <div class="left_cots" (click)="openDetails(data.data)">
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -323,7 +323,7 @@
       <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag2 && !flagList.itsmFlag2) || flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag2 }">
         <virtual-scroller [items]="arriveList" #osComponentRef3 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="arriveList.length && !loading2">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef3.viewPortItems">
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef3.viewPortItems;trackBy:trackById">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -454,8 +454,8 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
-                  <input type="button" *ngIf="computedSubstitution(data.data)" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
-                  <input type="button" *ngIf="computedReceive(data.data)" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" />
+                  <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
+                  <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗？','接单','receive')" />
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
@@ -474,7 +474,7 @@
       <div class="cots_body daidaoda twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag2 && !flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <virtual-scroller [items]="arriveList" #osComponentRef4 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="arriveList.length && !loading2">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef4.viewPortItems">
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef4.viewPortItems;trackBy:trackById">
               <div class="left_cots" (click)="openDetails(data)">
                 <!-- 工单 -->
                 <div class="gongdan">
@@ -527,7 +527,7 @@
       <div class="cots_body zhixingzhong" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag3 && !flagList.itsmFlag3) || flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1', top185_1: flagList.itsmFlag3 }">
         <virtual-scroller [items]="executionList" #osComponentRef5 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="executionList.length && !loading3">
-            <div class="list" *ngFor="let data of osComponentRef5.viewPortItems">
+            <div class="list" *ngFor="let data of osComponentRef5.viewPortItems;trackBy:trackById">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
                 <div class="left_cots" (click)="openDetails(data.data)">
@@ -658,8 +658,8 @@
                   </div>
                 </div>
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
-                  <input type="button" *ngIf="computedSubstitution(data.data)" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
-                  <input type="button" *ngIf="computedHandle(data.data)" class="top_bot" value="处理" (click)="handle(data.data)" />
+                  <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
+                  <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" />
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
@@ -678,7 +678,7 @@
       <div class="cots_body zhixingzhong twoCol" *ngIf="txtLabelCol == 2 && flagList.hsmsFlag3 && !flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != '1' }">
         <virtual-scroller [items]="executionList" #osComponentRef6 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="executionList.length && !loading3">
-            <div class="list" *ngFor="let data of osComponentRef6.viewPortItems">
+            <div class="list" *ngFor="let data of osComponentRef6.viewPortItems;trackBy:trackById">
               <div class="left_cots" (click)="openDetails(data)">
                 <!-- 工单 -->
                 <div class="gongdan">

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

@@ -17,7 +17,7 @@ import { NzMessageService } from "ng-zorro-antd/message";
 import { NzNotificationService } from "ng-zorro-antd/notification";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { Subject, forkJoin } from "rxjs";
-import { debounceTime, filter } from "rxjs/operators";
+import { debounceTime, filter, map } from "rxjs/operators";
 import { SourceId } from "src/app/type/types";
 import { ToolService } from 'src/app/services/tool.service';
 import { addDays, differenceInCalendarDays, getHours, getMinutes, setMinutes, parse, format, addHours } from 'date-fns';
@@ -692,7 +692,6 @@ export class FuwutaiComponent implements OnInit {
       workOrderRemark: [null], //工单备注
     });
 
-
     this.getWebsocketSer();
     this.initRole();
     this.initLogin();
@@ -713,10 +712,23 @@ export class FuwutaiComponent implements OnInit {
     this.getInspectAndPatientTransportConfigTasktype();
   }
   ngOnDestroy() {
+    document.removeEventListener("keydown", this.quickShowNewOrder.bind(this));
+    this.quickShowNewOrder = null;
     clearTimeout(this.refreshTimerId);
     this.phones.closeWs(true);
     this.sers.closeWs(true);
   }
+  ngAfterViewInit() {
+    // 快捷键打开新建工单
+    document.addEventListener("keydown", this.quickShowNewOrder.bind(this));
+  }
+  // 快捷键打开新建工单
+  quickShowNewOrder(e){
+    if (e.ctrlKey && e.key == "s") {
+      this.showNewOrder();
+      e.preventDefault();
+    }
+  }
   unassignedSearchCon: string = ""; //未分派搜索框内容
   arriveSearchCon: string = ""; //待到达搜索框内容
   executionSearchCon: string = ""; //执行中搜索框内容
@@ -843,6 +855,8 @@ export class FuwutaiComponent implements OnInit {
     this.flagList.itsmFlag2 = this.itsmData.mdv2Switch;
     this.flagList.itsmFlag3 = this.itsmData.mdv2Switch;
     this.getHospitalConfigList('allowNucleicAcidPrinting');
+    this.getConfigTasktype();
+    this.patientLogTasktype();
   }
 
   // 保存工单信息
@@ -1296,7 +1310,7 @@ export class FuwutaiComponent implements OnInit {
   getVisitList(){
     let postData: any = {
       idx: 0,
-      sum: 9999,
+      sum: 1,
       incident: {
         "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
         "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
@@ -1319,7 +1333,7 @@ export class FuwutaiComponent implements OnInit {
   getMessageList(){
     let postData: any = {
       idx: 0,
-      sum: 9999,
+      sum: 1,
       hjzxRecord: {},
     };
 
@@ -1330,6 +1344,11 @@ export class FuwutaiComponent implements OnInit {
       });
   }
 
+  //trackBy
+  trackById(index, item) {
+    return item.type + item.data.id;
+  }
+
   // 获取三个状态数据数据
   loading1 = true;
   loading2 = true;
@@ -1414,18 +1433,33 @@ export class FuwutaiComponent implements OnInit {
     }
 
     console.log(postData);
-    this.mainService.orderList(postData).subscribe((data:any) => {
+    this.mainService.orderList(postData).pipe(map((v:any) => {
+      if(Array.isArray(v.data)){
+        v.data.map(vv => {
+          if(vv.type === 'mdv2' && vv.data.department){
+            vv.data.department = {
+              id: vv.data.department.id,
+              dept: vv.data.department.dept,
+              manyPhone: vv.data.department.manyPhone,
+            }
+          }
+          return vv;
+        })
+      }else{
+        v = [];
+      }
+      return v;
+    })).subscribe((data:any) => {
         if (stateId == 1) {
           // 未分派
-          this.unassignedList = data.data || [];
-          this.unassignedList.forEach((item) => {
+          let unassignedList = data.data || [];
+          unassignedList.forEach((item) => {
             item.checked = false;
           });
+          this.unassignedList = unassignedList;
           this.batchType = false;
           this.allUnassignedList = false;
-          this.unassignedListClone = JSON.parse(
-            JSON.stringify(this.unassignedList)
-          );
+          this.unassignedListClone = cloneDeep(this.unassignedList);
 
           if (this.audioNotDispatched && this.unassignedList.length > 0 && isAudio) {
             //语音播报开启
@@ -1439,17 +1473,29 @@ export class FuwutaiComponent implements OnInit {
           this.loading1 = false;
         } else if (stateId == 2) {
           // 待到达
-          this.arriveList = data.data || [];
-          this.arriveList.forEach((item) => {
+          let arriveList = data.data || [];
+          arriveList.forEach((item) => {
             item.checked = false;
+            if(item.type === 'mdv2'){
+              item.computedSubstitutionFlag = this.computedSubstitution(item.data)
+              item.computedReceiveFlag = this.computedReceive(item.data)
+            }
           });
+          this.arriveList = arriveList;
           this.batchType1 = false;
           this.allArriveList = false;
-          this.arriveListClone = JSON.parse(JSON.stringify(this.arriveList));
+          this.arriveListClone = cloneDeep(this.arriveList);
           this.loading2 = false;
         } else if (stateId == 3) {
           // 执行中
-          this.executionList = data.data || [];
+          let executionList = data.data || [];
+          executionList.forEach((item) => {
+            if(item.type === 'mdv2'){
+              item.computedSubstitutionFlag = this.computedSubstitution(item.data)
+              item.computedHandleFlag = this.computedHandle(item.data)
+            }
+          });
+          this.executionList = executionList;
           this.loading3 = false;
         }
 
@@ -1463,7 +1509,6 @@ export class FuwutaiComponent implements OnInit {
   windowResize() {
     let fixedMenu = document.getElementById("fixedMenu");
     if (!fixedMenu) return;
-    let top = document.querySelector("#top");
     window.addEventListener("resize", () => {
       let wh = window.innerHeight;
       let _y = parseFloat(fixedMenu.style.top);
@@ -1546,22 +1591,16 @@ export class FuwutaiComponent implements OnInit {
   }
   // 未分派搜索
   searchUnassigned() {
-    // let that = this;
-    // if (!that.unassignedSearchCon) return;
     this.getOrderList(1);
   }
 
   // 待到达搜索
   searchArrive() {
-    // let that = this;
-    // if (!that.arriveSearchCon) return;
     this.getOrderList(2);
   }
 
   // 执行中搜索
   searchExecution() {
-    // let that = this;
-    // if (!that.executionSearchCon) return;
     this.getOrderList(3);
   }
 
@@ -1667,15 +1706,6 @@ export class FuwutaiComponent implements OnInit {
     this.initTopCount();
   }
 
-  ngAfterViewInit() {
-    // 快捷键打开新建工单
-    document.addEventListener("keydown", (e) => {
-      if (e.ctrlKey && e.key == "s") {
-        this.showNewOrder();
-        e.preventDefault();
-      }
-    });
-  }
   // 获取配置文件写死的任务类型ID(送病人回病房9)，选择此任务类型的话，患者信息从终点科室获取
   getConfigTasktypeLoading: boolean = false;
   getConfigTasktype() {
@@ -1691,13 +1721,21 @@ export class FuwutaiComponent implements OnInit {
       },
     };
     this.getConfigTasktypeLoading = true;
-    return this.mainService
-      .getFetchDataList("simple/data", "hospitalConfig", postData)
-      .toPromise();
+    this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(res => {
+      this.getConfigTasktypeLoading = false;
+        if (res && res.status == 200) {
+          this.deathTasktypeId = res.list.length ? res.list[0].value : undefined;
+        } else {
+          this.msg.error('请求数据失败');
+        }
+    });
   }
   // 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
   patientLogTasktypeLoading: boolean = false;
   patientLogTasktype() {
+    if(!this.hsmsData.hsmsSwitch){
+      return;
+    }
     let postData = {
       idx: 0,
       sum: 1,
@@ -1706,9 +1744,14 @@ export class FuwutaiComponent implements OnInit {
       },
     };
     this.patientLogTasktypeLoading = true;
-    return this.mainService
-      .getFetchDataList("simple/data", "systemConfiguration", postData)
-      .toPromise();
+    this.mainService.getFetchDataList("simple/data", "systemConfiguration", postData).subscribe(res => {
+      this.patientLogTasktypeLoading = false;
+      if (res.status == 200) {
+        this.deathTasktypeIdPatient = res.list.length ? res.list[0].valueconfig : undefined;
+      } else {
+        this.msg.error('请求数据失败');
+      }
+    });
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
@@ -1752,20 +1795,15 @@ export class FuwutaiComponent implements OnInit {
     this.clickYYFlag = false;
 
     if(!isInit && this.hsmsData.hsmsSwitch){
-      // 送病人回病房
-      let deathTasktypeResult: any = await this.getConfigTasktype();
-      this.getConfigTasktypeLoading = false;
-      if (deathTasktypeResult && deathTasktypeResult.status == 200) {
-        this.deathTasktypeId = deathTasktypeResult.list[0].value;
-      } else {
+      if(!this.deathTasktypeId){
+        // 送病人回病房
+        this.msg.error('【送病人回病房】未配置');
         return;
       }
-      // 转出院记录
-      let deathTasktypePatientResult: any = await this.patientLogTasktype();
-      this.patientLogTasktypeLoading = false;
-      if (deathTasktypePatientResult.status == 200) {
-        this.deathTasktypeIdPatient = deathTasktypePatientResult.list[0].valueconfig;
-      } else {
+
+      if(!this.deathTasktypeIdPatient){
+        // 转出院记录
+        this.msg.error('【转出院记录】未配置');
         return;
       }
     }