病理交接本开发

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

@@ -287,7 +287,7 @@
   <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad">
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
+<!-- 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
 				 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
@@ -388,6 +388,57 @@
 					 </div>
 				 </div>
 				</div>
+			</div> -->
+			
+			<!-- 12.11新版打印样式 -->
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+				 <div>
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;">
+						 <div style="width: 60%;height: 70px;text-align: center;">
+							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
+							 <div>标本号:{{data.specimenCode}}</div>
+						 </div>
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+						 </div>
+					 </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>患者: {{data.patientName}}</div>
+								<div>性别: {{data.patientGender}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>住院号: {{data.residenceNo}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>科室: {{data.patientDept}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<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;">
+								 <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>
+						 </div>
+					 </div>
+				 </div>
+				 <div style="height: 26px;"></div>
+				</div>
 			</div>
 		</div>
   </div>

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

@@ -279,23 +279,30 @@ export class PathologyAddComponent implements OnInit {
 			this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData).subscribe((res) => {
 				this.specimenNameList = res.list;
 				if(type=='edit'){
+					this.validateSpecimenForm = this.fb.group({
+					  remark: [null, []],
+						specimenName: [null, [Validators.required]]
+					});
 					if(item.sample){
-						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, []],
-							specimenName: [null, [Validators.required]]
-						});
 						setTimeout(_=>{
 							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
 							this.specimenNameIndex = index4
 							this.specimenNameName = item.sample.name
 							this.specimenNameId = Number(item.sample.id);
 							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-						},100)
+							this.validateSpecimenForm.controls.remark.setValue(item.remark);
+							this.specimenModal = true
+						},50)
+					}else{
+						setTimeout(_=>{
+							this.specimenNameIndex = null
+							this.specimenNameName = ''
+							this.specimenNameId = null
+							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+							this.validateSpecimenForm.controls.remark.setValue(item.remark);
+							this.specimenModal = true
+						},50)
 					}
-					setTimeout(_=>{
-						this.validateSpecimenForm.controls.remark.setValue(item.remark);
-						this.specimenModal = true
-					},50)
 				}
 			});
 		}else{
@@ -307,27 +314,33 @@ export class PathologyAddComponent implements OnInit {
 			  .subscribe((data) => {
 			    this.specimenNameList = data.list;
 					if(type=='edit'){
+						this.validateSpecimenForm = this.fb.group({
+						  remark: [null, []],
+							specimenName: [null, [Validators.required]]
+						});
 						if(item.sample){
-							this.validateSpecimenForm = this.fb.group({
-							  remark: [null, []],
-								specimenName: [null, [Validators.required]]
-							});
 							setTimeout(_=>{
 								let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
 								this.specimenNameIndex = index4
 								this.specimenNameName = item.sample.name
 								this.specimenNameId = Number(item.sample.id);
 								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-							},100)
+								this.validateSpecimenForm.controls.remark.setValue(item.remark);
+								this.specimenModal = true
+							},50)
+						}else{
+							setTimeout(_=>{
+								this.specimenNameIndex = null
+								this.specimenNameName = ''
+								this.specimenNameId = null
+								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+								this.validateSpecimenForm.controls.remark.setValue(item.remark);
+								this.specimenModal = true
+							},50)
 						}
-						setTimeout(_=>{
-							this.validateSpecimenForm.controls.remark.setValue(item.remark);
-							this.specimenModal = true
-						},50)
 					}
 			  });
 		}
-
 	}
 	
 	// 删除标本

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

@@ -112,7 +112,7 @@
 <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad">
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+			<!-- <div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
 				 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
@@ -213,6 +213,56 @@
 					 </div>
 				 </div>
 				</div>
