Merge branch 'master' into develop

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

@@ -154,6 +154,7 @@
 			<button class="btn btn-right" nz-button nzType="primary" (click)="temporary('submit')" [nzLoading]="zcLoading">保存</button>
 		  <button class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
 			<button class="btn btn-right" nz-button nzType="primary" (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
+			<button class="btn btn-right" *ngIf="specimenList.length>1" nz-button nzType="primary" (click)="coverSubmitForm()">封面打印</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
 		</div>
 	</div>
@@ -438,7 +439,7 @@
 			</div> -->
 			
 			<!-- 12.11新版打印样式 -->
-			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==1 && printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==1 && printData && printData.specimenList && printData.specimenList.length>0 && coverType==0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div>
 					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
@@ -491,7 +492,7 @@
 			</div>
 			
 			<!-- 小尺寸 20*30-->
-			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==2 && printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==2 && printData && printData.specimenList && printData.specimenList.length>0 && coverType==0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 					<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
 					 <div style="width: 35%;">
@@ -520,5 +521,41 @@
 				 <div style="height: 18px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
+			
+			<!-- 封面打印 -->
+			<div style="font-size: 14px;" *ngIf="coverType==1">
+			 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
+				 <div style="width: 40%;">
+					<div style="height: 60px;width: 100%;text-align: center;">
+					 <img style="max-width: 100%;max-height: 100%;" [src]="detailsData.barCode" alt="">
+					 <div>{{detailsData.applyCode}}</div>
+					</div>
+				 </div>
+				 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;flex-wrap: wrap;justify-content: right;">
+					 <img style="max-width: 70%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+					 <div style="font-size: 18px;width: 100%;font-weight: bold;text-align: right;">病&nbsp;&nbsp;理&nbsp;&nbsp;申&nbsp;&nbsp;请&nbsp;&nbsp;单</div>
+				 </div>
+			 </div>
+			 <div>
+				<div style="margin-top:20px;display: flex;justify-content: space-between;">
+					<div>患者: {{detailsData.patientDTO.patientName}}</div>
+					<div>性别: {{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
+					<div>年龄: {{detailsData.patientDTO.age||'-'}}岁</div>
+				</div>
+				<div style="margin-top:10px;display: flex;justify-content: space-between;">
+					<div *ngIf="detailsData.residenceNo">住院号: {{detailsData.residenceNo}}</div>
+					<div *ngIf="!detailsData.residenceNo">门诊号: {{detailsData.patientDTO.patientCode}}</div>
+					<div>床号: {{detailsData.patientDTO.bedNum || '-'}}床</div>
+				</div>
+				<div style="margin-top:10px;display: flex;justify-content: space-between;">
+					<div>科室: {{detailsData.patientDTO.department.dept}}</div>
+					<div>标本数: {{specimenList.length}}</div>
+				</div>
+				<div style="margin-top:10px;display: flex;justify-content: space-between;">
+					<div>日期: {{detailsData.inVitroTime|date:'yyyy-MM-dd'}}</div>
+					<div style="font-weight: bold;text-align: right;">{{detailsData.pathologyFormType==1 ? '速' : '普'}}</div>
+				</div>
+			 </div>
+			</div>
 		</div>
   </div>

src/app/share/pathology-add/pathology-add.component.ts

@@ -922,6 +922,7 @@ export class PathologyAddComponent implements OnInit {
 			},
 			operation:'',
 			pathologySpecimenIds:'',
+			deptType:'surgery'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
@@ -942,6 +943,7 @@ export class PathologyAddComponent implements OnInit {
 			delete data.pathologyForm.fixationTime
 			delete data.pathologyForm.specimenFixingLiquid
 		}
+		this.coverType = 0
 		this.printLoading = true;
 		this.mainService
 		  .pathologyPrint(data)
@@ -1178,6 +1180,7 @@ export class PathologyAddComponent implements OnInit {
 								id:this.validateForm.value.specimenGenre
 							}
 						},
+						deptType:'surgery',
 						operation:'',
 						pathologySpecimenIds:'',
 					};
@@ -1249,8 +1252,9 @@ export class PathologyAddComponent implements OnInit {
 					pathologyInspectIds:this.validateForm.value.project.join(','),
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
-					}
-				}
+					},
+				},
+				deptType:'surgery'
 			};
 			data.pathologyForm.specimenNum = this.specimenList.length
 			delete data.pathologyForm.patientDTO
