拉取代码

src/app/services/main.service.ts

@@ -966,8 +966,8 @@ export class MainService {
 	}
 
 	// 标本间获取标本接收信息
-	getSpecimenInfo(batchNo,deptId) {
-	  return this.http.post(host.host + `/pathology/getInfo/${batchNo}/${deptId}`, {}, {
+	getSpecimenInfo(batchNo,deptId,data) {
+	  return this.http.post(host.host + `/pathology/getInfo/${batchNo}/${deptId}`, data, {
 	    headers: this.headers,
 	  });
 	}

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

@@ -11,8 +11,8 @@
 						<div>
 							应送申请单: <span class="weight">{{otherData.pathologyFormNum}}</span> &nbsp;
 							标本: <span class="weight">{{otherData.specimenNum}}</span>&nbsp;
-							已扫描: <span class="weight">{{otherData.rapidityNum}}</span>&nbsp;
-							申请单标本: <span class="weight">{{otherData.rapidityNum}}</span>&nbsp;
+							已扫描: <span class="weight">{{otherData.scanPathologyFormNum}}</span>&nbsp;
+							申请单标本: <span class="weight">{{otherData.scanSpecimenNum}}</span>&nbsp;
 						</div>
 					</div>
 					
@@ -23,7 +23,7 @@
 				</div>
 				<div class="tabs">
 					<div class="tabs-item">
-						<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">交接本</div>
+						<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">已扫描</div>
 						<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">未扫描</div>
 					</div>
 				</div>
@@ -34,11 +34,11 @@
 								[nzLoading]="tableLoading">
 								<thead>
 									<tr class="thead">
-										<th>申请单号 | 申请科室</th>
-										<th>患者姓名 | 住院号</th>
-										<th>标本数</th>
-										<th>部位</th>
-										<th>产生科室</th>
+										<th nzWidth="220px">申请单号 | 申请科室</th>
+										<th nzWidth="220px">患者姓名 | 住院号</th>
+										<th nzWidth="120px">标本数</th>
+										<th nzWidth="260px">部位</th>
+										<th nzWidth="120px">产生科室</th>
 										<th>离体时间</th>
 										<th>固定时间</th>
 									</tr>
@@ -55,9 +55,9 @@
 										</td>
 										<td>{{ data.specimenNum}}</td>
 										<td>{{ data.takePart}}</td>
-										<td>{{ data.takePart}}</td>
-										<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
-										<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+										<td>{{ data.surgeryDeptDTO?data.surgeryDeptDTO.dept:'-'}}</td>
+										<td>{{ data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+										<td>{{ data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 									</tr>
 								</tbody>
 							</nz-table>
@@ -107,8 +107,7 @@
 										<th>序号</th>
 										<th>条码号</th>
 										<th>标本名称</th>
-										<th *ngIf="dataType=='receive'">已接收 | 未接收</th>
-										<th *ngIf="dataType=='pack'">已扫描 | 未扫描</th>
+										<th>已扫描 | 未扫描</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -118,11 +117,7 @@
 										<td>
 											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
 										</td>
-										<td *ngIf="dataType=='receive'">
-											<div *ngIf="data.isScan==1">已接收</div>
-											<div *ngIf="data.isScan==0" class="red">未接收</div>
-										</td>
-										<td *ngIf="dataType=='pack'">
+										<td>
 											<div *ngIf="data.isScan==1">已扫描</div>
 											<div *ngIf="data.isScan==0" class="red">未扫描</div>
 										</td>
@@ -135,8 +130,7 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" *ngIf="dataType=='receive'" nz-button nzType="primary" (click)="submitMultiForm()" [nzLoading]="btnMultiLoading">确认接收</button>
-			<button class="btn btn-right" *ngIf="dataType=='pack'" nz-button nzType="primary" (click)="submitMultiScanForm()" [nzLoading]="btnMultiLoading">扫描完成</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitMultiScanForm()" [nzLoading]="btnMultiLoading">扫描完成</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideMultiModal()">取消</button>
 		</div>
 	</div>
@@ -155,20 +149,11 @@
 <!-- 核对 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="connectModal">
 	<div class="modalBody">
-		<div class="title">核对<i class="icon_transport transport-guanbi" (click)="hideConnectModal()"></i>
+		<div class="title">信息核对<i class="icon_transport transport-guanbi" (click)="hideConnectModal()"></i>
 		</div>
 		<div class="content">
 		 <div class="title-class">
-	<!-- 		 <div>配送人应送达：单据{{mustReceived.pathologyFormNum}}张、
-			 标本{{mustReceived.specimenNum}}、速冻标本{{mustReceived.rapidityNum}}</div>
-			 <div>本次共接收单据
-			 <span [ngClass]="{'red': currReceived.pathologyFormNum < mustReceived.pathologyFormNum}">
-				 {{currReceived.pathologyFormNum}}
-			 </span>张、
-			 标本<span [ngClass]="{'red': currReceived.specimenNum<mustReceived.specimenNum}">{{currReceived.specimenNum}}</span>、速冻标本
-			 <span [ngClass]="{'red': currReceived.rapidityNum<mustReceived.rapidityNum}">{{currReceived.rapidityNum}}</span>
-			 </div> -->
-			 您本次共扫描<span class="red">10</span>申请单 标本<span class="red">25</span>份
+			 您本次共扫描<span class="red">{{mustReceived.pathologyFormNum}}</span>申请单 标本<span class="red">{{mustReceived.specimenNum}}</span>份
 		 </div>
 		 <form nz-form [formGroup]="validateConnectForm" class="addForm" (ngSubmit)="submitConnectForm()">
 			<nz-form-item>

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

@@ -171,6 +171,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 	userInfo:any = null;
 	placeholder:any = null;
 	placeholderType:any = null;
+	operationType:any = 'pathologyHandoverBook';
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
@@ -188,26 +189,25 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		this.businessType = this.route.snapshot.queryParams.businessType
 		this.placeholderType = this.route.snapshot.queryParams.placeholder
 		this.packId = this.route.snapshot.queryParams.packId //打包配送查看标本
+		this.operationType = localStorage.getItem("checkType"); //入口类型
 		if(this.placeholderType==1){
 			this.placeholder = '可扫描物理标本条码'
 		}else{
 			this.placeholder = '可扫描物理标本条码及包码'
 		}
 		let scanData = localStorage.getItem("scanCodeData")
-		//dataType类型：receive：病理科接收标本，pack:病理科打包标本
-		//pathologyPack: 病理包扫码
 		this.dataType = localStorage.getItem("dataType")
-		if(this.packId && this.businessType=='packagLook'){
-			this.getJsData(5)
-			return
-		}
+		// if(this.packId && this.businessType=='packagLook'){
+		// 	this.getJsData(5)
+		// 	return
+		// }
 		if(scanData){
 			let data = JSON.parse(localStorage.getItem("scanCodeData"))
 			this.scanCodeData = data.data[0]
 			// 包的状态为配送中展示配送接收弹框
-			if(this.dataType=='pathologyPack'){
-				this.getJsData(4)
-			}
+			// if(this.dataType=='pathologyPack'){
+			// 	this.getJsData(4)
+			// }
 			if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length>1){
 				this.muArr = []
@@ -219,6 +219,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 				this.getJsData(3)
 			}else if(this.scanCodeData.pathologySpecimenDTOList &&
 			this.scanCodeData.pathologySpecimenDTOList.length==1){
+				this.notification.create('success','提示',data.msg);
 				this.getJsData(1)
 			}
 		}else{
@@ -238,11 +239,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 	tabClick(type){
 		this.activeIndex = type
 		localStorage.setItem("pathologyActiveIndex",type)
-		if(type==0){
-			this.getJsData(1)
-		}else if(type==1){
-			this.getJsData(1)
-		}
+		this.getJsData(1)
 	}
 	
 	// 分页
@@ -268,17 +265,20 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		  sum: this.pageSize,
 		  pathologyForm: {
 		    batchNo:this.batchNo,
-				packId:null
+				surgeryDeptId:this.deptId,
+				handoverType:this.operationType,
+				unScan:null
 		  },
 		};
-		if(type==4){
-			data.pathologyForm.packId = this.scanCodeData.id
-			delete data.pathologyForm.batchNo
-		}else if(type==5){
-			data.pathologyForm.packId = this.packId
-			delete data.pathologyForm.batchNo
+		if(this.operationType == 'pathologyHandoverBook'){
+			data.pathologyForm.surgeryDeptId = this.deptId
+		}else{
+			delete data.pathologyForm.surgeryDeptId
+		}
+		if(this.activeIndex==1){
+			data.pathologyForm.unScan = 1
 		}else{
-			delete data.pathologyForm.packId
+			delete data.pathologyForm.unScan
 		}
 		this.tableLoading = true;
 		this.mainService
@@ -334,7 +334,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		let data = {
 			receiveUser:this.connectUserId,
 			deliveryUser:this.dispatchingUserId,
-			operationType:'bagReceive',
+			operationType:this.operationType,
 			id:this.scanCodeData.id
 		};
 		this.btnConnectLoading = true
@@ -412,28 +412,36 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 	btnLoading:any = false;
 	submitFixationForm(){
 		this.btnLoading = true
-		this.mainService.getSpecimenInfo(this.batchNo,this.deptId).subscribe((res:any) => {
+		this.mainService.getSpecimenInfo(this.batchNo,this.deptId,{
+			operationType:'handoverDelivery'
+		}).subscribe((res:any) => {
 			this.btnLoading = false
-			this.mustReceived = res.data.mustReceived;
-			this.currReceived = res.data.currReceived;
+			this.mustReceived = res;
+			// this.currReceived = res.data.currReceived;
 			this.btnConnectLoading = false
-			if(this.codeData[0].deliveryUserDTO){
-				this.validateConnectForm = this.fb.group({
-					receptionNumber: [this.userInfo.account, [Validators.required]],
-					dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
-				});
-				this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
-				this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
-			}else{
-				this.validateConnectForm = this.fb.group({
-					receptionNumber: [null, [Validators.required]],
-					dispatchingNumber: [null, [Validators.required]]
-				});
-				this.dispatchingName = null;
-				this.dispatchingUserId = null
-			}
-			this.receptionName = this.userInfo.name;
-			this.connectUserId = this.userInfo.id;
+			// if(this.codeData[0].deliveryUserDTO){
+			// 	this.validateConnectForm = this.fb.group({
+			// 		receptionNumber: [this.userInfo.account, [Validators.required]],
+			// 		dispatchingNumber: [this.codeData[0].deliveryUserDTO.account, [Validators.required]]
+			// 	});
+			// 	this.dispatchingName = this.codeData[0].deliveryUserDTO.name;
+			// 	this.dispatchingUserId = this.codeData[0].deliveryUserDTO.id
+			// }else{
+			// 	this.validateConnectForm = this.fb.group({
+			// 		receptionNumber: [null, [Validators.required]],
+			// 		dispatchingNumber: [null, [Validators.required]]
+			// 	});
+			// 	this.dispatchingName = null;
+			// 	this.dispatchingUserId = null
+			// }
+			// this.receptionName = this.userInfo.name;
+			// this.connectUserId = this.userInfo.id;
+			this.validateConnectForm = this.fb.group({
+				receptionNumber: [null, [Validators.required]],
+				dispatchingNumber: [null, [Validators.required]]
+			});
+			this.dispatchingName = null;
+			this.dispatchingUserId = null
 			this.connectModal = true
 		});
 	}
@@ -452,8 +460,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		if (this.validateConnectForm.invalid) return;
 		let data = {
 			batchNo:this.batchNo,
-			receiveDept:this.deptId,
-			receiverUser:this.connectUserId,
+			checkUser:this.connectUserId,
 			deliveryUser:this.dispatchingUserId
 		};
 		this.btnConnectLoading = true
@@ -472,16 +479,15 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 	// 返回
 	hideSpecimenModal(){
 		localStorage.setItem("scanCodeData",'')
-		let type = localStorage.getItem("checkType")
-		if(type=='communicationBook'){//交接本
+		if(this.operationType=='pathologyHandoverBook'){//交接本
 			this.router.navigateByUrl(`/pathologyCommunicationBook?type=detail`)
-		}else if(type=='surgery'){//手术间
+		}else if(this.operationType=='surgery'){//手术间
 			this.router.navigateByUrl(`/nurse`)
-		}else if(type=='specimen'){//标本间
+		}else if(this.operationType=='specimenDept'){//标本间
 			this.router.navigateByUrl(`/specimenRoomView`)
-		}else if(type=='pathology'){//病理端
+		}else if(this.operationType=='pathology'){//病理端
 			this.router.navigateByUrl(`/pathology`)
-		}else if(type=='sample'){//门诊病理
+		}else if(this.operationType=='sample'){//门诊病理
 			this.router.navigateByUrl(`/pathologySample`)
 		}
 	}
@@ -530,7 +536,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		this.changeInpSubject.next([e]);
 	}
 
-	// 标本接收搜索条码
+	// 标本搜索条码
 	errorMsg:any = null;
 	searchSpecimenData(e){
 		if(!e){
@@ -543,14 +549,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			barcode:e,
 			deptId:this.deptId,
 			batchNo:this.batchNo,
-			tabType:null
-		}
-		if(this.dataType=='receive'){
-			data.tabType = 'receive'
-		}else if(this.dataType=='pack'){
-			data.tabType = 'pack'
-		}else{
-			delete data.tabType
+			platform:'pathologyHandoverBook',
 		}
 		this.tableLoading = true
 		this.mainService.pathologyScanCode(data)
@@ -570,8 +569,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 					this.codeMultiData = res.data[0].pathologySpecimenDTOList
 					localStorage.setItem("scanCodeData",JSON.stringify(res))
 				}else{
-					let tip = `扫描“申请单号”的标本“标本号” + “标本名称”成功`
-					this.notification.create('success','提示',tip);
+					this.notification.create('success','提示',res.msg);
 					this.getJsData(1)
 				}
 				this.errorMsg = null
@@ -605,14 +603,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			barcode:e,
 			deptId:this.deptId,
 			pathologyFormId:this.scanCodeData.id,
-			tabType:null
-		}
-		if(this.dataType=='receive'){
-			data.tabType = 'receive'
-		}else if(this.dataType=='pack'){
-			data.tabType = 'pack'
-		}else{
-			delete data.tabType
+			platform:'pathologyHandoverBook',
 		}
 		setTimeout(_=>{
 			this.tableLoading = true
@@ -652,7 +643,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		}
 		let data: any = {
 			id:this.scanCodeData.id,
-			operationType:'pathologyReceive',
+			operationType:this.operationType,
 			batchNo:this.batchNo
 		};
 		this.btnMultiLoading = true;
@@ -667,7 +658,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		});
 	}
 
-	// 多只标本打包
+	// 多只标本扫描
 	submitMultiScanForm(){
 		let data1 = JSON.parse(localStorage.getItem("scanCodeData"))
 		this.scanCodeData = data1.data[0]
@@ -679,7 +670,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		}
 		let data: any = {
 			id:this.scanCodeData.id,
-			operationType:'pathologyPack',
+			operationType:this.operationType,
 			batchNo:this.batchNo
 		};
 		this.btnMultiLoading = true;

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

@@ -14,7 +14,7 @@
 					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>
 				</ng-template> -->
       </div>
-			<div>
+			<div class="error-box">
 				<div class="error-class">{{searchMsg}}</div>
 			</div>
     </div>
@@ -36,15 +36,15 @@
 	<div class="communication-tip">
 		<div class="mar-ri-30" *ngIf="toDayData">
 			今日产生：
-			申请单 <span class="weight">{{toDayData.pathologyFormNum}}</span> &nbsp;
-			标本 <span class="weight">{{toDayData.specimenNum}}</span>&nbsp;
-			速冻 <span class="weight">{{toDayData.rapidityNum}}</span>&nbsp;
+			申请单 <span class="weight">{{toDayData.pathologyFormNum || 0}}</span> &nbsp;
+			标本 <span class="weight">{{toDayData.specimenNum || 0}}</span>&nbsp;
+			速冻 <span class="weight">{{toDayData.rapidityNum || 0}}</span>&nbsp;
 		</div>
 	  <div class="mar-ri-30" *ngIf="toDayData">
 	  	今日送出：
-	  	申请单 <span class="weight">{{toDayData.pathologyFormNum}}</span> &nbsp;
-	  	标本 <span class="weight">{{toDayData.specimenNum}}</span>&nbsp;
-	  	速冻 <span class="weight">{{toDayData.rapidityNum}}</span>&nbsp;
+	  	申请单 <span class="weight">{{toDayData.sendOutPathologyFormNum || 0}}</span> &nbsp;
+	  	标本 <span class="weight">{{toDayData.sendOutSpecimenNum || 0}}</span>&nbsp;
+	  	速冻 <span class="weight">{{toDayData.sendOutRapidityNum || 0}}</span>&nbsp;
 	  </div>
 	</div>
 	<div class="tabs">
@@ -68,7 +68,8 @@
 			      </div>
 						<div class="list-template__searchItem">
 						  <span class="label">患者：</span>
-							<nz-select class="formItem" (nzOnSearch)="changeUserInp($event)"
+							<input type="text" class="search-input" [(ngModel)]="deliveryUser" nz-input placeholder="请输入患者" />
+<!-- 							<nz-select class="formItem" (nzOnSearch)="changeUserInp($event)"
 							  [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择患者"
 							  [(ngModel)]="deliveryUser">
 							  <ng-container *ngFor="let option of userData">
@@ -77,19 +78,15 @@
 							  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 							    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
 							  </nz-option>
-							</nz-select>
+							</nz-select> -->
 						</div>
 						<div class="list-template__searchItem">
 						  <span class="label">状态：</span>
-							<nz-select class="formItem" (nzOnSearch)="changeUserInp($event)"
-							  [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择状态"
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择状态"
 							  [(ngModel)]="status">
-							  <ng-container *ngFor="let option statusData">
-							    <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  <ng-container *ngFor="let option of statusData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 							  </ng-container>
-							  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-							    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-							  </nz-option>
 							</nz-select>
 						</div>
 						<div class="list-template__searchItem">
@@ -121,22 +118,22 @@
 								<th>固定时间</th>
 			          <th>配送人</th>
 								<th>配送时间</th>
-			          <th>操作</th>
+			          <th nzWidth="80px">操作</th>
 			        </tr>
 			      </thead>
 			      <tbody>
 			        <tr *ngFor="let data of listOneData">
 			          <td><span *ngIf="data.intraoperativeRapidity==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
-								<td>{{ data.patientDTO?data.patientDTO.patientName : '-' }}</td>
-								<td>{{ data.patientDTO.patientCode}}</td>
-			          <td>{{ data.patientDTO.patientCode}}</td>
+								<td>{{ data.status?data.status.name : '-' }}</td>
+								<td>{{ data.patientDTO.patientName}}</td>
+			          <td>{{ data.patientDTO.residenceNo}}</td>
 			          <td>{{ data.takePart}}</td>
 			          <td>{{ data.specimenNum}}</td>
 			          <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
-								<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
-								<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+								<td>{{ data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+								<td>{{ data.fixationTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 								<td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
-								<td>{{ data.receiveTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+								<td>{{ data.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
 			          <td>
 			            <div class="coop">
 										<span (click)="oneLook($event,data)">查看</span>
@@ -289,7 +286,6 @@
   [show]="hsPromptModalShow"
   (closeModelHs)="closeModelHs($event)"
   (clearModelHs)="clearModelHs($event)"
-  deptType="pathology"
 > 
   <!-- 返回系统按钮 -->
   <!-- 右侧悬浮框 -->
@@ -477,143 +473,4 @@
 			</div>
 		</div>
 	</div>
-</div>
-
-<!-- 补打 -->
-<app-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="parintLoading"
-  (confirmDelEvent)="confirmPrintDel()" [content]="'您确认要重新打印条码吗？'"></app-dialog-delete>
-	
-<!-- 配送 -->
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="distributionModal">
-	<div class="modalBody">
-		<div class="title">配送信息填写<i class="icon_transport transport-guanbi" (click)="hideDistributionModal()"></i>
-		</div>
-		<div class="content">
-		 <div class="title-class">包内含申请单{{rowData.pathologyFormNum}}张、标本{{rowData.specimenNum}}支，请填写配送人员工号。</div>
-		 <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitDistributionForm()">
-			<nz-form-item>
-				<nz-form-label nzRequired nzFor="jobNumber">配送人工号</nz-form-label>
-				<nz-form-control nzErrorTip="请输入配送人工号!">
-					<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入配送人工号" nzSize="default" />
-				</nz-form-control>
-			</nz-form-item>
-			<nz-form-item class="form-name">
-				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
-				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
-					<div class="job-class">{{distributionName}}</div>
-				<!-- </nz-form-control> -->
-			</nz-form-item>
-			<nz-form-item>
-				<nz-form-label nzRequired nzFor="gurop">接收院区</nz-form-label>
-				<nz-form-control nzErrorTip="请选择接收院区!">
-					<nz-input-group>
-						<nz-select class="formItem" (ngModelChange)="changeHospDate($event)" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择接收院区" formControlName="gurop">
-							<ng-container *ngFor="let option of hospital">
-								<nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
-							</ng-container>
-						</nz-select>
-					</nz-input-group>
-				</nz-form-control>
-			</nz-form-item>
-			<nz-form-item>
-				<nz-form-label nzRequired nzFor="department">接收科室</nz-form-label>
-				<nz-form-control nzErrorTip="请选择接收科室!">
-					<nz-input-group>
-						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择接收科室" formControlName="department">
-							<ng-container *ngFor="let option of department">
-								<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
-							</ng-container>
-							<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
-								<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-							</nz-option>
-						</nz-select>
-					</nz-input-group>
-				</nz-form-control>
-			</nz-form-item>
-		 </form>
-		</div>
-		<div class="display_flex justify-content_flex-center">
-			<button class="btn" nz-button nzType="primary" (click)="submitDistributionForm()" [nzLoading]="btnLoading">确定配送</button>
-			<button class="btn cancel" nz-button nzType="default" (click)="hideDistributionModal()">取消</button>
-		</div>
-	</div>
-</div>
-
-<!-- 配送接收 -->
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="receptionModal">
-	<div class="modalBody">
-		<div class="title">配送接收<i class="icon_transport transport-guanbi" (click)="hideReceptionModal()"></i>
-		</div>
-		<div class="content">
-		 <div class="title-class">
-			 包内含申请单12张、标本100，请确认接收。
-			</div>
-		 <form nz-form [formGroup]="validateConnectForm" class="addForm" (ngSubmit)="submitReceptionForm()">
-			<nz-form-item>
-				<nz-form-label nzRequired nzFor="receptionNumber">接收人工号</nz-form-label>
-				<nz-form-control nzErrorTip="请输入接收人工号!">
-					<input nz-input (ngModelChange)="receptionChange($event)" formControlName="receptionNumber" placeholder="请输入接收人工号" nzSize="default" />
-				</nz-form-control>
-			</nz-form-item>
-			<nz-form-item class="form-name">
-				<nz-form-label style="margin-left: 12px;">接收人姓名</nz-form-label>
-				<!-- <nz-form-control nzErrorTip="请输入接收人工号!"> -->
-					<div class="job-class">{{receptionName}}</div>
-				<!-- </nz-form-control> -->
-			</nz-form-item>
-			<nz-form-item>
-				<nz-form-label nzRequired nzFor="dispatchingNumber">配送人工号</nz-form-label>
-				<nz-form-control nzErrorTip="请输入配送人工号!">
-					<input nz-input (ngModelChange)="dispatchingChange($event)" formControlName="dispatchingNumber" placeholder="请输入配送人工号" nzSize="default" />
-				</nz-form-control>
-			</nz-form-item>
-			<nz-form-item class="form-name">
-				<nz-form-label style="margin-left: 12px;">配送人姓名</nz-form-label>
-				<!-- <nz-form-control nzErrorTip="请输入配送人工号!"> -->
-					<div class="job-class">{{dispatchingName}}</div>
-				<!-- </nz-form-control> -->
-			</nz-form-item>
-		 </form>
-		</div>
-		<div class="display_flex justify-content_flex-center">
-			<button class="btn" nz-button nzType="primary" (click)="submitReceptionForm()" [nzLoading]="btnConnectLoading">确定接收</button>
-			<button class="btn cancel" nz-button nzType="default" (click)="hideReceptionModal()">取消</button>
-		</div>
-	</div>
-</div>
-
-<!-- 打包并打印 -->
-<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="packModal">
-	<div class="modalBody">
-		<div class="title">打包并打印<i class="icon_transport transport-guanbi" (click)="hidePackModal()"></i>
-		</div>
-		<div class="content-modal">
-			 本次共扫描单据50张、标本40，是否打包并打印？
-		</div>
-		<div class="display_flex justify-content_flex-center">
-			<button class="btn" nz-button nzType="primary" (click)="submitPackForm()" [nzLoading]="btnPackLoading">打包并打印</button>
-			<button class="btn cancel" nz-button nzType="default" (click)="hidePackModal()">取消</button>
-		</div>
-	</div>
-</div>
-
-<!-- 打印 -->
-<div id="report" style="display: none;" *ngIf="printData">
-	<div class="monad">
-		<div style="font-size: 10px;padding: 2px;">
-			<!-- <div> -->
-				<div style="display: flex;align-items: center;justify-content: center;">
-					<img style="width: 100%;height: 60px;" [src]="printData.qrCode" alt="">
-				</div>
-				<div style="padding: 1px;">
-					<div style="display: flex;flex-wrap: nowrap;margin-bottom:3px;">包码:{{printData.packCode}}</div>
-					<div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div>
-					<!-- <div style="display: flex;">打包人:{{printData.packUserDTO?printData.packUserDTO.name:'-'}}</div> -->
-					<!-- <div style="display: flex;margin-bottom:6px;">申请单数:{{printData.pathologyFormNum}}</div> -->
-					<!-- <div style="display: flex;margin-bottom:6px;">标本数:{{printData.specimenNum}}</div> -->
-				</div>
-			<!-- </div> -->
-			<!-- <div style="display: flex;">打包时间:{{printData.packTime|date:'yyyy-MM-dd HH:mm:ss'}}</div> -->
-		</div>
-	</div>
 </div>

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

@@ -114,11 +114,14 @@
   			display: flex;
   			width: 270px;
       }
-  		.error-class{
-  			color: red;
-  		}
+			.error-box{
+				width:280px;
+				.error-class{
+					color: red;
+				}
+			}
     }
-  
+		
     .pharmacy-operate {
       width: 211px;
       display: flex;
@@ -582,6 +585,9 @@
           justify-content: center;
         }
       }
+			.search-input{
+				width: 133px;
+			}
       // 标题 end
       // 搜索框 start
       .pharmacy-main__search {

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

@@ -807,7 +807,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	currReceived:any = null;
 	submitFixationForm(){
 		this.btnLoading = true
-		this.mainService.getSpecimenInfo(this.batchNo,this.deptId).subscribe((res:any) => {
+		this.mainService.getSpecimenInfo(this.batchNo,this.deptId,{}).subscribe((res:any) => {
 			this.btnLoading = false
 			this.mustReceived = res.data.mustReceived;
 			this.currReceived = res.data.currReceived;

src/app/views/pathologyScan/pathologyScan.component.ts

@@ -512,7 +512,7 @@ export class PathologyScanComponent implements OnInit, OnDestroy {
 	currReceived:any = null;
 	submitFixationForm(){
 		this.btnLoading = true
-		this.mainService.getSpecimenInfo(this.batchNo,this.deptId).subscribe((res:any) => {
+		this.mainService.getSpecimenInfo(this.batchNo,this.deptId,{}).subscribe((res:any) => {
 			this.btnLoading = false
 			this.mustReceived = res.data.mustReceived;
 			this.currReceived = res.data.currReceived;

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

@@ -26,6 +26,7 @@
 			<div>
 				<div class="error-class">{{searchMsg}}</div>
 			</div>
+			<button class="right-btn" nz-button nzType="primary" nzSize="large" (click)="specimenCheck()">标本核对</button>
     </div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>

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

@@ -89,6 +89,7 @@
       align-items: center;
 			width: 60%;
 			justify-content: center;
+			position: relative;
       .pharmacy-name__title {
         font-size: 22px;
         color: #333;
@@ -112,6 +113,10 @@
 			.error-class{
 				color: red;
 			}
+			.right-btn{
+				position: absolute;
+				right: 10px;
+			}
     }
 
     .pharmacy-operate {

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

@@ -161,7 +161,16 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-
+	
+	// 标本核对
+	specimenCheck(){
+		this.mainService.generateBatchNumber()
+		.subscribe((res:any) =>{
+			localStorage.setItem("checkType",'specimenDept')
+			this.router.navigateByUrl(`/pathologyCheck?batchNo=${res.data}`);
+		})
+	}
+	
 	// 标本条码搜索
 	searchSpecimen(e){
 		if(!this.barCode){