拉取代码

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

@@ -531,29 +531,33 @@
 					 <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;">
+				 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;flex-wrap: wrap;justify-content: end;margin-right: 10px;">
 					 <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 style="margin-top:20px;display: flex;">
+					<div style="width: 70%;display: flex;">
+						<div style="width: 50%;">患者: {{detailsData.patientDTO.patientName}}</div>
+						<div style="width: 50%;text-align: center;">性别: {{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
+					</div>
+					<div style="width: 30%;margin-right: 20px;text-align: right;">年龄: {{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 style="margin-top:10px;display: flex;">
+					<div style="width: 70%;">
+						<div *ngIf="detailsData.residenceNo">住院号: {{detailsData.residenceNo}}</div>
+						<div *ngIf="!detailsData.residenceNo">门诊号: {{detailsData.patientDTO.patientCode}}</div>
+					</div>
+					<div style="width: 30%;margin-right: 20px;text-align: right;">床号: {{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 style="margin-top:10px;display: flex;">
+					<div style="width: 70%;">科室: {{detailsData.patientDTO.department.dept}}</div>
+					<div style="width: 30%;margin-right: 20px;text-align: right;">标本数: {{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 style="margin-top:10px;display: flex;">
+					<div style="width: 70%;">日期: {{detailsData.inVitroTime|date:'yyyy-MM-dd'}}</div>
+					<div style="font-weight: bold;width: 30%;margin-right: 20px;text-align: right;">{{detailsData.pathologyFormType==1 ? '速' : '普'}}</div>
 				</div>
 			 </div>
 			</div>

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

@@ -619,7 +619,7 @@
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">医生工号</nz-form-label>
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入医生工号!">
-						<input nz-input (ngModelChange)="numberChange($event,1)" formControlName="jobNumber" placeholder="请输入医生工号" nzSize="default" />
+						<input nz-input (keydown.enter)="onEnterPress()" (ngModelChange)="numberChange($event,1)" formControlName="jobNumber" placeholder="请输入医生工号" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>

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

@@ -575,7 +575,24 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	    }
 	  });
 	}
-
+	
+	// 工号回车
+	onEnterPress(){
+		if(this.ifFixType){
+			if(this.validateVerificationForm.value.jobNumber &&
+				this.validateVerificationForm.value.name){
+				this.submitVerificationForm()
+			}
+		}else{
+			if(this.fixationData && this.fixationTimeSelect &&
+				this.validateVerificationForm.value.jobNumber &&
+				this.validateVerificationForm.value.name &&
+				this.validateVerificationForm.value.fixative){
+				this.submitVerificationForm()
+			}
+		}
+	}
+	
 	// 输入工号查询姓名
 	handoverUserId:any = null; //医生工号
 	nurseId:any = null; //护士工号