+			</div> -->
+			<!-- 12.11新版打印样式 -->
+			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
+				<div *ngFor="let data of printData.specimenList; let index=index;">
+				 <div>
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 70px;padding: 0 1px;">
+						 <div style="width: 60%;height: 70px;text-align: center;">
+							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
+							 <div>标本号:{{data.specimenCode}}</div>
+						 </div>
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+						 </div>
+					 </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>患者: {{data.patientName}}</div>
+								<div>性别: {{data.patientGender}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>住院号: {{data.residenceNo}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>科室: {{data.patientDept}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+							</div>
+							<div style="margin-top:11px;">
+								<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;">
+								 <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>
+						 </div>
+					 </div>
+				 </div>
+				 <div style="height: 26px;"></div>
+				</div>
 			</div>
 		</div>
   </div>

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2603,6 +2603,7 @@
 							<th>申请时间</th>
 							<th>申请科室</th>
 							<th>状态</th>
+							<th>操作</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -2616,6 +2617,13 @@
 							<td>{{ data.createTime | date:'yyyy-MM-dd HH:mm'}}</td>
 							<td>{{ data.patientDTO.department? data.patientDTO.department.dept:'-'}}</td>
 							<td>{{ data.status?data.status.name:'-'}}</td>
+							<td>
+							  <div class="coop">
+							    <span *ngIf="data.status.value==1 || data.status.value==2 
+									|| data.status.value==3 || data.status.value==4 || 
+									data.status.value==5" (click)="cancellation(data)">作废</span>
+							  </div>
+							</td>
 						</tr>
 					</tbody>
 				</nz-table>
@@ -2632,6 +2640,17 @@
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>
 
+<!-- 作废模态框 -->
+<app-dialog-delete [delModal]="cancellationModal" (hideDelModalEvent)="cancelCancellation()" [btnLoading]="cancellationLoading" 
+  (confirmDelEvent)="confirmCancellation()" (cancelDelEvent)="cancelCancellation()" content="是否作废申请单？" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 新增申请单提示 -->
+<nz-modal [(nzVisible)]="isPathologyVisible" nzTitle="提示" (nzOnCancel)="handlePathologyCancel()" (nzOnOk)="handlePathologyOk()">
+	<p><span class="red" *ngIf="viewData.length>0">{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）</span>患者已有申请单，如需<span class="red">追加新标本</span>可在<span class="red">原有</span>申请单中<span class="red">添加</span>；您确认要添加新的申请单吗？</p>
+	<p>注意：<span class="red">一个申请单出一个报告，请谨慎添加申请单；</span></p>
+</nz-modal>
+		
 <!-- 修改密码 -->
 <nz-modal [(nzVisible)]="isPwdVisible" nzTitle="修改密码" (nzOnCancel)="pwdHandleCancel()" (nzOnOk)="pwdHandleOk()" [nzOkLoading]="pwdIsOkLoading" (nzAfterOpen)="pwdAfterOpen()">
   <div>

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

@@ -336,10 +336,32 @@ export class HushijiandanComponent implements OnInit {
 		    }
 		  });
 	}
-
+	
 	// 新增申请单自选类型
 	applicationType:any;
+	isPathologyVisible:any = false;
 	addPathologyType(type){
+		this.applicationType = type
+		if(this.viewData.length>0){
+			this.isPathologyVisible = true
+		}else{
+			this.submitPathlogyForm()
+		}
+	}
+	
+	// 取消新增申请单自选类型
+	handlePathologyCancel(){
+		this.applicationType = null
+		this.isPathologyVisible = false
+	}
+	
+	// 确定新增申请单自选类型
+	handlePathologyOk(){
+		this.submitPathlogyForm()
+	}
+	
+	// 新增申请单自选类型
+	submitPathlogyForm(){
 		if(this.openType=='btn'){
 			this.surgeryDataId = this.surgeryWKOMsg.id
 			this.patientDataId = this.surgeryWKOMsg.patientDTO.id
@@ -347,7 +369,6 @@ export class HushijiandanComponent implements OnInit {
 			this.surgeryDataId = this.scheduleItem.id
 			this.patientDataId = this.scheduleItem.patientDTO.id
 		}
-		this.applicationType = type
 		let data = {
 			idx: 0,
 			sum: 9999,
@@ -355,17 +376,18 @@ export class HushijiandanComponent implements OnInit {
 			patientId: this.patientDataId || "",
 			hosId: this.currentHospital.id || "" ,
 			operationType: 'pathologyForm',
-			pathologyFormType: type
+			pathologyFormType: this.applicationType
 		};
 		this.mainService
 		.simplePost("addData", "pathologyForm", data)
 		.subscribe((data) => {
 			this.detailId = data.data.id
+			this.isPathologyVisible = false
 			this.multiDialog = false
 			this.pathologyModal = true
 		});
 	}
-
+	
 	// 手术排程-病理申请单
 	openType:any;
 	scheduleItem:any;
@@ -491,7 +513,43 @@ export class HushijiandanComponent implements OnInit {
 			}
 		});
 	}
