bugfix

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

@@ -1097,7 +1097,7 @@
                               <nz-form-control class="control" [nzSpan]="16" nzErrorTip="请选择患者信息！">
                                 <nz-select style="width: 160px" formControlName="patient" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchPatientList(radioValueZy == deathTasktypeId && endDeptZy !== null ? endDeptZy : applyDept, $event)" nzAllowClear nzPlaceHolder="请选择患者信息" [(ngModel)]="patientZy" (ngModelChange)="selectPatientZy($event)">
                                   <ng-container *ngFor="let option of patientList">
-                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum || '') + '床 ' + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
+                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum ? option.bednum + '床 ' : '') + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
                                   </ng-container>
                                   <nz-option *ngIf="isLoadingPatient" nzDisabled nzCustomContent>
                                     <i nz-icon nzType="loading" class="loading-icon"></i>

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

@@ -2745,9 +2745,9 @@ export class FuwutaiComponent implements OnInit {
       this.isLoadingPatient = false;
       if (result["state"] == 200) {
         this.patientList = result["data"];
-        if (this.patientList.length) {
-          this.patientList = this.patientList.filter((item) => !!item.bednum);
-        }
+        // if (this.patientList.length) {
+        //   this.patientList = this.patientList.filter((item) => !!item.bednum);
+        // }
       }
     });
   }
@@ -3619,7 +3619,7 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptZy = null;
     this.patientZy = null;
     this.goodsNow = [];
-    this.patientList = [];
+    // this.patientList = [];
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
@@ -3738,12 +3738,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-		
+
 		if(!this.incidentModel.source){
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3799,7 +3799,7 @@ export class FuwutaiComponent implements OnInit {
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3986,12 +3986,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-		
+
 		if(!this.incidentModel.source){
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;