Merge branch 'master' into develop

src/app/app-routing.module.ts

@@ -101,6 +101,16 @@ const routes: Routes = [
 		path: 'pathologySample',
 		loadChildren: () => import('./views/pathology-sample/pathology-sample.module').then(m => m.PathologySampleModule),
 	},
+	// 病理交接本
+	{
+		path: 'pathologyCommunicationBook',
+		loadChildren: () => import('./views/pathology-communication-book/pathology-communication-book.module').then(m => m.PathologyCommunicationBookModule),
+	},
+	// 交接本核对页
+	{
+		path: 'pathologyCheck',
+		loadChildren: () => import('./views/pathology-check/pathology-check.module').then(m => m.PathologyCheckModule),
+	},
   // 全局业务查看
   {
     path: 'disinfectionSupply',

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/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

@@ -854,7 +854,10 @@
               <!-- 手术排程信息 -->
               <div *ngIf="checkedTableType == 'surgery'" style="flex: 1; height: 100%;min-height:0;">
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
-                  <div class="left alignC display_flex justify-content_flex-center align-items_center"></div>
+                  <div class="left alignC display_flex justify-content_flex-center align-items_center">
+										<span class="label">排程时间：</span>
+										<nz-date-picker [(ngModel)]="scheduleTime" (ngModelChange)="changeDate($event)"></nz-date-picker>
+									</div>
                   <div class="btns">
                     <button
                       nz-button
@@ -2600,6 +2603,7 @@
 							<th>申请时间</th>
 							<th>申请科室</th>
 							<th>状态</th>
+							<th>操作</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -2613,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>
@@ -2629,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

@@ -33,6 +33,7 @@ import {
   startOfDay,
   endOfDay,
   parse,
+	subHours 
 } from "date-fns";
 import { SourceId } from "src/app/type/types";
 import cloneDeep from 'lodash-es/cloneDeep'
@@ -335,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
@@ -346,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,
@@ -354,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;
@@ -490,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
@@ -508,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
 	}