-
+	
+	// 获取病理申请单最新数据
+	getPathologyData(){
+		if(this.openType=='btn'){
+			this.surgeryDataId = this.surgeryWKOMsg.id
+			this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		}else{
+			this.surgeryDataId = this.scheduleItem.id
+			this.patientDataId = this.scheduleItem.patientDTO.id
+		}
+		let data = {
+			idx: 0,
+			sum: 9999,
+			pathologyForm: {
+				patientId: this.patientDataId || "",
+				hosId: this.currentHospital.id || "" ,
+				operationType: 'pathologyForm',
+				order:'createTime desc'
+			},
+		};
+		this.isSpinning = true
+		this.mainService
+		.getFetchDataList("data", "pathologyForm", data)
+		.subscribe((data) => {
+			this.isSpinning = false
+			this.viewData = data.list
+			for(let i of this.viewData){
+				if(i.pathologyInspectDTOS){
+					i.arr = []
+					for(let x of i.pathologyInspectDTOS){
+						i.arr.push(x.inspectProject.name)
+					}
+				}
+			}
+		})
+	}
+	
 	// 申请单号点击
 	itemClick(item){
 		this.detailId = item.id
@@ -509,7 +567,36 @@ export class HushijiandanComponent implements OnInit {
 			}
 		},200)
 	}
-
+	
+	// 申请单作废
+	cancellationLoading:any = false;
+	cancellationModal:any = false;
+	cancellation(data){
+		this.coopId = data.id
+		this.cancellationModal = true
+	}
+	
+	// 确定作废
+	confirmCancellation(){
+		this.cancellationLoading = true;
+		this.mainService
+		.coopTypeConfig('rmvData', 'pathologyForm', [this.coopId])
+		.subscribe((data) => {
+			this.cancellationLoading = false;
+			this.cancelCancellation();
+			if (data["status"] == 200) {
+				this.showPromptModal("作废", true, "", "application");
+			} else {
+				this.showPromptModal("作废", false, data["msg"]);
+			}
+		});
+	}
+	
+	// 取消作废
+	cancelCancellation(){
+		this.cancellationModal = false
+	}
+	
 	hideModal(){
 		this.multiDialog = false
 	}
@@ -1030,8 +1117,11 @@ export class HushijiandanComponent implements OnInit {
     } else if (e === "bb") {
       this.getOrderList();
       this.getSpecimenWorkOrderMsg();
-    }
+    } else if (e === "application"){
+			this.getPathologyData()
+		}
   }
+
   // 其他建单
   selectOtherId; //选中的id
   otherSearch = ""; //搜索的关键词

src/app/views/login/login.component.ts

@@ -237,6 +237,8 @@ export class LoginComponent implements OnInit {
       }
       canLogin = true;
     });