@@ -1262,8 +1266,30 @@ export class PathologyAddComponent implements OnInit {
 		}
 	}
 	
+	// 封面打印
+	coverType:any;
+	coverSubmitForm(){
+		this.coverType = 1
+		if(this.detailsData.barCode){
+			this.detailsData.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(this.detailsData.barCode)
+		}
+		setTimeout(() => {
+		  const printContent = document.getElementById("report");
+		  const WindowPrt = window.open("", "", "width=100,height=1000");
+			WindowPrt.document.body.innerHTML = printContent.innerHTML;
+			setTimeout(_=>{
+				WindowPrt.document.close();
+				WindowPrt.focus();
+				WindowPrt.print();
+				WindowPrt.close();
+				this.hideModal();
+			},500)
+		}, 500);
+	}
+	
 	// 打印
 	printFun(data){
+		this.coverType = 0
 		this.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {

src/app/share/pathology-detail/pathology-detail.component.html

@@ -312,6 +312,8 @@
 	          <thead>
 	            <tr class="thead">
 								<th>标本名称</th>
+								<th>系统</th>
+								<th>部位</th>
 	              <th>编码</th>
 	              <th>备注</th>
 	              <th>离体时间</th>
@@ -323,6 +325,8 @@
 	          <tbody>
 	            <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
 	              <td>{{ data.specimenCode }}</td>
 	              <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>

src/app/share/pathology-detail/pathology-detail.component.ts

@@ -95,8 +95,9 @@ export class PathologyDetailComponent implements OnInit {
 				...this.detailsData,
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
-				hosId: this.hosId || "" 
-			}
+				hosId: this.hosId || "" ,
+			},
+			deptType:'surgery'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO

src/app/views/batch-distribution/batch-distribution.component.html

@@ -217,29 +217,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="specimenData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [nzLoading]="loading1">
+					  <thead>
+					    <tr class="thead">
 								<th>标本名称</th>
-								<th>编码</th>
-								<th>备注</th>
-								<th>离体时间</th>
-								<th>离体操作人</th>
-								<th>固定时间</th>
-								<th>固定操作人</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr *ngFor="let data of specimenData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of specimenData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
+					      <td>{{ data.specimenCode }}</td>
+					      <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
 								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
-							</tr>
-						</tbody>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

src/app/views/pathology-check/pathology-check.component.ts

@@ -581,6 +581,9 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 					this.multiModal = true
 					this.codeMultiData = res.data[0].pathologySpecimenDTOList
 					localStorage.setItem("scanCodeData",JSON.stringify(res))
+					if(this.muArr.length === this.codeMultiData.length){
+						this.submitMultiForm()
+					}
 				}else{
 					this.notification.create('success','提示',res.msg);
 					this.activeIndex = 0
@@ -640,6 +643,9 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 					this.multiModal = true
 					localStorage.setItem("scanCodeData",JSON.stringify(res))
 					this.errorMultiMsg = null
+					if(this.muArr.length === this.codeMultiData.length){
+						this.submitMultiForm()
+					}
 				}else{
 					this.errorMultiMsg = res.msg
 				}
@@ -670,6 +676,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			this.message.success('操作成功')
 			setTimeout(_=>{
 				this.btnMultiLoading = false;
+				this.activeIndex = 0;
 				this.hideMultiModal()
 			},500)
 		});

src/app/views/pathology-communication-book/pathology-communication-book.component.html

@@ -110,7 +110,7 @@
 			      <thead>
 			        <tr class="thead">
 			          <th nzWidth="14%">申请单号</th>
-								<th>状态</th>
+								<th nzWidth="100px">状态</th>
 			          <th>患者姓名</th>
 			          <th>住院号</th>
 			          <th nzWidth="100px">部位</th>
