Browse Source

病理封面打印开发

maotao 2 months ago
parent
commit
b59a7dd9bc

+ 2 - 2
src/app/share/pathology-add/pathology-add.component.html

@@ -545,11 +545,11 @@
545 545
 				<div style="margin-top:10px;display: flex;justify-content: space-between;">
546 546
 					<div *ngIf="detailsData.residenceNo">住院号: {{detailsData.residenceNo}}</div>
547 547
 					<div *ngIf="!detailsData.residenceNo">门诊号: {{detailsData.patientDTO.patientCode}}</div>
548
-					<div>床号: {{detailsData.patientDTO.bedNum}}床</div>
548
+					<div>床号: {{detailsData.patientDTO.bedNum || '-'}}床</div>
549 549
 				</div>
550 550
 				<div style="margin-top:10px;display: flex;justify-content: space-between;">
551 551
 					<div>科室: {{detailsData.patientDTO.department.dept}}</div>
552
-					<div>标本数: {{detailsData.specimenNum}}</div>
552
+					<div>标本数: {{specimenList.length}}</div>
553 553
 				</div>
554 554
 				<div style="margin-top:10px;display: flex;justify-content: space-between;">
555 555
 					<div>日期: {{detailsData.inVitroTime|date:'yyyy-MM-dd'}}</div>

+ 1 - 0
src/app/views/pathology-check/pathology-check.component.ts

@@ -676,6 +676,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
676 676
 			this.message.success('操作成功')
677 677
 			setTimeout(_=>{
678 678
 				this.btnMultiLoading = false;
679
+				this.activeIndex = 0;
679 680
 				this.hideMultiModal()
680 681
 			},500)
681 682
 		});

+ 3 - 3
src/app/views/pathology-sample/pathology-sample.component.html

@@ -175,7 +175,7 @@
175 175
 					<button *ngIf="statusValue==1" class="btn btn-right" nz-button nzType="primary" (click)="submitForm('print')" [nzLoading]="btnLoading">标本打印</button>
176 176
 					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
177 177
 					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
178
-					<button class="btn btn-left" *ngIf="(statusValue==2 || statusValue==3 || statusValue==4) && specimenList.length>1" nz-button nzType="primary" (click)="coverSubmitForm()">封面打印</button>
178
+					<!-- <button class="btn btn-left" *ngIf="(statusValue==2 || statusValue==3 || statusValue==4) && specimenList.length>1" nz-button nzType="primary" (click)="coverSubmitForm()">封面打印</button> -->
179 179
 				</div>
180 180
 			</div>
181 181
 			
@@ -670,11 +670,11 @@
670 670
 			<div style="margin-top:10px;display: flex;justify-content: space-between;">
671 671
 				<div *ngIf="detailsData.residenceNo">住院号: {{detailsData.residenceNo}}</div>
672 672
 				<div *ngIf="!detailsData.residenceNo">门诊号: {{detailsData.patientDTO.patientCode}}</div>
673
-				<div>床号: {{detailsData.patientDTO.bedNum}}床</div>
673
+				<div>床号: {{detailsData.patientDTO.bedNum || '-'}}床</div>
674 674
 			</div>
675 675
 			<div style="margin-top:10px;display: flex;justify-content: space-between;">
676 676
 				<div>科室: {{detailsData.patientDTO.department.dept}}</div>
677
-				<div>标本数: {{detailsData.specimenNum}}</div>
677
+				<div>标本数: {{specimenList.length}}</div>
678 678
 			</div>
679 679
 			<div style="margin-top:10px;display: flex;justify-content: space-between;">
680 680
 				<div>日期: {{detailsData.inVitroTime|date:'yyyy-MM-dd'}}</div>