拉取代码

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

@@ -444,27 +444,27 @@
 			<!-- 小尺寸 20*30-->
 			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==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;">
-					 <div style="width: 40%;">
+					<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
+					 <div style="width: 46%;">
 						 <div style="display: flex;justify-content: center;">
 							 <div style="width: 50px;height: 50px;">
 							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 							 </div>
 							 <div style="width: 12px;">申请单</div>
 						 </div>
-						 <div style="text-align: left;">{{printData.applyCode}}</div>
+						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 2%;"></div>
-					 <div style="width: 58%;">
+					 <div style="width: 4%;"></div>
+					 <div style="width: 49%;">
 						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-						<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
+						<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
 					 </div>
 					</div>
-					<div style="margin-top:10px;">
+					<div style="margin-top:10px;padding-left: 7px;">
 						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
 					</div>
-				 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+				 <div style="height: 11px;" *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

@@ -268,27 +268,27 @@
 			<!-- 小尺寸 20*30-->
 			<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==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;">
-					 <div style="width: 40%;">
+					<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
+					 <div style="width: 46%;">
 						 <div style="display: flex;justify-content: center;">
 							 <div style="width: 50px;height: 50px;">
 							 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 							 </div>
 							 <div style="width: 12px;">申请单</div>
 						 </div>
-						 <div style="text-align: left;">{{printData.applyCode}}</div>
+						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 2%;"></div>
-					 <div style="width: 58%;">
+					 <div style="width: 4%;"></div>
+					 <div style="width: 49%;">
 						<div style="display: flex;flex-wrap: nowrap;">住院号: {{data.residenceNo}}</div>
 						<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-						<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
+						<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
 					 </div>
 					</div>
-					<div style="margin-top:10px;">
+					<div style="margin-top:10px;padding-left: 7px;">
 						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
 					</div>
-				 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+				 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>
 			</div>
 		</div>

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

@@ -589,27 +589,27 @@
 		<!-- 小尺寸 20*30-->
 		<div style="font-size: 12px;" *ngIf="outpatientPathologyLabelSizeType==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;">
-				 <div style="width: 40%;">
+				<div style="width: 100%;display: flex;margin-top: 5px;padding: 0 7px;">
+				 <div style="width: 46%;">
 					 <div style="display: flex;justify-content: center;">
 						 <div style="width: 50px;height: 50px;">
 						 		<img style="max-width: 100%;max-height: 100%;position: relative;left: -2px;" [src]="data.barCode" alt="">
 						 </div>
 						 <div style="width: 12px;">申请单</div>
 					 </div>
-					 <div style="text-align: left;">{{printData.applyCode}}</div>
+					 <div>{{printData.applyCode}}</div>
 				 </div>
-				 <div style="width: 2%;"></div>
-				 <div style="width: 58%;">
+				 <div style="width: 4%;"></div>
+				 <div style="width: 49%;">
 					<div style="display: flex;flex-wrap: nowrap;">门诊号: {{data.patientNo}}</div>
 					<div style="margin-top:9px;">患者: {{data.patientName}}</div>
-					<div style="margin-top:9px;margin-left: 20px;">性别: {{data.patientGender}}</div>
+					<div style="margin-top:9px;margin-left: 25px;">性别: {{data.patientGender}}</div>
 				 </div>
 				</div>
-				<div style="margin-top:10px;">
+				<div style="margin-top:10px;padding-left: 7px;">
 					<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
 				</div>
-			 <div style="height: 15px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
+			 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 			</div>
 		</div>
 	</div>

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

@@ -534,7 +534,7 @@
 				<div class="list-template">
 				  <div class="list-template__content">
 						<div class="list-template__bottom" style="padding: 0 !important;">
-							<nz-table class="list-template__nzTable" [nzData]="codeData.pathologySpecimenDTOList" nzSize="middle" [nzShowPagination]="false"
+							<nz-table class="list-template__nzTable" [nzData]="codeDataSpecimenList" nzSize="middle" [nzShowPagination]="false"
 								[nzLoading]="tableLoading">
 								<thead>
 									<tr class="thead">
