手术优化

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

@@ -437,6 +437,7 @@
 							 <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> -->
 							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 						 </div>
 					 </div>

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

@@ -106,12 +106,150 @@
   </div>
 </div>
 
-<!-- 病理详情 -->
-<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="detailItem.surgeryId" [patientId]="detailItem.patientId" [detailId]="detailItem.id" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
+<!-- 标本查看详情-->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<nz-form-item class="form-title-box">
+					<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单' : detailsData.pathologyFormType==2 ? '病理细胞学申请单' : '病理检查申请单'}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title">手术间：{{detailsData.surgeryDeptDTO.dept}}</div>
+					<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
+					<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}</div>
+					<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender?detailsData.patientDTO.gender.name:'-'}}</div>
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+				</nz-form-item>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">诊断：</div>
+					<div class="indent">
+						{{detailsData.diagnose||'无'}}
+					</div>
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">病历摘要：</div>
+					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">手术方案：</div>
+					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
+				</div>
+				<div class="form-list">
+					<div class="form-title font-weight-500">术中所见：</div>
+					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
+				</div>
 
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+					<!-- <div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
+					<!-- <div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
+				</div>
+				
+				<div class="form-list">
+					<div class="form-title font-weight-500">标本：</div>
+					<div class="form-title specimen-list">
+						<div *ngFor="let item of specimenList" class="specimen-item-class" (click)="specimenView(item)">
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
+						</div>
+					</div>
+				</div>
+
+			</div>
+			
+			<div class="content-item-right">
+				<div class="step-title">病理闭环</div>
+				<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+					<ng-container *ngFor="let item of pathologyLogs; let index = index">
+							<nz-step
+								[nzDescription]="tpl"
+							>
+							</nz-step>
+							<ng-template #tpl>
+								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+									<div style="color: #49B856;" *ngIf="item.doctorDTO"> {{item.operationType?item.operationType.name:''}} {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}} </div>
+									<div style="color: #49B856;" *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div *ngIf="item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}}</div>
+									<div *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+								</div>
+							</ng-template>
+						</ng-container>
+				</nz-steps>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+		</div>
+	</div>
+</div>
+
+<!-- 查看标本 -->
+<div class="look">
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenViewDialog">
+		<div class="modalBody modalBody-ga">
+			<div class="title">查看标本<i class="icon_transport transport-guanbi" (click)="closeSpecimenModal()"></i>
+			</div>
+			<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">
+								<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.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>
+					</nz-table>
+				</div>
+			</overlay-scrollbars>
+			<div class="display_flex justify-content_flex-center">
+				<button class="btn" nz-button nzType="primary" (click)="closeSpecimenModal()">知道了</button>
+			</div>
+		</div>
+	</div>
+</div>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo"></app-prompt-modal>
 
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -22,6 +22,27 @@
       font-size: 18px;
     }
   }
+	
+	/* 修改垂直滚动条 */
+	::-webkit-scrollbar {
+		width: 4px; /* 修改宽度 */
+		border-radius: 2px;
+	}
+	 
+	/* 修改滚动条轨道背景色 */
+	::-webkit-scrollbar-track {
+		background-color: #f1f1f1;
+	}
+	 
+	/* 修改滚动条滑块颜色 */
+	::-webkit-scrollbar-thumb {
+		background-color: #888;
+	}
+	 
+	/* 修改滚动条滑块悬停时的颜色 */
+	::-webkit-scrollbar-thumb:hover {
+		background-color: #555;
+	}
 }
 
 .save {
@@ -229,21 +250,419 @@
       }
     }
   }
-	
-	.mask-style{
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		display: flex;
-		background: rgba(0,0,0,0.2);
-		align-items: center;
-		justify-content: center;
+}
+
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.width-80{
+		width: 80% !important;
 	}
