seimin 1 week ago
parent
commit
cbef47604b

+ 1 - 1
src/app/views/fuwutai/fuwutai.component.html

@@ -1097,7 +1097,7 @@
1097 1097
                               <nz-form-control class="control" [nzSpan]="16" nzErrorTip="请选择患者信息!">
1098 1098
                                 <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)">
1099 1099
                                   <ng-container *ngFor="let option of patientList">
1100
-                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum || '') + '床 ' + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
1100
+                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum ? option.bednum + '床 ' : '') + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
1101 1101
                                   </ng-container>
1102 1102
                                   <nz-option *ngIf="isLoadingPatient" nzDisabled nzCustomContent>
1103 1103
                                     <i nz-icon nzType="loading" class="loading-icon"></i>

+ 9 - 9
src/app/views/fuwutai/fuwutai.component.ts

@@ -2745,9 +2745,9 @@ export class FuwutaiComponent implements OnInit {
2745 2745
       this.isLoadingPatient = false;
2746 2746
       if (result["state"] == 200) {
2747 2747
         this.patientList = result["data"];
2748
-        if (this.patientList.length) {
2749
-          this.patientList = this.patientList.filter((item) => !!item.bednum);
2750
-        }
2748
+        // if (this.patientList.length) {
2749
+        //   this.patientList = this.patientList.filter((item) => !!item.bednum);
2750
+        // }
2751 2751
       }
2752 2752
     });
2753 2753
   }
@@ -3619,7 +3619,7 @@ export class FuwutaiComponent implements OnInit {
3619 3619
     this.endDeptZy = null;
3620 3620
     this.patientZy = null;
3621 3621
     this.goodsNow = [];
3622
-    this.patientList = [];
3622
+    // this.patientList = [];
3623 3623
     this.workOrderRemark = "";
3624 3624
     this.workOrderRemarkZy = "";
3625 3625
     this.deptZyList["startDept"] = [];
@@ -3738,12 +3738,12 @@ export class FuwutaiComponent implements OnInit {
3738 3738
       this.msg.warning('请选择优先级!');
3739 3739
       return;
3740 3740
     }
3741
-		
3741
+
3742 3742
 		if(!this.incidentModel.source){
3743 3743
 		  this.msg.warning('请选择事件来源!');
3744 3744
 		  return;
3745 3745
 		}
3746
-		
3746
+
3747 3747
     if(!this.incidentModel.description){
3748 3748
       this.msg.warning('请选择故障描述!');
3749 3749
       return;
@@ -3799,7 +3799,7 @@ export class FuwutaiComponent implements OnInit {
3799 3799
 		  this.msg.warning('请选择事件来源!');
3800 3800
 		  return;
3801 3801
 		}
3802
-		
3802
+
3803 3803
     if(!this.incidentModel.description){
3804 3804
       this.msg.warning('请选择故障描述!');
3805 3805
       return;
@@ -3986,12 +3986,12 @@ export class FuwutaiComponent implements OnInit {
3986 3986
       this.msg.warning('请选择优先级!');
3987 3987
       return;
3988 3988
     }
3989
-		
3989
+
3990 3990
 		if(!this.incidentModel.source){
3991 3991
 		  this.msg.warning('请选择事件来源!');
3992 3992
 		  return;
3993 3993
 		}
3994
-		
3994
+
3995 3995
     if(!this.incidentModel.description){
3996 3996
       this.msg.warning('请选择故障描述!');
3997 3997
       return;