@@ -544,7 +544,7 @@
 									</tr>
 								</thead>
 								<tbody>
-									<tr *ngFor="let data of codeData.pathologySpecimenDTOList let index = index">
+									<tr *ngFor="let data of codeDataSpecimenList let index = index">
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
@@ -559,7 +559,7 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<!-- <button class="btn btn-right" [disabled]="codeData.specimenNum != codeData.pathologySpecimenDTOList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button> -->
+			<!-- <button class="btn btn-right" [disabled]="codeData.specimenNum != codeDataSpecimenList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button> -->
 			<button class="btn btn-right" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
 		</div>
@@ -597,7 +597,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)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+						<input nz-input (ngModelChange)="numberChange($event,1)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
@@ -606,6 +606,18 @@
 						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
 					</nz-form-control>
 				</nz-form-item>
+<!-- 				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="nurseJobNumber">护士工号</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士工号!">
+						<input nz-input (ngModelChange)="numberChange($event,2)" formControlName="nurseJobNumber" placeholder="请输入护士工号" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="nurseName">护士姓名</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士姓名!">
+						<input nz-input disabled formControlName="nurseName" placeholder="请输入护士姓名" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item> -->
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">

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

@@ -180,6 +180,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	}
 	
 	// 标本条码搜索
+	codeDataSpecimenList:any = null;
 	searchSpecimen(e){
 		if(!this.barCode){
 			return
@@ -201,6 +202,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				if(!item.fixationTime && this.codeData.pathologyFormType==0){
 					if(this.codeData.status.value==2 || this.codeData.status.value==3 ||
 						this.codeData.status.value==4){
+							this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList.filter(i=>!i.fixationTime)
 							if(this.codeData.pathologyInspectDTOS){
 								this.project = this.codeData.pathologyInspectDTOS.map(i=>{
 									return i.inspectProject.name
@@ -270,6 +272,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  fixationDate: [null, [Validators.required]],
 			jobNumber: [null, [Validators.required]],
 			name:[null, [Validators.required]],
+			// nurseJobNumber: [null, [Validators.required]],
+			// nurseName:[null, [Validators.required]],
 			fixative:[null, [Validators.required]],
 		});
 		let date = new Date();
@@ -303,7 +307,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	
 	cancelSpecimenModal(){
 		let ids = []
-		for(let i of this.codeData.pathologySpecimenDTOList){
+		for(let i of this.codeDataSpecimenList){
 			ids.push(i.id)
 		}
 		let data = {
@@ -510,8 +514,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	}
 
 	// 输入工号查询姓名
-	handoverUserId:any = null;
-	numberChange(e){
+	handoverUserId:any = null; //医生工号
+	handoverNurseUserId:any = null; //护士工号
+	numberChange(e,type){
 		if(e.length < 3) {
 			this.validateVerificationForm.controls.name.setValue('');
 			return
@@ -523,12 +528,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  .jobSearch(query)
 		  .subscribe((data:any) => {
 				if(data.status==200){
-					this.validateVerificationForm.controls.name.setValue(data.userName);
-					this.handoverUserId = data.userId
+					if(type==1){
+						this.validateVerificationForm.controls.name.setValue(data.userName);
+						this.handoverUserId = data.userId
+					}else{
+						this.validateVerificationForm.controls.nurseName.setValue(data.userName);
+						this.handoverNurseUserId = data.userId
+					}
 				}else{
-					this.validateVerificationForm.controls.name.setValue('');
-					this.handoverUserId =null
-					// this.message.error(data.data)
+					if(type==1){
+						this.validateVerificationForm.controls.name.setValue('');
+						this.handoverUserId = null
+					}else{
+						this.validateVerificationForm.controls.nurseName.setValue('');
+						this.handoverNurseUserId = null
+					}
 				}
 		  });
 	}
@@ -540,7 +554,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-		let str = this.codeData.pathologySpecimenDTOList.map(i=>{
+		let str = this.codeDataSpecimenList.map(i=>{
 			return i.specimenCode
 		})
 		let data: any = {