-	.spin-style{
-		z-index:9999;
+	.pathology-content{
+		width: 80%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #000;
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		.content{
+			width: 100%;
+			background: #f9fafb;
+			border: 1px solid #e5e9ed;
+			border-radius: 5px;
+			margin-top: 12px;
+			display: flex;
+			// .addForm{
+				// display: flex;
+				.font-weight-500{
+					color: #000;
+					font-weight: 500;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				.content-item{
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					width: 78%;
+					padding: 15px;
+					.form-title-box{
+						display: flex;
+						margin-bottom: 10px;
+						.form-title{
+							color: #333;
+							margin-right: 40px;
+						}
+						.mar-ri-20{
+							margin-right: 20px !important;
+						}
+						.width-150{
+							width: 150px;
+						}
+						.width-200{
+							width: 200px;
+						}
+					}
+					.center{
+						text-align: center;
+						padding: 10px 0;
+					}
+					.disp-fl{
+						display: flex;
+						align-items: center;
+						.width-120{
+							width: 85px;
+						}
+						.ant-input{
+							width: 300px;
+						}
+					}
+					.error-fix{
+						margin-top: 10px;
+						color: red;
+						text-align: center;
+					}
+					.form-list{
+						margin-bottom: 10px;
+						.specimen-list{
+							display: flex;
+							flex-wrap: wrap;
+							.specimen-item-class{
+								text-decoration: underline;
+								cursor: pointer;
+								margin-right: 40px;
+								color:#333;
+							}
+						}
+						.indent{
+							text-indent: 2ch;
+							color: #333;
+						}
+					}
+					.ant-form-item {
+					  margin-bottom: 14px;
+						display: flex;
+						flex-wrap: wrap;
+					  .ant-form-item-label {
+					    text-align: left;
+							font-weight: 500;
+					  }
+						.ant-form-item-control-wrapper{
+							.ant-form-item-control{
+								width: 400px;
+							}
+						}
+					}
+					.add-icon-class{
+						border: 1px solid #e5e9ed;
+						border-radius: 3px;
+						width: 26px;
+						height: 26px;
+						line-height: 26px;
+						text-align: center;
+						position: relative;
+						top: 7px;
+						cursor: pointer;
+						.form-icon{
+							
+						}
+					}
+				}
+				.content-item-right{
+					width: 25%;
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					padding: 10px;
+					.step-title{
+						font-size: 16px;
+						font-weight: 500;
+						margin-bottom: 10px;
+					}
+				}
+				.boder-right{
+					border-right: 1px solid #e5e9ed;
+				}
+				.specimen-item{
+					display: flex;
+					margin-bottom: 10px;
+					.specimen-icon{
+						color: #64BD7B;
+						cursor: pointer;
+						font-size: 20px;
+						position: relative;
+						top: -4px;
+						left: 2px;
+					}
+				}
+			// }
+		}
+		.bottom-btn{
+			margin-top: 10px;
+			.btn-right{
+				margin-right: 10px;
+			}
+		}
 	}
+	
 }
 
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
+}
+
+.look{
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 999;
+		.modalBody-ga{
+			width: 80% !important;
+			.list-template__searchBox{
+				margin-top: 10px;
+			}
+			.ant-select{
+				width: 20%;
+			}
+		}
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 100%;
+	      height: 117px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	
+	      div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 18px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 420px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 19px 14px 0 14px;
+	        max-height: 500px;
+	        overflow-y: auto;
+					
+					.ant-select{
+						width: 100%;
+					}
+					.ant-calendar-picker{
+						width: 100% !important;
+					}
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					  .list-template__pagination {
+					    height: 56px;
+					    display: flex;
+					    align-items: center;
+					    position: absolute;
+					    right: 8px;
+					  }
+					}
+					
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 0;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	
+	      button {
+	        &:nth-child(1) {
+	          margin-right: 20px;
+	        }
+	      }
+	    }
+	  }
+	}
+}

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

@@ -173,14 +173,59 @@ export class BatchDistributionComponent implements OnInit{
     });
   }
 	
+	detailMoadl:boolean = false;
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	closeDetailMoadl(){
+		this.detailMoadl = false
+	}
+	
 	// 申请单号点击
 	detailItem:any = null;
 	pathologyDetailModal:any = false;