+		localStorage.setItem("bookBatchNo",'')
+		localStorage.setItem("specimenBatchNo",'')
 		if(this.paramsData.toPage1 && this.paramsData.cardNO1){
 			this.msg.success("登录成功！", {
 			  nzDuration: 1000,

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.scanPathologyFormNum}}</span>&nbsp;
-							申请单标本: <span class="weight">{{otherData.scanSpecimenNum}}</span>&nbsp;
+							已扫描申请单: <span class="weight">{{otherData.scanPathologyFormNum}}</span>&nbsp;
+							标本: <span class="weight">{{otherData.scanSpecimenNum}}</span>&nbsp;
 						</div>
 					</div>
 					
@@ -72,7 +72,7 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" [disabled]="codeData.length==0" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">核对完成</button>
+			<button class="btn btn-right" [disabled]="alreadyData.length==0" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">核对完成</button>
 			<!-- <button class="btn btn-right" *ngIf="dataType?dataType=='pack' : businessType == 'packaging'" [disabled]="codeData.length==0" nz-button nzType="primary" (click)="submitScanForm()" [nzLoading]="btnLoading">核对完成</button> -->
 			<!-- <button class="btn btn-right" *ngIf="dataType=='pathologyPack'" nz-button nzType="primary" [disabled]="codeData.length==0" (click)="connectAccomplish()" [nzLoading]="btnMultiLoading">核对完成</button> -->
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
@@ -93,7 +93,7 @@
 				<div class="center">提示：{{scanCodeData.patientName}}的申请单含<span>{{codeMultiData.length}}</span>支标本，您已扫描<span>{{muArr.length}}</span>支</div>
 				<div class="disp-fl df-center">
 					<div>
-						<input nz-input id="multiSpecimen" placeholder="可扫描物理标本条码及包码" [(ngModel)]="specimenMultiCode" (ngModelChange)="codeMultiChange($event)"/>
+						<input nz-input id="multiSpecimen" placeholder="可扫描物理标本条码及申请单" [(ngModel)]="specimenMultiCode" (ngModelChange)="codeMultiChange($event)"/>
 					</div>
 					<div class="error-class">{{errorMultiMsg}}</div>
 				</div>

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

@@ -193,7 +193,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		if(this.placeholderType==1){
 			this.placeholder = '可扫描物理标本条码'
 		}else{
-			this.placeholder = '可扫描物理标本条码及包码'
+			this.placeholder = '可扫描物理标本条码及申请单'
 		}
 		let scanData = localStorage.getItem("scanCodeData")
 		this.dataType = localStorage.getItem("dataType")
@@ -259,6 +259,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 	pageReceptionIndex:any = 1;
 	listReceptionLength:any = 0;
 	otherData:any=null;
+	alreadyData:any = [];
 	getJsData(type){
 		let data = {
 		  idx: this.pageReceptionIndex-1,
@@ -287,7 +288,12 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 				this.tableLoading = false;
 				if(type==1 || type==4 || type==5){
 					this.fixationModal = true
-					this.codeData = res.list;
+					if(this.activeIndex==0){
+						this.alreadyData = res.list;
+						this.codeData = this.alreadyData
+					}else{
+						this.codeData = res.list;
+					}
 					if(type==1){
 						setTimeout(_=>{
 							document.getElementById('specimen').focus();
@@ -469,6 +475,11 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		  .subscribe((res:any) => {
 				this.btnConnectLoading = false
 		    if (res.status == 200) {
+					if(this.operationType=='pathologyHandoverBook'){
+						localStorage.setItem("bookBatchNo",'')
+					}else{
+						localStorage.setItem("specimenBatchNo",'')
+					}
 		      this.showPromptModal("操作", true, "");
 		    } else {
 		      this.showPromptModal("操作", false, res.msg);
@@ -549,7 +560,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			barcode:e,
 			deptId:this.deptId,
 			batchNo:this.batchNo,
-			platform:'pathologyHandoverBook',
+			platform:this.operationType,
 		}
 		this.tableLoading = true
 		this.mainService.pathologyScanCode(data)
@@ -570,6 +581,8 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 					localStorage.setItem("scanCodeData",JSON.stringify(res))
 				}else{
 					this.notification.create('success','提示',res.msg);
+					this.activeIndex = 0
+					this.codeData = []
 					this.getJsData(1)
 				}
 				this.errorMsg = null
@@ -603,7 +616,7 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 			barcode:e,
 			deptId:this.deptId,
 			pathologyFormId:this.scanCodeData.id,
-			platform:'pathologyHandoverBook',
+			platform:this.operationType,
 		}
 		setTimeout(_=>{
 			this.tableLoading = true
@@ -679,7 +692,9 @@ export class PathologyCheckComponent implements OnInit, OnDestroy {
 		.subscribe((res) => {
 			this.message.success('操作成功')
 			setTimeout(_=>{
+				this.activeIndex = 0
 				this.btnMultiLoading = false;
+				this.codeData = []
 				this.hideMultiModal()
 			},500)
 		});

src/app/views/pathology-communication-book/pathology-communication-book.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" (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>
@@ -91,7 +91,7 @@
 						</div>
 						<div class="list-template__searchItem">
 						  <span class="label">术中快速：</span>
-							<nz-radio-group [(ngModel)]="intraoperativeRapidity">
+							<nz-radio-group [(ngModel)]="pathologyFormType">
 								<label nz-radio nzValue="1">是</label>
 								<label nz-radio nzValue="0">否</label>
 							</nz-radio-group>
@@ -111,7 +111,7 @@
 								<th>状态</th>
 			          <th>患者姓名</th>
 			          <th>住院号</th>
-			          <th>部位</th>
+			          <th nzWidth="100px">部位</th>
 			          <th>标本数</th>
 			          <th>申请科室</th>
 								<th>离体时间</th>
@@ -123,7 +123,7 @@
 			      </thead>
 			      <tbody>
 			        <tr *ngFor="let data of listOneData">
-			          <td><span *ngIf="data.intraoperativeRapidity==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+			          <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
 								<td>{{ data.status?data.status.name : '-' }}</td>
 								<td>{{ data.patientDTO.patientName}}</td>
 			          <td>{{ data.patientDTO.residenceNo}}</td>
@@ -172,7 +172,7 @@
       	      </thead>
       	      <tbody>
       	        <tr *ngFor="let data of listTwoData">
-      	         <td><span *ngIf="data.intraoperativeRapidity==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+      	         <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
       	         <td>{{ data.patientDTO?data.patientDTO.patientName : '-' }}</td>
       	         <td>{{ data.patientDTO.patientCode}}</td>
       	         <td>{{ data.takePart}}</td>
@@ -258,26 +258,6 @@
   <!-- <router-outlet></router-outlet> -->
 </div>
 
-<!-- 科室二维码模态框 -->
-<!-- 在模态框所在的 div 添加属性 [appDrag] -->
-<div appDrag class="modal" *ngIf="isShowNurseCode">
-  <div class="header drag-title">
-    <h2>签到二维码</h2>
-    <i
-      class="icon-close icon_transport transport-guanbi1"
-      (click)="closeNurseCode()"
-    ></i>
-  </div>
-  <div class="dialog-center">
-    <div class="dialog-code">
-      <img [src]="nurseCodeImg" alt="" />
-    </div>
-  </div>
-  <div class="dialog-operate">
-    <strong class="dialog-refresh" (click)="showNurseCode()">刷新</strong>
-    <span>{{ refreshQRCodeTime }}s</span>
-  </div>
-</div>
 <!-- 科室切换提示框 -->
 <app-hs-prompt-modal
   [changeShow]="changeShow"
@@ -342,7 +322,7 @@
 		<div class="content border">
 			<div class="content-item boder-right">
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.pathologyFormType==1?'是':'否'}}</div>
 					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
 					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
 					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>

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

@@ -115,9 +115,10 @@
   			width: 270px;
       }
 			.error-box{
-				width:280px;
+				
 				.error-class{
 					color: red;
+					// width:280px;
 				}
 			}
     }

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

@@ -145,7 +145,7 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 	changeInpSubjectUser = new Subject(); //防抖
 	changeInpSubjectSpecimen = new Subject(); //防抖
 	changeInpSubjectDepartment = new Subject(); //防抖
-	intraoperativeRapidity:any = null; //术中快速
+	pathologyFormType:any = null; //术中快速
 	status:any; //状态
 	deliveryUser:any //配送人
 	userData:any = []; //患者数据
@@ -168,6 +168,7 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 	toDayData:any = null;
 	toDayTime:any = null;
 	backType:any = 'list';
+	mainRole:any = false;
 	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
 	  .id; //登录人所属科室
   ngOnDestroy() {
@@ -265,11 +266,8 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 	// 重置
 	reset() {
 	  this.pageOneIndex = 1;
-	  this.startDate = null;
-		this.endDate = null;
-		this.acceptTime = [];
 		this.status = null;
-		this.intraoperativeRapidity = null;
+		this.pathologyFormType = null;
 		this.deliveryUser = null;
 	  this.getConnectList();
 	}
@@ -288,7 +286,7 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 				status:{
 					id:this.status
 				},
-				intraoperativeRapidity:this.intraoperativeRapidity
+				pathologyFormType:this.pathologyFormType
 	    },
 	  };
 	  this.loading1 = true;
@@ -325,13 +323,21 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 
 	// 配送清点
 	distributionTab(){
-		this.mainService.generateBatchNumber()
-		.subscribe((res:any) =>{
-			this.batchNo = res.data
+		this.batchNo = localStorage.getItem("bookBatchNo")
+		if(this.batchNo){
 			localStorage.setItem("scanCodeData",'')
 			localStorage.setItem("checkType",'pathologyHandoverBook')
 			this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}`);
-		})
+		}else{
+			this.mainService.generateBatchNumber()
+			.subscribe((res:any) =>{
+				this.batchNo = res.data
+				localStorage.setItem("bookBatchNo",res.data)
+				localStorage.setItem("scanCodeData",'')
+				localStorage.setItem("checkType",'pathologyHandoverBook')
+				this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}`);
+			})
+		}
 	}
 	
 	// 关闭查看标本
@@ -428,32 +434,57 @@ export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
 			return
 		}
 		this.isSpinning = true
-		this.mainService.generateBatchNumber()
-		.subscribe((res1:any) => {
-			if(res1.status==200){
-				this.batchNo = res1.data
-				let data={
-					barcode:e,
-					deptId:this.deptId,
-					batchNo:this.batchNo,
-					platform:'pathologyHandoverBook',
+		this.batchNo = localStorage.getItem("bookBatchNo")
+		if(this.batchNo){
+			let data={
+				barcode:e,
+				deptId:this.deptId,
+				batchNo:this.batchNo,
+				platform:'pathologyHandoverBook',
+			}
+			this.mainService.pathologyScanCode(data)
+			.subscribe((res:any) => {
+				this.isSpinning = false
+				if(res.status==200){
+					localStorage.setItem("scanCodeData",JSON.stringify(res))
+					localStorage.setItem("dataType",res.dataType)
+					localStorage.setItem("checkType",'pathologyHandoverBook')
+					this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}&businessType=connect`);
+					this.searchMsg = null
+				}else{
+					this.barCode = null
+					this.searchMsg = res.msg
 				}
-				this.mainService.pathologyScanCode(data)
-				.subscribe((res:any) => {
-					this.isSpinning = false
-					if(res.status==200){
-						localStorage.setItem("scanCodeData",JSON.stringify(res))
-						localStorage.setItem("dataType",res.dataType)
-						localStorage.setItem("checkType",'pathologyHandoverBook')
-						this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}&businessType=connect`);
-						this.searchMsg = null
-					}else{
-						this.barCode = null
-						this.searchMsg = res.msg
+			})
+		}else{
+			this.mainService.generateBatchNumber()
+			.subscribe((res1:any) => {
+				if(res1.status==200){
+					this.batchNo = res1.data
+					localStorage.setItem("bookBatchNo",res1.data)
+					let data={
+						barcode:e,
+						deptId:this.deptId,
+						batchNo:this.batchNo,
+						platform:'pathologyHandoverBook',
 					}
-				})
-			}
-		})
+					this.mainService.pathologyScanCode(data)
+					.subscribe((res:any) => {
+						this.isSpinning = false
+						if(res.status==200){
+							localStorage.setItem("scanCodeData",JSON.stringify(res))
+							localStorage.setItem("dataType",res.dataType)
+							localStorage.setItem("checkType",'pathologyHandoverBook')
+							this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}&businessType=connect`);
+							this.searchMsg = null
+						}else{
+							this.barCode = null
+							this.searchMsg = res.msg
+						}
+					})
+				}
+			})
+		}
 	}
 	
 	// 获取标本接收数据

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

@@ -76,7 +76,7 @@
 						</div>
 						<div class="list-template__searchItem">
 						  <span class="label">术中快速：</span>
-							<nz-radio-group [(ngModel)]="intraoperativeRapidity">
+							<nz-radio-group [(ngModel)]="pathologyFormType">
 								<label nz-radio nzValue="1">是</label>
 								<label nz-radio nzValue="0">否</label>
 							</nz-radio-group>
@@ -106,7 +106,7 @@
 			      </thead>
 			      <tbody>
 			        <tr *ngFor="let data of listOneData">
-			          <td><span *ngIf="data.intraoperativeRapidity==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+			          <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
 								<td>{{ data.patientDTO?data.patientDTO.patientName : '-' }}</td>
 			          <td>{{ data.patientDTO.patientCode}}</td>
 			          <td>{{ data.takePart}}</td>
@@ -153,7 +153,7 @@
       	      </thead>
       	      <tbody>
       	        <tr *ngFor="let data of listTwoData">
-      	         <td><span *ngIf="data.intraoperativeRapidity==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+      	         <td><span *ngIf="data.pathologyFormType==1" style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
       	         <td>{{ data.patientDTO?data.patientDTO.patientName : '-' }}</td>
       	         <td>{{ data.patientDTO.patientCode}}</td>
       	         <td>{{ data.takePart}}</td>
@@ -324,7 +324,7 @@
 		<div class="content border">
 			<div class="content-item boder-right">
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
+					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.pathologyFormType==1?'是':'否'}}</div>
 					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
 					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
 					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>

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

@@ -144,7 +144,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	changeInpSubjectUser = new Subject(); //防抖
 	changeInpSubjectSpecimen = new Subject(); //防抖
 	changeInpSubjectDepartment = new Subject(); //防抖
-	intraoperativeRapidity:any = null; //术中快速
+	pathologyFormType:any = null; //术中快速
 	deliveryUser:any //配送人
 	acceptTime:any; //接收时间
 	userData:any = []; //配送人数据
@@ -313,7 +313,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	  this.startDate = null;
 		this.endDate = null;
 		this.acceptTime = [];
-		this.intraoperativeRapidity = null;
+		this.pathologyFormType = null;
 		this.deliveryUser = null;
 	  this.getConnectList();
 	}
@@ -328,7 +328,7 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	  		endTime: this.endDate,
 				receiveDept:this.deptId,
 				deliveryUser:this.deliveryUser,
-				intraoperativeRapidity:this.intraoperativeRapidity
+				pathologyFormType:this.pathologyFormType
 	    },
 	  };
 	  this.loading1 = true;
@@ -349,8 +349,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		  sum: that.pageSize,
 		  pathologyForm: {
 				executiveDept:this.deptId,
-				intraoperativeRapidity:1,
-				operationType:'intraoperativeRapidity'
+				pathologyFormType:1,
+				operationType:'pathologyFormType'
 		  },
 		};
 		this.loading2 = true;

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

@@ -26,7 +26,7 @@
 			<div>
 				<div class="error-class">{{searchMsg}}</div>
 			</div>
-			<button class="right-btn" nz-button nzType="primary" nzSize="large" (click)="specimenCheck()">标本核对</button>
+			<button class="right-btn" nz-button nzType="primary" (click)="specimenCheck()">标本核对</button>
     </div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>
@@ -80,7 +80,8 @@
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
                 <span title="住院号" class="weight">
-									<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
+									<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
+									<span *ngIf="item.pathologyFormType==0">普</span>
 									{{item.applyCode || '无'}}
 								</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
@@ -170,8 +171,9 @@
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
                 <span title="住院号" class="weight">
-            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
-            			{{item.applyCode || '无'}}
+									<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
+									<span *ngIf="item.pathologyFormType==0">普</span>
+									{{item.applyCode || '无'}}
             		</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
               </div>
@@ -260,8 +262,9 @@
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
                 <span title="住院号" class="weight">
-            			<span class="sign-red" *ngIf="item.intraoperativeRapidity==1">速冻</span>
-            			{{item.applyCode || '无'}}
+            			<span class="sign-red" *ngIf="item.pathologyFormType==1">速</span>
+            			<span *ngIf="item.pathologyFormType==0">普</span>
+									{{item.applyCode || '无'}}
             		</span>
                 <span title="姓名" class="weight text-right">{{item.patientDTO.patientName || '无'}}</span>
               </div>
@@ -446,6 +449,16 @@
 					</nz-radio-group>
 				</nz-form-control>
 			</nz-form-item>
+			
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="showFrozen">标本是否显示速冻</nz-form-label>
+				<nz-form-control nzErrorTip="请选择!">
+					<nz-radio-group formControlName="showFrozen">
+						<label nz-radio [nzValue]="1">是</label>
+						<label nz-radio [nzValue]="0">否</label>
+					</nz-radio-group>
+				</nz-form-control>
+			</nz-form-item>
 		 </form>
 		</overlay-scrollbars>
 		<div class="display_flex justify-content_flex-center">

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

@@ -350,7 +350,6 @@
 								font-weight: 500;
 								.sign-red{
 									color: red;
-									margin-right: 10px;
 								}
 							}
               .moreContent{

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

@@ -163,12 +163,20 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   }
 	
 	// 标本核对
+	batchNo:any = null;
 	specimenCheck(){
-		this.mainService.generateBatchNumber()
-		.subscribe((res:any) =>{
+		this.batchNo = localStorage.getItem("specimenBatchNo")
+		if(this.batchNo){
 			localStorage.setItem("checkType",'specimenDept')
-			this.router.navigateByUrl(`/pathologyCheck?batchNo=${res.data}`);
-		})
+			this.router.navigateByUrl(`/pathologyCheck?batchNo=${this.batchNo}`);
+		}else{
+			this.mainService.generateBatchNumber()
+			.subscribe((res:any) =>{
+				localStorage.setItem("specimenBatchNo",res.data)
+				localStorage.setItem("checkType",'specimenDept')
+				this.router.navigateByUrl(`/pathologyCheck?batchNo=${res.data}`);
+			})
+		}
 	}
 	
 	// 标本条码搜索
@@ -190,7 +198,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			if(res.status==200){
 				this.codeData = res.data[0]
 				let item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == e)
-				console.log(7,item)
 				if(!item.fixationTime && this.codeData.pathologyFormType==0){
 					if(this.codeData.status.value==2 || this.codeData.status.value==3 ||
 						this.codeData.status.value==4){
@@ -274,6 +281,8 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.btnLoading = true
 		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
 			this.fixativeData = res
+			let item = this.fixativeData.find(i=>i.value==1)
+			this.validateVerificationForm.controls.fixative.setValue(item.id);
 			this.btnLoading = false
 			this.verificationMoadl = true
 		});
@@ -393,6 +402,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 					this.validateForm.controls.operation.setValue(deptArr);
 				}
 				this.validateForm.controls.specimen.setValue(data.dept.id);
+				this.validateForm.controls.showFrozen.setValue(data.showFrozen);
 				if(data.autoCreateOrder){
 					this.validateForm.controls.generate.setValue(data.autoCreateOrder);
 				}
@@ -406,12 +416,14 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			  specimen: [this.validateForm.value.specimen, [Validators.required]],
 				operation: [this.validateForm.value.operation, [Validators.required]],
 				generate:[this.validateForm.value.generate, [Validators.required]],
+				showFrozen:[this.validateForm.value.showFrozen, [Validators.required]],
 			});
 		}else{
 			this.validateForm = this.fb.group({
 			  specimen: [null, [Validators.required]],
 				operation: [null, [Validators.required]],
 				generate:[1, [Validators.required]],
+				showFrozen:[0, [Validators.required]],
 			});
 		}
 		this.relevanceModal = true
@@ -429,6 +441,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		let data = {
 		  user: {
 		    autoCreateOrder: this.validateForm.value.generate,
+				showFrozen: this.validateForm.value.showFrozen,
 				dept:{
 					id:this.validateForm.value.specimen
 				},