@@ -131,7 +131,7 @@
 			          <td>{{ data.patientDTO.residenceNo}}</td>
 			          <td>{{ data.takePart}}</td>
 			          <td>{{ data.specimenNum}}</td>
-			          <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
+			          <td>{{ data.patientDTO.department?data.patientDTO.department.dept : '-'}}</td>
 								<td>{{ data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 								<td>{{ data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 								<td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
@@ -164,7 +164,7 @@
 								[nzIndeterminate]="isIndeterminate"
 								(nzCheckedChange)="checkAll($event)"></th>
 				        <th nzWidth="14%">申请单号</th>
-								<th>状态</th>
+								<th nzWidth="100px">状态</th>
 				        <th>患者姓名</th>
 				        <th>住院号</th>
 				        <th nzWidth="100px">部位</th>
@@ -191,7 +191,7 @@
 				        <td>{{ data.patientDTO.residenceNo}}</td>
 				        <td>{{ data.takePart}}</td>
 				        <td>{{ data.specimenNum}}</td>
-				        <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
+				        <td>{{ data.patientDTO.department?data.patientDTO.department.dept : '-'}}</td>
 								<td>{{ data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 								<td>{{ data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 								<td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
@@ -380,29 +380,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [nzLoading]="loading1">
+					  <thead>
+					    <tr class="thead">
 								<th>标本名称</th>
-								<th>编码</th>
-								<th>备注</th>
-								<th>离体时间</th>
-								<th>离体操作人</th>
-								<th>固定时间</th>
-								<th>固定操作人</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr *ngFor="let data of viewData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
+					      <td>{{ data.specimenCode }}</td>
+					      <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
 								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
-							</tr>
-						</tbody>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

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

@@ -173,8 +173,9 @@
 				</div>
 				<div class="display_flex justify-content_flex-center bottom-btn">
 					<button *ngIf="statusValue==1" class="btn btn-right" nz-button nzType="primary" (click)="submitForm('print')" [nzLoading]="btnLoading">标本打印</button>
-					<button *ngIf="statusValue==2 || statusValue==3" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
-					<button *ngIf="statusValue==2 || statusValue==3" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
+					<!-- <button class="btn btn-left" *ngIf="(statusValue==2 || statusValue==3 || statusValue==4) && specimenList.length>1" nz-button nzType="primary" (click)="coverSubmitForm()">封面打印</button> -->
 				</div>
 			</div>
 			
@@ -247,7 +248,7 @@
 		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyFormDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
 			<div class="tabs">
 				<div class="tabs-item">
-					<div class="tabs-item-item" *ngIf="adviceItem.status.value < 7" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">快捷标本填写</div>
+					<div class="tabs-item-item" *ngIf="adviceItem.status.value < 5" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">快捷标本填写</div>
 					<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">病理闭环</div>
 				</div>
 			</div>
@@ -454,29 +455,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [nzLoading]="loading1">
+					  <thead>
+					    <tr class="thead">
 								<th>标本名称</th>
-								<th>编码</th>
-								<th>备注</th>
-								<th>离体时间</th>
-								<th>离体操作人</th>
-								<th>固定时间</th>
-								<th>固定操作人</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr *ngFor="let data of viewData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
+					      <td>{{ data.specimenCode }}</td>
+					      <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
 								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
-							</tr>
-						</tbody>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>
@@ -508,7 +513,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization && detailsData.pathologyFormType==0">
+				<nz-form-item *ngIf="ifImmobilization && detailsData && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				  <nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group style="display: flex;gap: 10px">
@@ -521,7 +526,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization">
+				<nz-form-item *ngIf="ifImmobilization && detailsData && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">
 				    <nz-input-group>
@@ -559,7 +564,7 @@
 <div id="report" style="display: none;">
 	<div class="monad">
 		<!-- 大尺寸 80*60-->
-		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
+		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0 && coverType==0">
 			<div *ngFor="let data of printData.specimenList; let index=index;">
 			 <div>
 				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
@@ -612,7 +617,7 @@
 		</div>
 		
 		<!-- 小尺寸 20*30-->
-		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0">
+		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==2 && printData && printData.specimenList && printData.specimenList.length>0 && coverType==0">
 			<div *ngFor="let data of printData.specimenList; let index=index;">
 				<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
 				 <div style="width: 35%;">
@@ -641,6 +646,42 @@
 			 <div style="height: 18px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 			</div>
 		</div>
+		
+		<!-- 封面打印 -->
+		<div style="font-size: 14px;" *ngIf="coverType==1">
+		 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
+			 <div style="width: 40%;">
+				<div style="height: 60px;width: 100%;text-align: center;">
+				 <img style="max-width: 100%;max-height: 100%;" [src]="detailsData.barCode" alt="">
+				 <div>{{detailsData.applyCode}}</div>
+				</div>
+			 </div>
+			 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;flex-wrap: wrap;justify-content: right;">
+				 <img style="max-width: 70%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+				 <div style="font-size: 18px;width: 100%;font-weight: bold;text-align: right;">病&nbsp;&nbsp;理&nbsp;&nbsp;申&nbsp;&nbsp;请&nbsp;&nbsp;单</div>
+			 </div>
+		 </div>
+		 <div>
+			<div style="margin-top:20px;display: flex;justify-content: space-between;">
+				<div>患者: {{detailsData.patientDTO.patientName}}</div>
+				<div>性别: {{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
+				<div>年龄: {{detailsData.patientDTO.age||'-'}}岁</div>
+			</div>
+			<div style="margin-top:10px;display: flex;justify-content: space-between;">
+				<div *ngIf="detailsData.residenceNo">住院号: {{detailsData.residenceNo}}</div>
+				<div *ngIf="!detailsData.residenceNo">门诊号: {{detailsData.patientDTO.patientCode}}</div>
+				<div>床号: {{detailsData.patientDTO.bedNum || '-'}}床</div>
+			</div>
+			<div style="margin-top:10px;display: flex;justify-content: space-between;">
+				<div>科室: {{detailsData.patientDTO.department.dept}}</div>
+				<div>标本数: {{specimenList.length}}</div>
+			</div>
+			<div style="margin-top:10px;display: flex;justify-content: space-between;">
+				<div>日期: {{detailsData.inVitroTime|date:'yyyy-MM-dd'}}</div>
+				<div style="font-weight: bold;text-align: right;">{{detailsData.pathologyFormType==1 ? '速' : '普'}}</div>
+			</div>
+		 </div>
+		</div>
 	</div>
 </div>
 	

src/app/views/pathology-sample/pathology-sample.component.less

@@ -761,6 +761,9 @@
 					.btn-right{
 						margin-right: 10px;
 					}
+					.btn-left{
+						margin-left: 10px;
+					}
 				}
 			}
 		}

src/app/views/pathology-sample/pathology-sample.component.ts

@@ -389,7 +389,7 @@ export class PathologySampleComponent implements OnInit {
 	listClick(item,index){
 		this.leftIndex = index
 		this.adviceItem = item
-		if(item.status.value > 6){
+		if(item.status.value > 4){
 			this.activeIndex = 1
 		}
 		if(item.id){
@@ -587,6 +587,7 @@ export class PathologySampleComponent implements OnInit {
 			},
 			operation:'',
 			pathologySpecimenIds:'',
+			deptType:'outpatient'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
@@ -608,6 +609,7 @@ export class PathologySampleComponent implements OnInit {
 			delete data.pathologyForm.specimenFixingLiquid
 		}
 		this.printLoading = true;
+		this.coverType = 0;
 		this.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {
@@ -1369,6 +1371,7 @@ export class PathologySampleComponent implements OnInit {
 						},
 						operation:'',
 						pathologySpecimenIds:'',
+						deptType:'outpatient'
 					};
 					data.pathologyForm.specimenNum = this.specimenList.length
 					if(this.operation=='addPrint' || this.operation=='wholePrint'){
@@ -1443,8 +1446,9 @@ export class PathologySampleComponent implements OnInit {
 					pathologyInspectIds:this.validateForm.value.project,
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
-					}
-				}
+					},
+				},
+				deptType:'outpatient'
 			};
 			data.pathologyForm.specimenNum = this.specimenList.length
 			delete data.pathologyForm.patientDTO
@@ -1456,8 +1460,29 @@ export class PathologySampleComponent implements OnInit {
 		}
 	}
 	
+	// 封面打印
+	coverType:any;
+	coverSubmitForm(){
+		this.coverType = 1
+		if(this.detailsData.barCode){
+			this.detailsData.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(this.detailsData.barCode)
+		}
+		setTimeout(() => {
+		  const printContent = document.getElementById("report");
+		  const WindowPrt = window.open("", "", "width=100,height=1000");
+			WindowPrt.document.body.innerHTML = printContent.innerHTML;
+			setTimeout(_=>{
+				WindowPrt.document.close();
+				WindowPrt.focus();
+				WindowPrt.print();
+				WindowPrt.close();
+			},500)
+		}, 500);
+	}
+	
 	// 打印
 	printFun(data){
+		this.coverType = 0;
 		this.mainService
 			.pathologyPrint(data)
 			.subscribe((res:any) => {

src/app/views/pathology/pathology.component.html

@@ -9,10 +9,10 @@
     <div class="pharmacy-name">
 			<div class="mar-ri-30" *ngIf="toDayData">
 				今日接收：
-				申请单 <span class="weight">{{toDayData.pathologyFormNum}}</span> &nbsp;
-				标本 <span class="weight">{{toDayData.specimenNum}}</span>&nbsp;
-				速冻 <span class="weight">{{toDayData.rapidityNum}}</span>&nbsp;
-				送出申请单 <span class="weight">{{toDayData.sendOut}}</span>&nbsp;
+				申请单 <span class="weight">{{toDayData.pathologyFormNum || 0}}</span> &nbsp;
+				标本 <span class="weight">{{toDayData.specimenNum  || 0}}</span>&nbsp;
+				速冻 <span class="weight">{{toDayData.rapidityNum  || 0}}</span>&nbsp;
+				送出申请单 <span class="weight">{{toDayData.sendOut  || 0}}</span>&nbsp;
 			</div>
       <div class="pharmacy-name__total">
 				<nz-input-group nzSize="large">
@@ -424,29 +424,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [nzLoading]="loading1">
+					  <thead>
+					    <tr class="thead">
 								<th>标本名称</th>
-								<th>编码</th>
-								<th>备注</th>
-								<th>离体时间</th>
-								<th>离体操作人</th>
-								<th>固定时间</th>
-								<th>固定操作人</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr *ngFor="let data of viewData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
+					      <td>{{ data.specimenCode }}</td>
+					      <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
 								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
-							</tr>
-						</tbody>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

src/app/views/pathology/pathology.component.less

@@ -91,6 +91,7 @@
 			justify-content: center;
 			.mar-ri-30{
 				margin-right: 30px;
+				font-size: 16px;
 			}
 			.weight{
 				font-weight: bold;

src/app/views/specimen-room-view/specimen-room-view.component.html

@@ -773,29 +773,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [nzLoading]="loading1">
+					  <thead>
+					    <tr class="thead">
 								<th>标本名称</th>
-								<th>编码</th>
-								<th>备注</th>
-								<th>离体时间</th>
-								<th>离体操作人</th>
-								<th>固定时间</th>
-								<th>固定操作人</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr *ngFor="let data of viewData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
+					      <td>{{ data.specimenCode }}</td>
+					      <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
 								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
 								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
-							</tr>
-						</tbody>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -655,9 +655,16 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			// 今日离科标本列表
 			this.getPharmacyList(this.pharmacyIdx, 'leavedDept', this.pharmacySearchKey);
 			if (res.status == 200) {
-				this.showPromptModal("操作", true, "");
+				this.message.success('操作成功')
+				setTimeout(_=>{
+					this.verificationMoadl = false
+					this.fixationModal = false
+					document.getElementById('Binput').focus();
+				},200)
+				// this.showPromptModal("操作", true, "");
 			} else {
-				this.showPromptModal("操作", false, res.msg);
+				this.message.error(res.msg)
+				// this.showPromptModal("操作", false, res.msg);
 			}
 		});
 	}