Merge branch 'master' into develop

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

@@ -428,18 +428,18 @@
 			</div> -->
 			
 			<!-- 12.11新版打印样式 -->
-			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==1 && printData && printData.specimenList && printData.specimenList.length>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;">
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
 						 <div style="width: 60%;height: 70px;text-align: center;">
 							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
 							 <div>标本号:{{data.specimenCode}}</div>
 						 </div>
-						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
-							 <!-- <span style="font-weight: bold;">速</span> -->
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -2px;">
 							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 						 </div>
+						 <div style="font-weight: bold;text-align: right;width: 100%;position: absolute;bottom: 3px;right: 3px;">{{printData.pathologyFormType==0?'普':'速'}}</div>
 					 </div>
 					 <div style="display: flex;justify-content: space-between;">
 						 <div style="width: 70%;margin-right:15px;">
@@ -480,7 +480,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="surgeryPathologyLabelSize==2 && printData && printData.specimenList && printData.specimenList.length>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%;">

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

@@ -84,7 +84,7 @@ export class PathologyAddComponent implements OnInit {
 	// 获取标本配置
 	pathologyBarCode:any = 1;
 	ifImmobilization:any = false;
-	outpatientPathologyLabelSizeType:any = 1;
+	surgeryPathologyLabelSize:any = 1;
 	getPathologySys(){
 		let postData = {
 			  idx: 0,
@@ -100,8 +100,8 @@ export class PathologyAddComponent implements OnInit {
 		  .subscribe((result) => {
 		    if (result.status == 200) {
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
-					if(result.list[0].outpatientPathologyLabelSize){
-						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
+					if(result.list[0].surgeryPathologyLabelSize){
+						this.surgeryPathologyLabelSize = result.list[0].surgeryPathologyLabelSize.value;
 					}
 					if(result.list[0].outpatientInVitroFixation && result.list[0].outpatientInVitroFixation==1){
 						this.ifImmobilization = true

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

@@ -215,17 +215,18 @@
 				</div>
 			</div> -->
 			<!-- 12.11新版打印样式 -->
-			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>0">
+			<div style="font-size: 12px;" *ngIf="surgeryPathologyLabelSize==1 && printData && printData.specimenList && printData.specimenList.length>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;">
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
 						 <div style="width: 60%;height: 70px;text-align: center;">
 							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
 							 <div>标本号:{{data.specimenCode}}</div>
 						 </div>
-						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -2px;">
 							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 						 </div>
+						 <div style="font-weight: bold;text-align: right;width: 100%;position: absolute;bottom: 3px;right: 3px;">{{printData.pathologyFormType==0?'普':'速'}}</div>
 					 </div>
 					 <div style="display: flex;justify-content: space-between;">
 						 <div style="width: 70%;margin-right:15px;">
@@ -266,7 +267,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="surgeryPathologyLabelSize==2 && printData && printData.specimenList && printData.specimenList.length>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%;">

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

@@ -151,7 +151,7 @@ export class PathologyDetailComponent implements OnInit {
 	
 	// 获取标本配置
 	pathologyBarCode:any = 1;
-	outpatientPathologyLabelSizeType:any = 1;
+	surgeryPathologyLabelSize:any = 1;
 	getPathologySys(){
 		let postData = {
 			  idx: 0,
@@ -167,8 +167,8 @@ export class PathologyDetailComponent implements OnInit {
 		  .subscribe((result) => {
 		    if (result.status == 200) {
 					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
-					if(result.list[0].outpatientPathologyLabelSize){
-						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
+					if(result.list[0].surgeryPathologyLabelSize){
+						this.surgeryPathologyLabelSize = result.list[0].surgeryPathologyLabelSize.value;
 					}
 				}
 		  });

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

@@ -551,14 +551,15 @@
 		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==1 && printData && printData.specimenList && printData.specimenList.length>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;">
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;position: relative;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
 						 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
 						 <div>标本号:{{data.specimenCode}}</div>
 					 </div>
-					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -2px;">
 						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
+					 <div style="font-weight: bold;text-align: right;width: 100%;position: absolute;bottom: 3px;right: 3px;">{{printData.pathologyFormType==0?'普':'速'}}</div>
 				 </div>
 				 <div style="display: flex;justify-content: space-between;">
 					 <div style="width: 70%;margin-right:15px;">