|
@@ -250,7 +250,7 @@
|
250
|
250
|
nzTooltipPlacement="right"
|
251
|
251
|
[nzMouseEnterDelay]="1"
|
252
|
252
|
(mouseenter)="getRecentInfo(item.patientCode)"
|
253
|
|
- >{{ item.patientName }}({{ item.bedNum }})</span
|
|
253
|
+ >{{ item.patientName }}({{ currentDept.typeValue == 'outpatientService' ? item.cardNo : item.bedNum }})</span
|
254
|
254
|
>
|
255
|
255
|
</div>
|
256
|
256
|
<div
|
|
@@ -279,10 +279,13 @@
|
279
|
279
|
"
|
280
|
280
|
></span>
|
281
|
281
|
<span nz-col nzSpan="2"></span>
|
282
|
|
- <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
|
283
|
|
- <span nz-col nzSpan="6" class="txtR"
|
284
|
|
- >待检 {{ item.watingCount }}</span
|
285
|
|
- >
|
|
282
|
+ <ng-container *ngIf="currentDept.typeValue == 'outpatientService'">
|
|
283
|
+ <span nz-col nzSpan="18">{{ item.identityCardNo }}</span>
|
|
284
|
+ </ng-container>
|
|
285
|
+ <ng-container *ngIf="!(currentDept.typeValue == 'outpatientService')">
|
|
286
|
+ <span nz-col nzSpan="12">{{ item.residenceNo }}</span>
|
|
287
|
+ <span nz-col nzSpan="6" class="txtR">待检 {{ item.watingCount }}</span>
|
|
288
|
+ </ng-container>
|
286
|
289
|
<span nz-col nzSpan="2"></span>
|
287
|
290
|
</div>
|
288
|
291
|
<div
|