Merge branch 'master' into develop

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

@@ -405,39 +405,39 @@
 					 </div>
 					 <div style="display: flex;justify-content: space-between;">
 						 <div style="width: 70%;margin-right:15px;">
-						 	<div style="display: flex; justify-content: space-between; margin-top:11px;">
+						 	<div style="display: flex; justify-content: space-between; margin-top:10px;">
 								<div>患者: {{data.patientName}}</div>
 								<div>性别: {{data.patientGender}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>住院号: {{data.residenceNo}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>科室: {{data.patientDept}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
-							<div style="margin-top:11px;">年龄: {{data.patientAge}}岁</div>
-							<div style="margin-top:11px;">床号: {{data.patientBedNum}}床</div>
-							<div style="margin-top:11px;" *ngIf="operation == 'addPrint'">标本数: {{index+1}}/{{printData.specimenNum}}</div>
-							<div style="margin-top:11px;" *ngIf="operation != 'addPrint'">标本数: {{index+1}}/{{printData.specimenList.length}}</div>
-							<div style="width: 100%;height: 65px;display: flex;margin-top: 5px;">
-							 <div style="height: 55px;width: 55px;">
+							<div style="margin-top:10px;">年龄: {{data.patientAge}}岁</div>
+							<div style="margin-top:10px;">床号: {{data.patientBedNum}}床</div>
+							<div style="margin-top:10px;" *ngIf="operation == 'addPrint'">标本数: {{index+1}}/{{printData.specimenNum}}</div>
+							<div style="margin-top:10px;" *ngIf="operation != 'addPrint'">标本数: {{index+1}}/{{printData.specimenList.length}}</div>
+							<div style="width: 100%;height: 60px;display: flex;margin-top: 5px;">
+							 <div style="height: 50px;width: 50px;">
 								 <img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="printData.applyBarCode" alt="">
 								 <div style="position: relative;left: -18px;">{{printData.applyCode}}</div>
 							 </div>
-							 <div style="width: 12px;position: relative; top: 5px;">申请单</div>
+							 <div style="width: 12px;position: relative; top: 2px;">申请单</div>
 							</div>
 						 </div>
 					 </div>
 				 </div>
-				 <div style="height: 26px;"></div>
+				 <div style="height: 26px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
 		</div>

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

@@ -229,39 +229,39 @@
 					 </div>
 					 <div style="display: flex;justify-content: space-between;">
 						 <div style="width: 70%;margin-right:15px;">
-						 	<div style="display: flex; justify-content: space-between; margin-top:11px;">
+						 	<div style="display: flex; justify-content: space-between; margin-top:10px;">
 								<div>患者: {{data.patientName}}</div>
 								<div>性别: {{data.patientGender}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>住院号: {{data.residenceNo}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>科室: {{data.patientDept}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
-							<div style="margin-top:11px;">
+							<div style="margin-top:10px;">
 								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
-							<div style="margin-top:11px;">年龄: {{data.patientAge}}岁</div>
-							<div style="margin-top:11px;">床号: {{data.patientBedNum}}床</div>
-							<div style="margin-top:11px;" *ngIf="operation == 'addPrint'">标本数: {{index+1}}/{{printData.specimenNum}}</div>
-							<div style="margin-top:11px;" *ngIf="operation != 'addPrint'">标本数: {{index+1}}/{{printData.specimenList.length}}</div>
-							<div style="width: 100%;height: 65px;display: flex;margin-top: 5px;">
-							 <div style="height: 55px;width: 55px;">
+							<div style="margin-top:10px;">年龄: {{data.patientAge}}岁</div>
+							<div style="margin-top:10px;">床号: {{data.patientBedNum}}床</div>
+							<div style="margin-top:10px;" *ngIf="operation == 'addPrint'">标本数: {{index+1}}/{{printData.specimenNum}}</div>
+							<div style="margin-top:10px;" *ngIf="operation != 'addPrint'">标本数: {{index+1}}/{{printData.specimenList.length}}</div>
+							<div style="width: 100%;height: 60px;display: flex;margin-top: 5px;">
+							 <div style="height: 50px;width: 50px;">
 								 <img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="printData.applyBarCode" alt="">
 								 <div style="position: relative;left: -18px;">{{printData.applyCode}}</div>
 							 </div>
-							 <div style="width: 12px;position: relative; top: 5px;">申请单</div>
+							 <div style="width: 12px;position: relative; top: 2px;">申请单</div>
 							</div>
 						 </div>
 					 </div>
 				 </div>
-				 <div style="height: 26px;"></div>
+				 <div style="height: 26px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
 		</div>