@@ -1029,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 = ""; //搜索的关键词
@@ -1138,6 +1229,7 @@ export class HushijiandanComponent implements OnInit {
 
   // 手术提示信息
   surgeryLoading = false;
+	now:any = new Date();
   getSurgeryWKOMsg() {
     if(this.currentDept.typeValue != 'surgery'){
       return;
@@ -1146,8 +1238,8 @@ export class HushijiandanComponent implements OnInit {
       idx: 0,
       sum: 1,
       surgery: {
-        applyDateStart: format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
-        applyDateEnd: format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
+        applyDateStart: format(subHours(new Date(),12), "yyyy-MM-dd HH:mm:ss"),
+        applyDateEnd: format(endOfDay(new Date()), "yyyy-MM-dd")+' '+'23:59:59',
         // hosId: this.currentHospital.id,
         surgeryDept: this.loginUserDeptId,
         state: {
@@ -3910,6 +4002,20 @@ export class HushijiandanComponent implements OnInit {
         that.adviceListLength = data.totalNum || 0;
       });
   }
+	
+	startDate:any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	endDate:any = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	scheduleTime: any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	changeDate(result){
+		if(result){
+			this.startDate = format(result, 'yyyy-MM-dd') +' '+ '00:00:00';
+			this.endDate = format(result, 'yyyy-MM-dd') +' '+'23:59:59';
+		}else{
+			this.startDate = null
+			this.endDate = null
+		}
+	}
+	
   // 手术排程信息表格数据
   surgeryList: any = [];
   surgeryPageIndex: number = 1; //表格当前页码
@@ -3924,8 +4030,8 @@ export class HushijiandanComponent implements OnInit {
     }
     let postData:any = {
       surgery: {
-        applyDateStart: format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
-        applyDateEnd: format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss"),
+				applyDateStart: this.startDate,
+				applyDateEnd: this.endDate,
         // hosId: this.currentHospital.id,
       },
       idx: this.surgeryPageIndex - 1,

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/main/main.component.html

@@ -47,6 +47,7 @@
               <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>
               <div class="dropdownItem" *ngIf="pathology" (click)="toPathology()">病理科端</div>
 							<div class="dropdownItem" *ngIf="sampling" (click)="toSampling()">门诊病理采样端</div>
+							<div class="dropdownItem" *ngIf="communicationBook" (click)="toCommunicationBook()">病理交接本</div>
 							<div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
             </div>
           </div>

src/app/views/main/main.component.ts

@@ -32,6 +32,7 @@ export class MainComponent implements OnInit {
 	specimenRoomView: boolean = false; //标本间权限
 	pathology: boolean = false; //病理科权限
 	sampling: boolean = false; //门诊病理采样端权限
+	communicationBook: boolean = false; //病理交接本权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
   incidentConfigRole: boolean = false; //事件配置权限
   otherConfigRole: boolean = false; //三方配置权限
@@ -307,6 +308,10 @@ export class MainComponent implements OnInit {
 			  this.sampling = true;
 			  console.log("门诊病理采样端权限");
 			}
+			if (e.link == "pathologyCommunicationBook") {
+			  this.communicationBook = true;
+			  console.log("病理交接本权限");
+			}
       if (e.link == "disinfectionSupply") {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
@@ -450,6 +455,10 @@ export class MainComponent implements OnInit {
 	toSampling(): void {
 	  this.router.navigateByUrl("pathologySample");
 	}
+	// 病理交接本
+	toCommunicationBook(): void {
+	  this.router.navigateByUrl("pathologyCommunicationBook");
+	}
   // 全局业务查看
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");

src/app/views/pathology-check/pathology-check-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { PathologyCheckComponent } from "./pathology-check.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: PathologyCheckComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PathologyCheckRoutingModule {}

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

@@ -0,0 +1,186 @@
+<!-- 标本接收 -->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="fixationModal">
+	<div class="pathology-content">
+		<div class="title">
+		<!-- <i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i></div> -->
+		<div class="content">
+			<div class="content-item">
+				<!-- <div class="center">提示：申请单含<span class="red">{{codeData.specimenNum}}</span>只标本，已扫<span class="red">{{codeData.pathologySpecimenDTOList.length}}</span>只<span *ngIf="codeData.pathologySpecimenDTOList.length < codeData.specimenNum">，请继续扫描标本。</span></div> -->
+				<div class="disp-fl">
+					<div class="disp-title">
+						<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;
+						</div>
+					</div>
+					
+					<div *ngIf="dataType!='pathologyPack' && businessType!='packagLook'">
+						<input nz-input id="specimen" [placeholder]="placeholder" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
+					</div>
+					<div class="error-class">{{errorMsg}}</div>
+				</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 == 1}" (click)="tabClick(1)">未扫描</div>
+					</div>
+				</div>
+				<div class="list-template">
+				  <div class="list-template__content">
+						<div class="list-template__bottom" style="padding: 0 !important;">
+							<nz-table class="list-template__nzTable" [nzData]="codeData" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
+								<thead>
+									<tr class="thead">
+										<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>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeData let index = index">
+										<td>
+											<div>{{ data.applyCode}}</div>
+											<div>{{ data.patientDTO.department.dept}}</div>
+										</td>
+										<td>
+											<div>{{ data.patientDTO.patientName}}</div>
+											<div>{{ data.patientDTO.residenceNo}}</div>
+										</td>
+										<td>{{ data.specimenNum}}</td>
+										<td>{{ data.takePart}}</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>
+							<div class="list-template__pagination">
+							  <nz-pagination [(nzPageIndex)]="pageReceptionIndex" [(nzTotal)]="listReceptionLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+							    (nzPageIndexChange)="pageChange()" (nzPageSizeChange)="pageChange()">
+							  </nz-pagination>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<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>
+<!-- 			<button class="btn cancel" *ngIf="dataType?dataType=='pack' : businessType == 'packaging'" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+			<button class="btn btn-right" *ngIf="businessType=='packagLook'" nz-button nzType="primary" (click)="hideSpecimenModal()">知道了</button> -->
+		</div>
+	</div>
+</div>
+</div>
+
+<!-- 多支标本提示 -->
+<div class="multi add display_flex align-items_center justify-content_flex-center" *ngIf="multiModal">
+	<div class="pathology-content">
+		<div class="title">多支标本提示
+		<i class="icon_transport transport-guanbi" (click)="hideMultiModal()"></i></div>
+		<div class="content border">
+			<div class="content-item">
+				<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)"/>
+					</div>
+					<div class="error-class">{{errorMultiMsg}}</div>
+				</div>
+				<div class="list-template">
+				  <div class="list-template__content">
+						<div class="list-template__bottom" style="padding: 0 !important;">
+							<nz-table class="list-template__nzTable" [nzData]="codeMultiData" nzSize="middle" [nzShowPagination]="false"
+								[nzLoading]="tableLoading">
+								<thead>
+									<tr class="thead">
+										<th>序号</th>
+										<th>条码号</th>
+										<th>标本名称</th>
+										<th>已扫描 | 未扫描</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeMultiData let index = index">
+										<td>{{index+1}}</td>
+										<td>{{ data.specimenCode}}</td>
+										<td>
+											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
+										</td>
+										<td>
+											<div *ngIf="data.isScan==1">已扫描</div>
+											<div *ngIf="data.isScan==0" class="red">未扫描</div>
+										</td>
+									</tr>
+								</tbody>
+							</nz-table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<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>
+</div>
+
+
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="hideSpecimenModal()"></app-prompt-modal>
+	
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>
+
+<!-- 核对 -->
+<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>
+		<div class="content">
+		 <div class="title-class">
+			 您本次共扫描<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>
+				<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>
+					<div class="job-class">{{dispatchingName}}</div>
+			</nz-form-item>
+			<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>
+					<div class="job-class">{{receptionName}}</div>
+			</nz-form-item>
+		 </form>
+		</div>
+		<div class="display_flex justify-content_flex-center">
+			<button class="btn" nz-button nzType="primary" (click)="submitConnectForm()" [nzLoading]="btnConnectLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideConnectModal()">取消</button>
+		</div>
+	</div>
+</div>

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

@@ -0,0 +1,718 @@
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ActivatedRoute, Router } from "@angular/router";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { startOfDay, format, endOfDay } from "date-fns";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService, NzNotificationService } from "ng-zorro-antd";
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { DomSanitizer } from '@angular/platform-browser';
+
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+@Component({
+  selector: "app-pathology-check",
+  templateUrl: "./pathology-check.component.html",
+  styleUrls: ["./pathology-check.component.less"],
+})
+export class PathologyCheckComponent implements OnInit, OnDestroy {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
+  constructor(
+	private mainService: MainService,
+	public router: Router,
+	private route: ActivatedRoute,
+	public tool: ToolService,
+	private fb: FormBuilder,
+	private message: NzMessageService,
+	private notification: NzNotificationService,
+	private sanitizer: DomSanitizer,
+
+	) {}
+  // 今日药单量
+  todayTotal: undefined;
+  // 今日已完成
+  todayComplete: undefined;
+  //手术间数据
+  printPharmacyList = []; //数据列表
+  printPharmacyIdx = 0; //页码
+  printPharmacyTotal = 0; //总数
+  printPharmacyFlag = false; //是否查看更多
+  printPharmacySearchKey = ""; //搜索的内容
+  printPharmacyLoad = false; //按钮的loading
+  // 标本间列表
+  waitPharmacyList = [];
+  waitPharmacyIdx = 0;
+  waitPharmacyTotal = 0;
+  waitPharmacyFlag = false;
+  waitPharmacySearchKey = "";
+  waitPharmacyLoad = false;
+  // 今日离科列表
+  pharmacyList = [];
+  pharmacyIdx = 0;
+  pharmacyTotal = 0;
+  pharmacyFlag = false;
+  pharmacySearchKey = "";
+  pharmacyLoad = false;
+  // 配送中列表
+  distributionList = [];
+  distributionIdx = 0;
+  distributionTotal = 0;
+  distributionFlag = false;
+  distributionSearchKey = "";
+  distributionLoad = false;
+  // 已完成列表
+  completedList = [];
+  completedIdx = 0;
+  completedTotal = 0;
+  completedFlag = false;
+  completedSearchKey = "";
+  completedLoad = false;
+
+	barCode:any; //条码搜索
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
+
+  logTimer = null; //定时器
+  logTime = 0; //自动刷新秒数
+  logTimeConst = 60; //自动刷新秒数
+
+  time = new Date().getTime(); // 时间戳
+  timer = null; // 时间定时器
+	relevanceModal:boolean = false //关联标本和手术室
+	validateForm: FormGroup; //关联标本和手术室表单
+	validateVerificationForm: FormGroup; //核验标本
+	validateConnectForm: FormGroup; //核验标本
+	specimenData:any = []; //标本间数据
+	operationData:any = []; //手术间数据
+	fixationModal:boolean = false //标本接收固定
+	verificationMoadl:boolean = false //标本核验
+	specimenCode:any; //标本条码
+	listOneData:any=[];
+	listOneLength:any;
+	pageOneIndex:any = 1;
+	pageSize:any = 10;
+	listTwoData:any=[];
+	listTwoLength:any;
+	pageTwoIndex:any = 1;
+	listThreeData:any=[];
+	listThreeLength:any;
+	pageThreeIndex:any = 1;
+	loading1:boolean = false;
+	loading2:boolean = false;
+	loading3:boolean = false;
+	loading4:boolean = false;
+	loading5:boolean = false;
+	fixativeData:any = []; //固体液类型
+	hosId:any;
+	userId:any;
+	detailsData:any;
+	isSpinning:boolean = false; //全屏加载状态
+	codeData:any = []; //标本条码数据
+	btnInfoLoading :boolean = false; //标本加固加载
+	activeIndex:any = 0; //tabs选择状态
+	changeInpSubject = new Subject(); //防抖
+	changeInpSubjectUser = new Subject(); //防抖
+	changeInpSubjectDepartment = new Subject(); //防抖
+	intraoperativeRapidity:any = null; //术中快速
+	deliveryUser:any //配送人
+	acceptTime:any; //接收时间
+	userData:any = []; //配送人数据
+	isLoading:boolean = false;
+	listDetailMoadl:boolean = false; //详情弹框
+	department:any = []; //科室数据
+	hospital:any = []; //院区数据
+	distributionName:any;
+	businessType:any = null;
+	multiModal:boolean = false;
+	specimenMultiCode:any = null;
+	codeMultiData:any=[];
+	errorMultiMsg:any = null;
+	connectModal:boolean = false; //标本交接弹框
+	receptionModal:boolean = false; //标本接收弹框
+	deptId:any = null;
+	detailMoadl:boolean = false;
+	scanCodeData:any = null;
+	batchNo:any = null;
+	dataType:any = null;
+	muArr:any = [];
+	packId:any = null;
+	userInfo:any = null;
+	placeholder:any = null;
+	placeholderType:any = null;
+	operationType:any = 'pathologyHandoverBook';
+  ngOnDestroy() {
+    clearTimeout(this.timer);
+    clearTimeout(this.logTimer);
+  }
+
+  ngOnInit() {
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchSpecimenData(v[0])
+		});
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId()
+		this.deptId = this.tool.getCurrentUserDept().id
+		this.userInfo = this.tool.getCurrentUserInfo()
+		this.batchNo = this.route.snapshot.queryParams.batchNo
+		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")
+		this.dataType = localStorage.getItem("dataType")
+		// 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.scanCodeData.pathologySpecimenDTOList &&
+			this.scanCodeData.pathologySpecimenDTOList.length>1){
+				this.muArr = []
+				for(let i of this.scanCodeData.pathologySpecimenDTOList){
+					if(i.isScan==1){
+						this.muArr.push(i)
+					}
+				}
+				this.getJsData(3)
+			}else if(this.scanCodeData.pathologySpecimenDTOList &&
+			this.scanCodeData.pathologySpecimenDTOList.length==1){
+				this.notification.create('success','提示',data.msg);
+				this.getJsData(1)
+			}
+		}else{
+			if(this.placeholderType==1){
+				if(this.businessType=='connect'){
+					this.dataType = 'receive'
+				}else if(this.businessType=='packaging'){
+					this.dataType = 'pack'
+				}
+			}
+			this.getJsData(1)
+		}
+
+  }
+	
+	//tab切换
+	tabClick(type){
+		this.activeIndex = type
+		localStorage.setItem("pathologyActiveIndex",type)
+		this.getJsData(1)
+	}
+	
+	// 分页
+	noType:any='none';
+	pageChange(){
+		if(this.dataType=='pathologyPack'){
+			this.noType='show'
+			this.getJsData(4)
+		}else if(this.packId && this.businessType=='packagLook'){
+			this.getJsData(5)
+		}else{
+			this.getJsData(1)
+		}
+	}
+
+	// 获取标本接收数据
+	pageReceptionIndex:any = 1;
+	listReceptionLength:any = 0;
+	otherData:any=null;
+	alreadyData:any = [];
+	getJsData(type){
+		let data = {
+		  idx: this.pageReceptionIndex-1,
+		  sum: this.pageSize,
+		  pathologyForm: {
+		    batchNo:this.batchNo,
+				surgeryDeptId:this.deptId,
+				handoverType:this.operationType,
+				unScan:null
+		  },
+		};
+		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.unScan
+		}
+		this.tableLoading = true;
+		this.mainService
+		  .getFetchDataList("data", "pathologyForm", data)
+		  .subscribe((res) => {
+				this.tableLoading = false;
+				if(type==1 || type==4 || type==5){
+					this.fixationModal = true
+					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();
+						},200)
+					}else if(type==4 && this.noType=='none'){
+						this.connectAccomplish()
+					}
+				}else if(type==3){
+					this.codeMultiData = this.scanCodeData.pathologySpecimenDTOList
+					this.fixationModal = true
+					this.multiModal = true
+					setTimeout(_=>{
+						document.getElementById('multiSpecimen').focus();
+					},200)
+				}
+				this.otherData = res.otherData;
+				this.listReceptionLength = res.totalNum;
+		  });
+	}
+
+	// 配送中包交接完成
+	connectAccomplish(){
+		this.validateConnectForm = this.fb.group({
+		  receptionNumber: [this.userInfo.account, [Validators.required]],
+			dispatchingNumber: [this.scanCodeData.deliveryUserDTO.account, [Validators.required]]
+		});
+		this.dispatchingName = this.scanCodeData.deliveryUserDTO.name;
+		this.dispatchingUserId = this.scanCodeData.deliveryUserDTO.id
+
+		this.receptionName = this.userInfo.name;
+		this.connectUserId = this.userInfo.id;
+
+		this.receptionModal = true
+		this.barCode = null
+	}
+
+	// 确定接收包
+	submitReceptionForm(){
+		for (const i in this.validateConnectForm.controls) {
+		  this.validateConnectForm.controls[i].markAsDirty();
+		  this.validateConnectForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateConnectForm.invalid) return;
+		let data = {
+			receiveUser:this.connectUserId,
+			deliveryUser:this.dispatchingUserId,
+			operationType:this.operationType,
+			id:this.scanCodeData.id
+		};
+		this.btnConnectLoading = true
+		this.mainService
+		  .simplePost("updData", "pathologyPackInfo", data)
+		  .subscribe((data) => {
+				this.btnConnectLoading = false
+				if (data.status == 200) {
+					this.message.success('交接成功')
+					setTimeout(_=>{
+						this.hideSpecimenModal()
+					},500)
+				} else {
+				  this.message.error(data.msg)
+				}
+		  });
+	}
+
+	// 关闭配送接收
+	hideReceptionModal(){
+		this.receptionModal = false
+	}
+
+	// 监听人员交接接收人工号输入
+	connectUserId:any = null;
+	receptionName:any = null;
+	receptionChange(e){
+		if(e.length < 3) {
+			this.receptionName = null;
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.receptionName = data.userName;
+					this.connectUserId = data.userId
+				}else{
+					this.receptionName = null;
+					this.connectUserId =null
+				}
+		  });
+	}
+
+	// 监听人员交接配送人工号输入
+	dispatchingUserId:any = null;
+	dispatchingName:any = null;
+	dispatchingChange(e){
+		if(e.length < 3) {
+			this.dispatchingName = null;
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.dispatchingName = data.userName;
+					this.dispatchingUserId = data.userId
+				}else{
+					this.dispatchingName = null;
+					this.dispatchingUserId =null
+				}
+		  });
+	}
+
+	// 确定核对
+	mustReceived:any = null;
+	currReceived:any = null;
+	btnLoading:any = false;
+	submitFixationForm(){
+		this.btnLoading = true
+		this.mainService.getSpecimenInfo(this.batchNo,this.deptId,{
+			operationType:'handoverDelivery'
+		}).subscribe((res:any) => {
+			this.btnLoading = false
+			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;
+			this.validateConnectForm = this.fb.group({
+				receptionNumber: [null, [Validators.required]],
+				dispatchingNumber: [null, [Validators.required]]
+			});
+			this.dispatchingName = null;
+			this.dispatchingUserId = null
+			this.connectModal = true
+		});
+	}
+	// 关闭核对
+	hideConnectModal(){
+		this.connectModal = false
+	}
+
+	// 确定核对提交
+	btnConnectLoading:boolean = false;
+	submitConnectForm(){
+		for (const i in this.validateConnectForm.controls) {
+		  this.validateConnectForm.controls[i].markAsDirty();
+		  this.validateConnectForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateConnectForm.invalid) return;
+		let data = {
+			batchNo:this.batchNo,
+			checkUser:this.connectUserId,
+			deliveryUser:this.dispatchingUserId
+		};
+		this.btnConnectLoading = true
+		this.mainService
+		  .handoverCompleted(data)
+		  .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);
+		    }
+		  });
+	}
+
+	// 返回
+	hideSpecimenModal(){
+		localStorage.setItem("scanCodeData",'')
+		if(this.operationType=='pathologyHandoverBook'){//交接本
+			this.router.navigateByUrl(`/pathologyCommunicationBook?type=detail`)
+		}else if(this.operationType=='surgery'){//手术间
+			this.router.navigateByUrl(`/nurse`)
+		}else if(this.operationType=='specimenDept'){//标本间
+			this.router.navigateByUrl(`/specimenRoomView`)
+		}else if(this.operationType=='pathology'){//病理端
+			this.router.navigateByUrl(`/pathology`)
+		}else if(this.operationType=='sample'){//门诊病理
+			this.router.navigateByUrl(`/pathologySample`)
+		}
+	}
+
+	// 输入工号查询姓名
+	handoverUserId:any = null;
+	numberChange(e){
+		if(e.length < 3) {
+			this.distributionName = null;
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.distributionName = data.userName;
+					this.handoverUserId = data.userId
+				}else{
+					this.distributionName = null;
+					this.handoverUserId =null
+				}
+		  });
+	}
+
+	// 成功/失败提示框
+	closeModel(){
+		localStorage.setItem("scanCodeData",'')
+		this.router.navigateByUrl(`/pathology?type=detail`);
+	}
+
+	// 关闭配送信息
+	hideVerificationModal(){
+		this.verificationMoadl = false
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+	}
+
+
+	// 监听交接/打包扫描条码
+	tableLoading:boolean = false;
+	codeChange(e){
+		this.changeInpSubject.next([e]);
+	}
+
+	// 标本搜索条码
+	errorMsg:any = null;
+	searchSpecimenData(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		let data = {
+			barcode:e,
+			deptId:this.deptId,
+			batchNo:this.batchNo,
+			platform:this.operationType,
+		}
+		this.tableLoading = true
+		this.mainService.pathologyScanCode(data)
+		.subscribe((res:any) => {
+			this.tableLoading = false
+			this.specimenCode = null
+			if(res.status==200){
+				this.scanCodeData = res.data[0]
+				this.dataType = res.dataType
+				if(res.data[0].pathologySpecimenDTOList.length>1){
+					for(let i of res.data[0].pathologySpecimenDTOList){
+						if(i.isScan==1){
+							this.muArr.push(i)
+						}
+					}
+					this.multiModal = true
+					this.codeMultiData = res.data[0].pathologySpecimenDTOList
+					localStorage.setItem("scanCodeData",JSON.stringify(res))
+				}else{
+					this.notification.create('success','提示',res.msg);
+					this.activeIndex = 0
+					this.codeData = []
+					this.getJsData(1)
+				}
+				this.errorMsg = null
+			}else{
+				this.errorMsg = res.msg
+			}
+		})
+	}
+
+	// 关闭多只标本
+	hideMultiModal(){
+		localStorage.setItem("scanCodeData",'');
+		this.multiModal = false;
+		this.errorMultiMsg = null;
+		this.muArr = [];
+		this.getJsData(1);
+		setTimeout(_=>{
+			document.getElementById('specimen').focus();
+		},200)
+	}
+
+	// 监听多只标本扫描
+	codeMultiChange(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		let data={
+			barcode:e,
+			deptId:this.deptId,
+			pathologyFormId:this.scanCodeData.id,
+			platform:this.operationType,
+		}
+		setTimeout(_=>{
+			this.tableLoading = true
+			this.mainService.pathologyScanCode(data)
+			.subscribe((res:any) => {
+				this.tableLoading = false
+				this.specimenMultiCode = null
+				if(res.status==200){
+					this.dataType = res.dataType
+					this.muArr = []
+					this.codeMultiData = res.data[0].pathologySpecimenDTOList
+					for(let i of res.data[0].pathologySpecimenDTOList){
+						if(i.isScan==1){
+							this.muArr.push(i)
+						}
+					}
+					this.multiModal = true
+					localStorage.setItem("scanCodeData",JSON.stringify(res))
+					this.errorMultiMsg = null
+				}else{
+					this.errorMultiMsg = res.msg
+				}
+			})
+		},500)
+	}
+
+	// 多只标本确定接受
+	btnMultiLoading:boolean = false;
+	submitMultiForm(){
+		let data1 = JSON.parse(localStorage.getItem("scanCodeData"))
+		this.scanCodeData = data1.data[0]
+		for(let i of this.scanCodeData.pathologySpecimenDTOList){
+			if(i.isScan==0){
+				this.message.error('有未扫描的标本，请继续扫描')
+				return
+			}
+		}
+		let data: any = {
+			id:this.scanCodeData.id,
+			operationType:this.operationType,
+			batchNo:this.batchNo
+		};
+		this.btnMultiLoading = true;
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((res) => {
+			this.message.success('操作成功')
+			setTimeout(_=>{
+				this.btnMultiLoading = false;
+				this.hideMultiModal()
+			},500)
+		});
+	}
+
+	// 多只标本扫描
+	submitMultiScanForm(){
+		let data1 = JSON.parse(localStorage.getItem("scanCodeData"))
+		this.scanCodeData = data1.data[0]
+		for(let i of this.scanCodeData.pathologySpecimenDTOList){
+			if(i.isScan==0){
+				this.message.error('有未扫描的标本，请继续扫描')
+				return
+			}
+		}
+		let data: any = {
+			id:this.scanCodeData.id,
+			operationType:this.operationType,
+			batchNo:this.batchNo
+		};
+		this.btnMultiLoading = true;
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((res) => {
+			this.message.success('操作成功')
+			setTimeout(_=>{
+				this.activeIndex = 0
+				this.btnMultiLoading = false;
+				this.codeData = []
+				this.hideMultiModal()
+			},500)
+		});
+	}
+
+	promptModalShow:boolean = false;
+	promptContent:any = null;
+	ifSuccess:any = null;
+	promptInfo:any = null;
+	// 扫描展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+}
+

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

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PathologyCheckRoutingModule } from './pathology-check-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PathologyCheckComponent } from './pathology-check.component';
+
+
+@NgModule({
+  declarations: [PathologyCheckComponent],
+  imports: [
+    CommonModule,
+    PathologyCheckRoutingModule,
+    ShareModule
+  ]
+})
+export class PathologyCheckModule { }