+	grossLoading:any = false;
 	itemClick(item){
 		this.detailItem = item
-		setTimeout(_=>{
-			this.pathologyDetailModal = true
-		},200)
+		this.grossLoading = true
+		this.getSampleData(item)
+	}
+	
+	// 获取标本详情
+	project:any = [];
+	detailsData:any = null;
+	getSampleData(item){
+		this.mainService.getFetchData("data", "pathologyForm", item.id)
+		.subscribe((data) => {
+			this.grossLoading = false
+			this.detailsData = data.data
+		  this.specimenList = data.data.pathologySpecimenDTOList||[]
+			this.pathologyLogs = data.data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+			if(this.detailsData.pathologyInspectDTOS){
+				this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+					return i.inspectProject.name
+				})
+				this.project = this.project.join('、')
+			}
+		  this.detailMoadl = true
+		});
+	}
+	
+	// 关闭查看标本
+	closeSpecimenModal(){
+		this.specimenViewDialog = false
+	}
+	
+	// 查看标本
+	specimenViewDialog:any = false;
+	specimenData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.specimenData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.specimenData.push(item)
 	}
 	
 	hideModal(){

src/app/views/hushijiandan/hushijiandan.component.less

@@ -235,7 +235,7 @@
 		}
 		.list-template__bottom{
 			.list-template__nzTable{
-				height: 420px !important;
+				height: 510px !important;
 				overflow-y: auto !important;
 			}
 		}

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -402,6 +402,7 @@ export class HushijiandanComponent implements OnInit {
 			pathologyForm: {
 				surgeryId: item.id || "",
 				patientId: item.patientDTO.id || "",
+				surgeryDeptId:this.loginUser.dept.id,
 				// hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
 				order:'createTime desc',
@@ -439,6 +440,7 @@ export class HushijiandanComponent implements OnInit {
 			pathologyForm: {
 				surgeryId: this.surgeryWKOMsg.id || "",
 				patientId: this.surgeryWKOMsg.patientDTO.id || "",
+				surgeryDeptId:this.loginUser.dept.id,
 				// hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
 				order:'createTime desc'
@@ -475,8 +477,10 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
+				surgeryId: this.surgeryDataId || "",
 				patientId: this.patientDataId || "",
 				hosId: this.currentHospital.id || "" ,
+				surgeryDeptId:this.loginUser.dept.id,
 				operationType: 'pathologyForm',
 				order:'createTime desc'
 			},

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

@@ -440,7 +440,7 @@
 						<div>门诊号: {{data.patientDTO.patientCode}}</div>
 						<div>住院号: {{data.patientDTO.residenceNo}}</div>
 						<div>床号: {{data.patientDTO.bedNum}}</div>
-						<div>科室: {{data.patientDTO.department ? data.patientDTO.department.dept:''}}</div>
+						<div>科室: {{deptName}}</div>
 					</div>
 					<div style="display: flex; justify-content: space-between; margin-top:12px;">
 						<div style="width: 100%;overflow: hidden;">活检部位: {{data.takePart}}</div>

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

@@ -170,6 +170,7 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 	backType:any = 'list';
 	mainRole:any = false;
 	coopBtns:any = {};
+	deptName:any = null;
 	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
 	  .id; //登录人所属科室
   ngOnDestroy() {
@@ -194,6 +195,7 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
 		this.deptId = this.tool.getCurrentUserDept().id
+		this.deptName = this.tool.getCurrentUserDept().dept
 		this.getTaskTypesId()
 		this.getConnectList()
 		if(this.route.snapshot.queryParams && this.route.snapshot.queryParams.type){

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

@@ -8,7 +8,7 @@
 			<div class="pharmacy-title">门诊病理采样端</div>
       <div class="pharmacy-name__total">
 				<nz-input-group nzSize="large">
-					<input type="text" id="Binput" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
+					<input type="text" id="Binput" (keydown.enter)="onEnterPress()" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
 				</nz-input-group>
 				<!-- <ng-template #suffixButton>
 					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>

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

@@ -90,6 +90,7 @@ export class PathologySampleComponent implements OnInit {
 		  this.searchSpecimenData(v[0])
 		});
 		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).subscribe((v) => {
+			this.pressType = false
 		  this.searchSpecimen(v[0],'search','new')
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
@@ -342,7 +343,7 @@ export class PathologySampleComponent implements OnInit {
 			if(!this.barCode){
 				return
 			}
-			if(this.barCode.length < 10) {
+			if(this.barCode.length < 10 && !this.pressType) {
 				return
 			}
 		}
@@ -1492,7 +1493,19 @@ export class PathologySampleComponent implements OnInit {
 		},200)
 	}
 
-
+	// 按了回车键
+	pressType:any = false;
+	onEnterPress(){
+		if(this.barCode.length < 10) {
+			this.pressType = true
+			console.log(1,this.barCode)
+			this.searchSpecimen(this.barCode,'search','new')
+		}else{
+			this.pressType = false
+			console.log(2,this.barCode)
+		}
+	}
+	
 	// 监听标本条码
 	specimenCodeChange(e){
 		this.changeInpSubjectSpecimen.next([e]);

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

@@ -989,7 +989,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	
 	// 配送记录
 	distributionRecord(){
-		this.router.navigateByUrl("batchDistribution");
+		this.router.navigateByUrl("main/batchDistribution");
 	}
 	
   mainRole: boolean = false; //回到系统管理权限