src/app/views/pathology-communication-book/pathology-communication-book-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { PathologyCommunicationBookComponent } from "./pathology-communication-book.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: PathologyCommunicationBookComponent
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PathologyCommunicationBookRoutingModule {}

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

@@ -0,0 +1,456 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+			<div class="pharmacy-name__title">一站式服务管理平台</div>
+    </div>
+    <div class="pharmacy-name">
+			<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="可扫描物理标本条码及申请单" />
+				</nz-input-group>
+				<!-- <ng-template #suffixButton>
+					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>
+				</ng-template> -->
+      </div>
+			<div class="error-box">
+				<div class="error-class">{{searchMsg}}</div>
+			</div>
+    </div>
+    <div class="right">
+      <div class="userInfo dropdown">
+        <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <img src="../../assets/images/icon_keshi.png" alt="">
+          <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+          <i class="icon_transport transport-xiala1 ml8"></i>
+        </div>
+        <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <div class="dropdownItem" (click)="changeKsNow()">切换科室</div>
+					<div class="dropdownItem" (click)="toMain()">回到系统管理</div>
+          <div class="dropdownItem" (click)="logOut()">退出</div>
+        </div>
+      </div>
+    </div>
+  </div>
+	<div class="communication-tip">
+		<div class="mar-ri-30" *ngIf="toDayData">
+			今日产生：
+			申请单 <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.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">
+		<div class="tabs-item">
+			<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">交接本</div>
+		</div>
+		<div class="tabs-btn">
+			<button class="btn default" nz-button nzType="primary" nzSize="small" (click)='distributionTab()'>配送清点</button>
+		</div>
+	</div>
+  <!-- 头部 end -->
+  <div class="pharmacy-main">
+    <div *ngIf="activeIndex==0" class="list-template pharmacy-main__list pharmacy-main__print">
+			<div class="list-template__content">
+			  <div class="list-template__top" nz-row>
+			    <div nz-col nzLg='18' class="list-template__searchBox">
+			      <div class="list-template__searchItem">
+			        <span class="label">离体时间：</span>
+			        <nz-range-picker [(ngModel)]="acceptTime" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="changeDate($event)"></nz-range-picker>
+			      </div>
+						<div class="list-template__searchItem">
+						  <span class="label">患者：</span>
+							<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">
+							    <nz-option *ngIf="!isLoading" [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">
+						  <span class="label">状态：</span>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择状态"
+							  [(ngModel)]="status">
+							  <ng-container *ngFor="let option of statusData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						<div class="list-template__searchItem">
+						  <span class="label">术中快速：</span>
+							<nz-radio-group [(ngModel)]="pathologyFormType">
+								<label nz-radio nzValue="1">是</label>
+								<label nz-radio nzValue="0">否</label>
+							</nz-radio-group>
+						</div>
+			    </div>
+			    <div nz-col nzLg="6" class="list-template__btns">
+			      <button class="btn default" (click)='search()'>搜索</button>
+			      <button class="btn default ml8" (click)='reset()'>重置</button>
+			    </div>
+			  </div>
+			  <div class="list-template__bottom">
+			    <nz-table class="list-template__nzTable" [nzData]="listOneData" nzSize="middle" [nzShowPagination]="false"
+			      [nzLoading]="loading1">
+			      <thead>
+			        <tr class="thead">
+			          <th>申请单号</th>
+								<th>状态</th>
+			          <th>患者姓名</th>
+			          <th>住院号</th>
+			          <th nzWidth="100px">部位</th>
+			          <th>标本数</th>
+			          <th>申请科室</th>
+								<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.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>
+			          <td>{{ data.takePart}}</td>
+			          <td>{{ data.specimenNum}}</td>
+			          <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</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.leaveDeptTime|date:'yyyy-MM-dd HH:mm:ss'  }}</td>
+			          <td>
+			            <div class="coop">
+										<span (click)="oneLook($event,data)">查看</span>
+			            </div>
+			          </td>
+			        </tr>
+			      </tbody>
+			    </nz-table>
+			    <div class="list-template__pagination">
+			      <nz-pagination [(nzPageIndex)]="pageOneIndex" [(nzTotal)]="listOneLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+			        (nzPageIndexChange)="getConnectList()" (nzPageSizeChange)="getConnectList()">
+			      </nz-pagination>
+			    </div>
+			  </div>
+			</div>
+    </div>
+
+    <div class="pharmacy-main__list pharmacy-main__waitDelivery">
+      <div *ngIf="activeIndex==1" class="list-template pharmacy-main__list pharmacy-main__print">
+      	<div class="list-template__content">
+      	  <div class="list-template__bottom">
+      	    <nz-table class="list-template__nzTable" [nzData]="listTwoData" nzSize="middle" [nzShowPagination]="false"
+      	      [nzLoading]="loading2">
+      	      <thead>
+      	        <tr class="thead">
+      	          <th>申请单号</th>
+      	          <th>患者姓名</th>
+      	          <th>住院号</th>
+      	          <th>部位</th>
+      	          <th>标本数</th>
+      	          <th>申请科室</th>
+      	          <th>配送人</th>
+      	          <th>状态</th>
+      	          <th>操作</th>
+      	        </tr>
+      	      </thead>
+      	      <tbody>
+      	        <tr *ngFor="let data of listTwoData">
+      	         <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>
+      	         <td>{{ data.specimenNum}}</td>
+      	         <td>{{ data.patientDTO?data.patientDTO.department.dept : '-'}}</td>
+      	         <td>{{ data.deliveryUserDTO?data.deliveryUserDTO.name : '-' }}</td>
+      	         <td>{{ data.status?data.status.name:'-' }}</td>
+      	         <td>
+      	           <div class="coop">
+      	         		<span (click)="oneLook($event,data)">查看</span>
+      	           </div>
+      	         </td>
+      	        </tr>
+      	      </tbody>
+      	    </nz-table>
+      	    <div class="list-template__pagination">
+      	      <nz-pagination [(nzPageIndex)]="pageTwoIndex" [(nzTotal)]="listTwoLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+      	        (nzPageIndexChange)="getSpeedinessList()" (nzPageSizeChange)="getSpeedinessList()">
+      	      </nz-pagination>
+      	    </div>
+      	  </div>
+      	</div>
+      </div>
+    </div>
+
+    <div class="pharmacy-main__list pharmacy-main__delivery">
+			<div *ngIf="activeIndex==2" class="list-template pharmacy-main__list pharmacy-main__print">
+				<div class="list-template__content">
+				  <div class="list-template__bottom">
+				    <nz-table class="list-template__nzTable" [nzData]="listThreeData" nzSize="middle" [nzShowPagination]="false"
+				      [nzLoading]="loading3">
+				      <thead>
+				        <tr class="thead">
+				          <th>包号</th>
+				          <th>打包人 | 打包时间</th>
+				          <th>申请单数</th>
+				          <th>标本数</th>
+									<th>配送人 | 配送时间</th>
+									<th>接收人 | 接收时间</th>
+				          <th>状态</th>
+				          <th>操作</th>
+				        </tr>
+				      </thead>
+				      <tbody>
+				        <tr *ngFor="let data of listThreeData">
+				          <td>{{ data.packCode || '-' }}</td>
+									<td>
+										<div>{{data.packUserDTO.name }}</div>
+										<div>{{data.packTime|date:'yyyy-MM-dd HH:mm' }}</div>
+									</td>
+				          <td>{{ data.pathologyFormNum }}</td>
+				          <td>{{ data.specimenNum }}</td>
+				          <td>
+				          	<div>{{data.deliveryUserDTO?data.deliveryUserDTO.name:'-' }}</div>
+				          	<div>{{data.deliveryTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
+				          </td>
+				          <td>
+				          	<div>{{data.receiveUserDTO?data.receiveUserDTO.name:'-' }}</div>
+				          	<div>{{data.receiveTime|date:'yyyy-MM-dd HH:mm' || '-' }}</div>
+				          </td>
+									<td>{{ data.status.name }}</td>
+				          <td>
+				            <div class="coop">
+											<span (click)="threeLook($event,data)">查看标本</span>
+											<span (click)="reprint($event,data)">补打</span>
+											<span *ngIf="data.status.value==1" (click)="distribution($event,data)">配送</span>
+				            </div>
+				          </td>
+				        </tr>
+				      </tbody>
+				    </nz-table>
+				    <div class="list-template__pagination">
+				      <nz-pagination [(nzPageIndex)]="pageThreeIndex" [(nzTotal)]="listThreeLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+				        (nzPageIndexChange)="getPackList()" (nzPageSizeChange)="getPackList()">
+				      </nz-pagination>
+				    </div>
+				  </div>
+				</div>
+			</div>
+    </div>
+  </div>
+  <!-- 主体部分 end -->
+  <!-- <router-outlet></router-outlet> -->
+</div>
+
+<!-- 科室切换提示框 -->
+<app-hs-prompt-modal
+  [changeShow]="changeShow"
+  [closeTime]="closeTime"
+  [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow"
+  (closeModelHs)="closeModelHs($event)"
+  (clearModelHs)="clearModelHs($event)"
+> 
+  <!-- 返回系统按钮 -->
+  <!-- 右侧悬浮框 -->
+   <div id="fixedMenu" class="fixed" *ngIf="mainRole">
+    <div class="right">
+      <div class="fixedMenu hujiaozhongxin">
+        <div class="menuItems">
+          <div class="item">快捷菜单</div>
+        </div>
+      </div>
+      <div class="fixedMenu">
+        <div class="menuItems">
+          <div
+            class="others"
+            [ngStyle]="{
+              height: showLastItems
+                ? mainRole
+                  ? 35 * 2 + 'px'
+                  : 35 * 1 + 'px'
+                : 0
+            }"
+          >
+            <div
+              [ngClass]="{ item: true, checked: fixedTab == 'back' }"
+              *ngIf="mainRole"
+              (click)="checkFixedTab('toSystem')"
+            >
+              返回系统
+            </div>
+          </div>
+        </div>
+        <div class="arrow" *ngIf="!showLastItems" (click)="fixedMenuXiala()">
+          <i class="icon_transport transport-xiala2-01"></i>
+        </div>
+        <div class="arrow" *ngIf="showLastItems" (click)="fixedMenuShangla()">
+          <i class="icon_transport transport-shangla-"></i>
+        </div>
+      </div>
+    </div>
+    <div
+      *ngIf="showLastItems && fixedTab != ''"
+      (click)="fixedMenuShangla()"
+      class="fixedMark"
+    ></div>
+  </div>
+</app-hs-prompt-modal>
+
+
+<!-- 查看详情 -->
+<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 border">
+			<div class="content-item boder-right">
+				<div class="form-title-box">
+					<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>
+				</div>
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<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>
+				
+				<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-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 class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+				</div>
+				
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</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 form-title cursors" (click)="specimenView(item)">
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{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;">{{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>{{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>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</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]="viewData" 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 viewData">
+								<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>

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

@@ -0,0 +1,715 @@
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ActivatedRoute, Router } from "@angular/router";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
+import { startOfDay, format, endOfDay } from "date-fns";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from "ng-zorro-antd";
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { DomSanitizer } from '@angular/platform-browser';
+
+import {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+@Component({
+  selector: "app-pathology-communication-book",
+  templateUrl: "./pathology-communication-book.component.html",
+  styleUrls: ["./pathology-communication-book.component.less"],
+})
+export class PathologyCommunicationBookComponent implements OnInit, OnDestroy {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef2", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef2: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef3", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef3: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef4", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef4: OverlayScrollbarsComponent;
+  @ViewChild("osComponentRef5", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef5: OverlayScrollbarsComponent;
+  constructor(
+	private mainService: MainService,
+	public router: Router,
+	private route: ActivatedRoute,
+	public tool: ToolService,
+	private fb: FormBuilder,
+	private message: NzMessageService,
+	private sanitizer: DomSanitizer,
+	) {}
+  // 今日药单量
+  todayTotal: undefined;
+  // 今日已完成
+  todayComplete: undefined;
+  //手术间数据
+  printPharmacyList = []; //数据列表
+  printPharmacyIdx = 0; //页码
+  printPharmacyTotal = 0; //总数
+  printPharmacyFlag = false; //是否查看更多
+  printPharmacySearchKey = ""; //搜索的内容
+  printPharmacyLoad = false; //按钮的loading
+  // 标本间列表
+  waitPharmacyList = [];
+  waitPharmacyIdx = 0;
+  waitPharmacyTotal = 0;
+  waitPharmacyFlag = false;
+  waitPharmacySearchKey = "";
+  waitPharmacyLoad = false;
+  // 今日离科列表
+  pharmacyList = [];
+  pharmacyIdx = 0;
+  pharmacyTotal = 0;
+  pharmacyFlag = false;
+  pharmacySearchKey = "";
+  pharmacyLoad = false;
+  // 配送中列表
+  distributionList = [];
+  distributionIdx = 0;
+  distributionTotal = 0;
+  distributionFlag = false;
+  distributionSearchKey = "";
+  distributionLoad = false;
+  // 已完成列表
+  completedList = [];
+  completedIdx = 0;
+  completedTotal = 0;
+  completedFlag = false;
+  completedSearchKey = "";
+  completedLoad = false;
+
+	barCode:any; //条码搜索
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
+
+  logTimer = null; //定时器
+  logTime = 0; //自动刷新秒数
+  logTimeConst = 60; //自动刷新秒数
+
+  time = new Date().getTime(); // 时间戳
+  timer = null; // 时间定时器
+	showDropdown:boolean = false;
+	relevanceModal:boolean = false //关联标本和手术室
+	validateForm: FormGroup; //关联标本和手术室表单
+	validateVerificationForm: FormGroup; //核验标本
+	validateConnectForm: FormGroup; //核验标本
+	specimenData:any = []; //标本间数据
+	operationData:any = []; //手术间数据
+	fixationModal:boolean = false //标本接收固定
+	verificationMoadl:boolean = false //标本核验
+	specimenCode:any; //标本条码
+	listOneData:any=[];
+	listOneLength:any;
+	pageOneIndex:any = 1;
+	pageSize:any = 10;
+	listTwoData:any=[];
+	listTwoLength:any;
+	pageTwoIndex:any = 1;
+	listThreeData:any=[];
+	listThreeLength:any;
+	pageThreeIndex:any = 1;
+	loading1:boolean = false;
+	loading2:boolean = false;
+	loading3:boolean = false;
+	loading4:boolean = false;
+	loading5:boolean = false;
+	fixativeData:any = []; //固体液类型
+	hosId:any;
+	userId:any;
+	detailsData:any;
+	isSpinning:boolean = false; //全屏加载状态
+	codeData:any = []; //标本条码数据
+	btnInfoLoading :boolean = false; //标本加固加载
+	activeIndex:any = 0; //tabs选择状态
+	changeInpSubject = new Subject(); //防抖
+	changeInpSubjectUser = new Subject(); //防抖
+	changeInpSubjectSpecimen = new Subject(); //防抖
+	changeInpSubjectDepartment = new Subject(); //防抖
+	pathologyFormType:any = null; //术中快速
+	status:any; //状态
+	deliveryUser:any //配送人
+	userData:any = []; //患者数据
+	statusData:any = []; //状态数据
+	isLoading:boolean = false;
+	listDetailMoadl:boolean = false; //详情弹框
+	department:any = []; //科室数据
+	hospital:any = []; //院区数据
+	distributionName:any;
+	businessType:any = null;
+	multiModal:boolean = false;
+	specimenMultiCode:any = null;
+	codeMultiData:any=[];
+	errorMultiMsg:any = null;
+	connectModal:boolean = false; //标本交接弹框
+	receptionModal:boolean = false; //标本接收弹框
+	deptId:any = null;
+	detailMoadl:boolean = false;
+	rowData:any = null; //table选中数据
+	toDayData:any = null;
+	toDayTime:any = null;
+	backType:any = 'list';
+	mainRole:any = false;
+	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
+	  .id; //登录人所属科室
+  ngOnDestroy() {
+    clearTimeout(this.timer);
+    clearTimeout(this.logTimer);
+		clearTimeout(this.timer);
+		clearInterval(this.toDayTime)
+  }
+
+  ngOnInit() {
+		// this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		//   this.searchSpecimenData(v[0])
+		// });
+		this.changeInpSubjectSpecimen.pipe(debounceTime(100)).subscribe((v) => {
+		  this.searchSpecimen(v[0])
+		});
+		// this.changeInpSubjectUser.pipe(debounceTime(500)).subscribe((v) => {
+		// 	this.isLoading = true
+		//   this.getUserData(v[0])
+		// });
+		this.hosId = this.tool.getCurrentHospital().id;
+		this.userId = this.tool.getCurrentUserId()
+		this.deptId = this.tool.getCurrentUserDept().id
+		this.getConnectList()
+		if(this.route.snapshot.queryParams && this.route.snapshot.queryParams.type){
+			this.backType = this.route.snapshot.queryParams.type
+		}
+		// this.getUserData('')
+		this.getToday()
+		if(this.backType=='list'){
+			this.changeKs();
+		}
+		this.getStatusDic()
+		clearInterval(this.toDayTime)
+		this.toDayTime = setInterval(_=>{
+			this.getToday()
+		},60000)
+  }
+
+	//tab切换
+	tabClick(type){
+		this.activeIndex = type
+		localStorage.setItem("pathologyActiveIndex",type)
+		if(type==0){
+			this.getConnectList()
+		}
+	}
+	
+	// 获取状态字典
+	getStatusDic(){
+		this.mainService.getDictionary("list", "pathology_form_status").subscribe((res) => {
+			this.statusData = res
+		});
+	}
+	
+	// 获取今日接收数据
+	getToday(){
+		this.mainService
+		  .pathologyToday({
+				deptId:this.deptId,
+				platform:'pathologyHandoverBook'
+			})
+		  .subscribe((data:any) => {
+		    this.toDayData = data.data
+		  });
+	}
+	
+	//配送人搜索
+	changeUserInp(e){
+		this.changeInpSubjectUser.next([e]);
+	}
+
+	// 获取配送人
+	getUserData(e){
+		let query={
+			idx: 0,
+			sum: 10,
+			user: {
+			  name: e,
+			},
+		}
+		this.mainService
+		.getFetchDataList("data", "user", query)
+		.subscribe((res) => {
+			this.isLoading = false
+			this.userData = res.list
+		});
+	}
+
+	// 搜索
+	search() {
+	  this.pageOneIndex = 1;
+	  this.getConnectList();
+	}
+	// 重置
+	reset() {
+	  this.pageOneIndex = 1;
+		this.status = null;
+		this.pathologyFormType = null;
+		this.deliveryUser = null;
+	  this.getConnectList();
+	}
+	// 交接本数据
+	getConnectList() {
+	  var that = this;
+	  let data = {
+	    idx: that.pageOneIndex - 1,
+	    sum: that.pageSize,
+	    pathologyForm: {
+	      startTime: this.startDate,
+	  		endTime: this.endDate,
+				surgeryDeptId:this.deptId,
+				keyWords:this.deliveryUser,
+				operationType:'pathologyHandoverBookList',
+				status:{
+					id:this.status
+				},
+				pathologyFormType:this.pathologyFormType
+	    },
+	  };
+	  this.loading1 = true;
+	  that.mainService
+	    .getFetchDataList("data", "pathologyForm", data)
+	    .subscribe((data) => {
+	      this.loading1 = false;
+	      that.listOneData = data.list;
+	      that.listOneLength = data.totalNum;
+	    });
+	}
+
+	// 查看
+	project:any = [];
+	oneLook(e,data){
+		this.isSpinning = true
+		this.mainService.getFetchData("data", "pathologyForm", data.id)
+		.subscribe((data) => {
+			this.isSpinning = false
+			this.detailMoadl = true
+			// this.distributionModal = true
+			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('、')
+			}
+		});
+	}
+
+	// 配送清点
+	distributionTab(){
+		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}`);
+			})
+		}
+	}
+	
+	// 关闭查看标本
+	closeSpecimenModal(){
+		this.specimenViewDialog = false
+	}
+	
+	// 查看标本
+	specimenViewDialog:any = false;
+	viewData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.viewData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.viewData.push(item)
+	}
+	
+	// 获取院区
+	getHospitalData(){
+		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
+		this.hospital = arr
+		// let data = {
+		//   idx: 0,
+		//   sum: 9999,
+		// 	hospital:{
+		// 		selectType:'level1'
+		// 	}
+		// };
+		// this.mainService
+		//   .getFetchDataList("data", "hospital", data)
+		//   .subscribe((res) => {
+		//     this.hospital = res.list;
+		//   });
+	}
+
+	// 选择院区
+	hospitalId:any=null;
+	changeHospDate(e){
+		this.validateForm.controls.department.setValue(null)
+		this.hospitalId = e
+		this.getDepartmentData('',e)
+	}
+
+	// 获取科室
+	isDeptLoading:boolean = false;
+	getDepartmentData(e,hospital){
+		// this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			// let item = res2.find(i=>i.name=='检验科室')
+			let data = {
+			  idx: 0,
+			  sum: 999,
+			  department: {
+					dept:e,
+			    hospital: { id: this.hospitalId || "" },
+			    type: {id:null},
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("data", "department", data)
+			  .subscribe((res) => {
+					this.isDeptLoading = false
+			    this.department = res.list;
+			  });
+		// });
+	}
+
+	// 接收时间
+	startDate:any = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	endDate:any = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+	acceptTime:any = [this.startDate,this.endDate];
+	changeDate(result){
+		if(result.length>0){
+			this.startDate = format(result[0], 'yyyy-MM-dd' +' '+'00:00:00');
+			this.endDate = format(result[1], 'yyyy-MM-dd' +' '+'23:59:59');
+			this.acceptTime = [this.startDate,this.endDate]
+		}else{
+			this.startDate = null;
+			this.endDate = null;
+			this.acceptTime = []
+		}
+	}
+
+	// 标本条码搜索
+	searchMsg:any = null
+	batchNo:any = null;
+	scanCodeData:any = null;
+	dataType:any = null;
+	searchSpecimen(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		this.isSpinning = true
+		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
+				}
+			})
+		}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
+						}
+					})
+				}
+			})
+		}
+	}
+	
+	// 获取标本接收数据
+	pageReceptionIndex:any = 1;
+	listReceptionLength:any = 0;
+	tableLoading:any = false;
+	otherData:any=null;
+	getJsData(type){
+		let data = {
+		  idx: this.pageReceptionIndex-1,
+		  sum: this.pageSize,
+		  pathologyForm: {
+		    batchNo:this.batchNo,
+		  },
+		};
+		this.tableLoading = true;
+		this.mainService
+		  .getFetchDataList("data", "pathologyForm", data)
+		  .subscribe((res) => {
+				this.tableLoading = false;
+				if(type==1){
+					this.fixationModal = true
+					setTimeout(_=>{
+						document.getElementById('specimen').focus();
+					},200)
+				}else if(type==3){
+					this.fixationModal = true
+					this.multiModal = true
+					setTimeout(_=>{
+						document.getElementById('multiSpecimen').focus();
+					},200)
+				}
+		    this.codeData = res.list;
+				this.otherData = res.otherData;
+				this.listReceptionLength = res.totalNum;
+		  });
+	}
+
+	getNewDept(){
+		let postData = {
+		  currentHosId: this.hosId,
+		  loginType: "PC",
+		};
+		this.mainService.changeHospital(postData).subscribe((result) => {
+		  if (result.status == 200) {
+		    let dataObj = {
+		      user: {
+		        dept: {
+		          id: this.validateForm.value.specimen,
+		        },
+		        id: JSON.parse(localStorage.getItem("user")).user.id,
+		      },
+		    };
+		    this.mainService
+		      .coopData("updData", "user", dataObj)
+		      .subscribe((data) => {
+		        if (data.status == 200) {
+		          this.getCurrentUserNow();
+		        }
+		      });
+		  }
+		});
+	}
+
+	// 获取当前用户信息
+	getCurrentUserNow() {
+	  this.mainService.getCurrentUser1().subscribe((data:any) => {
+	    if (data["status"] == 200) {
+				this.loginUser = data.data
+	      let user = JSON.parse(localStorage.getItem("user"));
+	      user.user.dept = data["data"].dept;
+	      user.user.currentHospital = data["data"].currentHospital;
+	      localStorage.setItem("user", JSON.stringify(user));
+	    }
+	  });
+	}
+
+	// 成功/失败提示框
+	closeModel(){
+		
+	}
+
+	// 监听标本条码
+	specimenCodeChange(e){
+		this.businessType = 'connect'
+		this.changeInpSubjectSpecimen.next([e]);
+	}
+
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	closeDetailMoadl(){
+		this.detailMoadl = false
+	}
+
+  // 退出
+  logOut(): void {
+    // 假退出
+    let hospital = this.tool.getCurrentHospital();
+    if(hospital){
+      this.router.navigate(["login", hospital.id]);
+    }else{
+      this.router.navigateByUrl("login");
+    }
+    localStorage.removeItem("user");
+    localStorage.removeItem("menu");
+    localStorage.removeItem("index");
+		localStorage.removeItem("scanCodeData");
+		localStorage.removeItem("dataType");
+		localStorage.removeItem("pathologyActiveIndex");
+    // 假退出
+    this.mainService.logOut().subscribe((data) => {
+      if (data.status == 200) {
+        if(hospital){
+          this.router.navigate(["login", hospital.id]);
+        }else{
+          this.router.navigateByUrl("login");
+        }
+        localStorage.removeItem("user");
+        localStorage.removeItem("menu");
+        localStorage.removeItem("index");
+				localStorage.removeItem("scanCodeData");
+				localStorage.removeItem("dataType");
+				localStorage.removeItem("pathologyActiveIndex");
+      }
+    });
+
+  }
+
+  // 右侧菜单
+  showLastItems: boolean = false;
+  // 下拉
+  fixedMenuXiala() {
+    this.showLastItems = true;
+  }
+
+  // 上拉
+  fixedMenuShangla() {
+    this.showLastItems = false;
+  }
+	
+	// 回到系统管理
+	toMain() {
+	  this.router.navigateByUrl("main");
+	}
+	
+  // 切换右侧菜单Tab
+  fixedTab: string = "";
+  checkFixedTab(type: string) {
+    if (type == "toSystem") {
+      this.router.navigateByUrl("main");
+    }
+    if (this.fixedTab == type) {
+      this.fixedTab = "";
+    } else {
+      this.fixedTab = type;
+    }
+  }
+	
+  //科室切换
+  changeShow = true;
+  closeTime = 3;
+  closeTimeFlag = 0;
+  hsPromptModalShow: boolean = false; //科室切换提示框是否展示
+  timerCloseTime = null;
+  deptDisplay = 1; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  //子传父接收
+  closeModelHs(e) {
+    this.hsPromptModalShow = JSON.parse(e).show;
+    this.changeShow = JSON.parse(e).changeShow;
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+  }
+  //子传父接收
+  clearModelHs(e) {
+    if (JSON.parse(e).clear === true) {
+      clearInterval(this.timerCloseTime);
+    }
+    this.changeShow = JSON.parse(e).changeShow;
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+  }
+  // 头部切换科室
+  changeKsNow() {
+    this.hsPromptModalShow = true;
+    clearInterval(this.timerCloseTime);
+    this.changeShow = false;
+  }
+  // 切换科室
+  changeKs() {
+    this.hsPromptModalShow = true;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
+    clearInterval(this.timerCloseTime);
+    this.timerCloseTime = setInterval(() => {
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
+        clearInterval(this.timerCloseTime);
+      }
+    }, 1000);
+  }
+
+	promptModalShow:boolean = false;
+	promptContent:any = null;
+	ifSuccess:any = null;
+	promptInfo:any = null;
+	// 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+	showPromptModal(con, success, promptInfo?) {
+	  this.promptModalShow = false;
+	  this.promptContent = con;
+	  this.ifSuccess = success;
+	  this.promptInfo = promptInfo;
+	  setTimeout(() => {
+	    this.promptModalShow = true;
+	  }, 100);
+	}
+}
+

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

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { PathologyCommunicationBookRoutingModule } from './pathology-communication-book-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { PathologyCommunicationBookComponent } from './pathology-communication-book.component';
+import { DragModule } from 'src/app/directives/drag/drag.module';
+
+@NgModule({
+  declarations: [PathologyCommunicationBookComponent],
+  imports: [
+		DragModule,
+    CommonModule,
+    PathologyCommunicationBookRoutingModule,
+    ShareModule
+  ]
+})
+export class PathologyCommunicationBookModule { }

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>
@@ -370,7 +370,7 @@
 				<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">
+						<div *ngFor="let item of specimenList" class="specimen-item-class form-title cursors" (click)="specimenView(item)">
 							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
@@ -415,6 +415,48 @@
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </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]="viewData" 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 viewData">
+								<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-dialog-delete [delModal]="printModal" (hideDelModalEvent)="hidePrintModal()" [btnLoading]="parintLoading"
   (confirmDelEvent)="confirmPrintDel()" [content]="'您确认要重新打印条码吗？'"></app-dialog-delete>

src/app/views/pathology/pathology.component.less

@@ -781,6 +781,8 @@
 							.specimen-item-class{
 								margin-right: 40px;
 								color:#333;
+								cursor: pointer;
+								text-decoration: underline;
 							}
 						}
 						.indent{
@@ -831,6 +833,7 @@
 				}
 				.boder-right{
 					border-right: 1px solid #e5e9ed;
+					overflow-y: auto;
 				}
 				.specimen-item{
 					display: flex;
@@ -1195,4 +1198,227 @@
         margin-right: 40px;
       }
     }
-  }
+  }
+	
+	.look{
+		.save {
+		  position: fixed;
+		  left: 0;
+		  top: 0;
+		  width: 100%;
+		  height: 100%;
+		  background: rgba(0, 0, 0, 0.4);
+		  z-index: 9999;
+			.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/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;
@@ -510,7 +510,23 @@ export class PathologyComponent implements OnInit, OnDestroy {
 		this.isDeptLoading = true
 		this.changeInpSubjectDepartment.next([e]);
 	}
-
+	
+	// 关闭查看标本
+	closeSpecimenModal(){
+		this.specimenViewDialog = false
+	}
+	
+	// 查看标本
+	specimenViewDialog:any = false;
+	viewData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.viewData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.viewData.push(item)
+	}
+	
 	// 获取院区
 	getHospitalData(){
 		let arr = this.tool.getHospitalList().filter(i=>i.parent==undefined)
@@ -791,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" (click)="specimenCheck()">标本核对</button>
     </div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>
@@ -79,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>
@@ -169,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>
@@ -259,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>
@@ -445,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

@@ -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 {
@@ -345,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

@@ -161,7 +161,24 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       this.runTime();
     }, 500);
   }
-
+	
+	// 标本核对
+	batchNo:any = null;
+	specimenCheck(){
+		this.batchNo = localStorage.getItem("specimenBatchNo")
+		if(this.batchNo){
+			localStorage.setItem("checkType",'specimenDept')
+			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}`);
+			})
+		}
+	}
+	
 	// 标本条码搜索
 	searchSpecimen(e){
 		if(!this.barCode){
@@ -181,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){
@@ -265,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
 		});
@@ -384,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);
 				}
@@ -397,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
@@ -420,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
 				},