拉取代码

package.json

@@ -5,7 +5,7 @@
     "start": "ng serve --proxy-config proxy.conf.json --port 4210 --disable-host-check --public-host=dashitech.com --host 0.0.0.0",
     "build": "ng build --prod",
     "start:17": "set NODE_OPTIONS=--openssl-legacy-provider && ng serve --proxy-config proxy.conf.json --port 4210 --disable-host-check --public-host=dashitech.com --host 0.0.0.0",
-    "build:17": "set NODE_OPTIONS=--openssl-legacy-provider && npm run build",
+    "build:17": "set NODE_OPTIONS=--openssl-legacy-provider --max_old_space_size=4096 && npm run build",
     "development": "node ./upload/development.js",
     "production": "node ./upload/production.js",
     "test": "ng test",

src/app/app-routing.module.ts

@@ -13,6 +13,8 @@ import { PharmacyGuard } from './guard/pharmacy.guard';
 import { SpecimenView2Guard } from './guard/SpecimenView2Guard.guard';
 // 标本间端权限
 import { SpecimenRoomViewGuard } from './guard/SpecimenRoomViewGuard.guard';
+// 病理科权限
+import { PathologyGuard } from './guard/Pathology.guard';
 // 全局业务查看权限
 import { DisinfectionSupplyGuard } from './guard/DisinfectionSupplyGuard.guard';
 // 配置中心查看权限
@@ -77,6 +79,12 @@ const routes: Routes = [
 	  loadChildren: () => import('./views/specimen-room-view/specimen-room-view.module').then(m => m.SpecimenRoomViewModule),
 	  canActivate: [SpecimenRoomViewGuard]
 	},
+	// 标本间端
+	{
+	  path: 'pathology',
+	  loadChildren: () => import('./views/pathology/pathology.module').then(m => m.PathologyModule),
+	  canActivate: [PathologyGuard]
+	},
   // 全局业务查看
   {
     path: 'disinfectionSupply',

src/app/guard/Pathology.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class PathologyGuard implements CanActivate {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'pathology');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/services/main.service.ts

@@ -872,4 +872,11 @@ export class MainService {
 	    headers: this.headers,
 	  });
 	}
+	
+	// 工号搜索
+	jobSearch(data) {
+	  return this.http.post(host.host + `/data/isRepeat`, data, {
+	    headers: this.headers,
+	  });
+	}
 }

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

@@ -55,6 +55,19 @@
 					</nz-form-item>
 					
 					<nz-form-item class="form-item">
+						<nz-form-label nzRequired nzFor="project" [nzSm]="5" [nzXs]="24">检验项目</nz-form-label>
+						<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="19" [nzXs]="24">
+							<nz-input-group>
+								<nz-select nzSearch nzShowSearch nzMode="multiple" nzPlaceHolder="请选择检验项目" formControlName="project">
+									<ng-container *ngFor="let option of projectData">
+										<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+									</ng-container>
+								</nz-select>
+							</nz-input-group>
+						</nz-form-control>
+					</nz-form-item>
+					
+					<nz-form-item class="form-item">
 						<nz-form-label nzRequired nzFor="specimenGenre" [nzSm]="5" [nzXs]="24">标本类型</nz-form-label>
 						<nz-form-control nzErrorTip="请选择标本类型!" [nzSm]="19" [nzXs]="24">
 							<nz-input-group>
@@ -73,7 +86,7 @@
 					<nz-form-item class="form-item">
 						<nz-form-label nzRequired nzFor="specimenNum" [nzSm]="5" [nzXs]="24">标本件数</nz-form-label>
 						<nz-form-control nzErrorTip="请输入标本件数!" [nzSm]="19" [nzXs]="24">
-							<input nz-input formControlName="specimenNum"  placeholder="请输入标本件数" nzSize="default" />
+							<input nz-input formControlName="specimenNum" disabled placeholder="请输入标本件数" nzSize="default" />
 						</nz-form-control>
 					</nz-form-item>
 					
@@ -101,8 +114,8 @@
 							<div class="specimen-name" (click)="specimenEdit($event,item,index)">
 							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
 							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-							{{item.sample?item.sample.name:''}}
+							{{item.organ?item.organ.name:''}} <span>-</span>
+							{{item.sample?item.sample.name:item.specimenName}}
 							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 						</div>
@@ -175,7 +188,7 @@
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
-					<nz-form-label nzRequired nzFor="remark" [nzSm]="3" [nzXs]="24">备注</nz-form-label>
+					<nz-form-label nzFor="remark" [nzSm]="3" [nzXs]="24">备注</nz-form-label>
 					<nz-form-control nzErrorTip="请输入备注" [nzSm]="21" [nzXs]="24">
 						<textarea rows="3" nz-input formControlName="remark" placeholder="请输入备注"></textarea>
 					</nz-form-control>
@@ -266,10 +279,10 @@
 					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
 				</div>
 			</div>
-			<div style="height: 10px;"></div>
+			<div style="height: 10px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
-					<div style="height: 30px;"></div>
+					<div style="height: 30px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 					<div style="border: 1px solid #AAAAAA;border-radius: 5px;">
 						<img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
 						<div class="monad-sign" style="border-bottom: 1px solid #AAAAAA;padding-left:1px;">

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

@@ -1,3 +1,24 @@
+/* 修改垂直滚动条 */
+::-webkit-scrollbar {
+	width: 4px; /* 修改宽度 */
+	border-radius: 2px;
+}
+ 
+/* 修改滚动条轨道背景色 */
+::-webkit-scrollbar-track {
+	background-color: #f1f1f1;
+}
+ 
+/* 修改滚动条滑块颜色 */
+::-webkit-scrollbar-thumb {
+	background-color: #888;
+}
+ 
+/* 修改滚动条滑块悬停时的颜色 */
+::-webkit-scrollbar-thumb:hover {
+	background-color: #555;
+}
+
 .pathology-box {
   position: fixed;
 	left: 0;
@@ -33,12 +54,12 @@
 			background: #f9fafb;
 			border: 1px solid #e5e9ed;
 			border-radius: 5px;
-			overflow: hidden;
+			// overflow: hidden;
 			margin-top: 12px;
-			height: auto;
-			// padding: 19px 14px 10px 0;
-			max-height: 460px;
-			overflow-y: auto;
+			// height: auto;
+			// // padding: 19px 14px 10px 0;
+			// max-height: 460px;
+			// overflow-y: auto;
 			.addForm{
 				display: flex;
 				.width-100{
@@ -51,8 +72,11 @@
 				.ant-select{
 					width: 100%;
 				}
+				
 				.content-item{
 					flex: 1;
+					height: 460px;
+					overflow-y: auto;
 					padding: 0 15px;
 					.form-title-box{
 						display: flex;

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

@@ -38,6 +38,7 @@ export class PathologyAddComponent implements OnInit {
 	validateSpecimenForm: FormGroup; //选择标本表单
 	validatePrintForm: FormGroup;
 	specimenData:any=[]; //标本类型
+	projectData:any=[]; //检验项目
 	isDeptLoading:boolean = false;
 	specimenModal:boolean = false; //选择标本状态
 	isSpinning:boolean = false; //页面加载状态
@@ -59,6 +60,8 @@ export class PathologyAddComponent implements OnInit {
 	type:any = '未打印';
 	notModal:boolean = false;
 	hosId:any;
+	startDate: string; //离体开始
+	
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.initForm()
@@ -71,6 +74,7 @@ export class PathologyAddComponent implements OnInit {
 		  intraoperativeRapidity: [1, [Validators.required]],
 			specimenGenre: [null, [Validators.required]],
 			intraoperativeFindings: [null, [Validators.required]],
+			project: [null, [Validators.required]],
 			surgicalPlan: [null, [Validators.required]],
 			specimenNum: [null,[Validators.required]],
 			takePart: [null, [Validators.required]]
@@ -99,6 +103,7 @@ export class PathologyAddComponent implements OnInit {
 				if(this.detailsData.intraoperativeFindings){
 					this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
 				}
+				this.getProDicData()
 				this.getDicData()
 				this.getSampleData()
 				this.getSourceData()
@@ -122,6 +127,20 @@ export class PathologyAddComponent implements OnInit {
 		});
 	}
 	
+	// 获取检验项目
+	getProDicData(){
+		this.mainService.getDictionary("list", "pathology_inspect_type").subscribe((res) => {
+			this.projectData = res
+			let arr = []
+			if(this.detailsData.pathologyInspectDTOS){
+				for(let i of this.detailsData.pathologyInspectDTOS){
+					arr.push(i.inspectProject.id)
+				}
+				this.validateForm.controls.project.setValue(arr);
+			}
+		});
+	}
+	
 	// 获取标本-位置来源
 	getSourceData(){
 		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
@@ -201,7 +220,7 @@ export class PathologyAddComponent implements OnInit {
 				if(type=='edit'){
 					if(item.sample){
 						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, [Validators.required]]
+						  remark: [null, []]
 						});
 						setTimeout(_=>{
 							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
@@ -211,7 +230,7 @@ export class PathologyAddComponent implements OnInit {
 						},100)
 					}else{
 						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, [Validators.required]],
+						  remark: [null, []],
 							specimenName: [null, [Validators.required]]
 						});
 						this.specimenNameIndex = this.specimenNameList.length-1
@@ -275,7 +294,7 @@ export class PathologyAddComponent implements OnInit {
 	// 选择标本
 	openSpecimen(){
 		this.validateSpecimenForm = this.fb.group({
-		  remark: [null, [Validators.required]]
+		  remark: [null, []]
 		});
 		this.specimenDetailId = null;
 		this.placeIndex = null;
@@ -290,6 +309,7 @@ export class PathologyAddComponent implements OnInit {
 		this.systemList=[]; //系统数据
 		this.apparatusList=[]; //器官数据
 		this.specimenNameList=[]; //标本名称数据
+		this.specimenNameName = null;
 		this.getSourceData()
 		this.getSysData()
 		this.specimenModal = true
@@ -310,6 +330,14 @@ export class PathologyAddComponent implements OnInit {
 		this.apparatusList = [];
 		this.apparatusId = null;
 		this.apparatusIndex = null;
+		
+		this.specimenNameList = [];
+		this.specimenNameId = null;
+		this.specimenNameIndex = null;
+		this.specimenNameName = null;
+		if(this.validateSpecimenForm.value.specimenName){
+			this.validateSpecimenForm.controls.specimenName.setValue('')
+		}
 		this.getApparatusData(item.id,{},'select')
 	}
 	
@@ -321,6 +349,10 @@ export class PathologyAddComponent implements OnInit {
 		this.specimenNameList = [];
 		this.specimenNameId = null;
 		this.specimenNameIndex = null;
+		this.specimenNameName = null;
+		if(this.validateSpecimenForm.value.specimenName){
+			this.validateSpecimenForm.controls.specimenName.setValue('')
+		}
 		this.getSpNameData(item.id,{},'select')
 	}
 	
@@ -332,14 +364,14 @@ export class PathologyAddComponent implements OnInit {
 		let remark = this.validateSpecimenForm.value.remark
 		if(item.id == 'qita'){
 			this.validateSpecimenForm = this.fb.group({
-			  remark: [remark?remark:null, [Validators.required]],
+			  remark: [remark?remark:null, []],
 				specimenName: [null, [Validators.required]]
 			});
 			this.specimenNameId = 'null'
 			this.specimenNameName = 'qita'
 		}else{
 			this.validateSpecimenForm = this.fb.group({
-			  remark: [remark?remark:null, [Validators.required]],
+			  remark: [remark?remark:null, []],
 			});
 			this.specimenNameId = item.id
 			this.specimenNameName = item.name
@@ -429,6 +461,7 @@ export class PathologyAddComponent implements OnInit {
 		  .getFetchDataList("data", "pathologySpecimen", data)
 		  .subscribe((res) => {
 		    this.specimenList = res.list
+				this.validateForm.controls.specimenNum.setValue(this.specimenList.length);
 		  });
 	}
 	
@@ -441,10 +474,8 @@ export class PathologyAddComponent implements OnInit {
 	}
 	
 	// 日期选择
-	startDate: string; //时间开始
 	formChangeDate(result?): void {
-	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-		
+	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
 	}
 	
 	//未打印提交
@@ -456,16 +487,17 @@ export class PathologyAddComponent implements OnInit {
 		  this.validatePrintForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validatePrintForm.invalid) return;
-		
+		let ids = this.validateForm.value.project.join(',')
 		let data: any = {
 			pathologyForm:{
 				...this.validateForm.value,
 				...this.detailsData,
-				inVitroTime:this.validatePrintForm.value.inVitroTime,
+				inVitroTime:this.startDate,
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
 				hosId: this.hosId || "" ,
 				handoverUserId:this.handoverUserId,
+				pathologyInspectIds:ids,
 				specimenType:{
 					id:this.validateForm.value.specimenGenre
 				}
@@ -479,28 +511,31 @@ export class PathologyAddComponent implements OnInit {
 		this.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {
-				
-				let arr = res.data;
-		    if(arr.applyBarCode){
-		    	arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
-		    }
-		    for(let i of arr.specimenList){
-		    	i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
-		    }
-		    that.printLoading = false;
-		    that.printData = arr;
-		    setTimeout(() => {
-		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=100,height=1000");
-		    	WindowPrt.document.body.innerHTML = printContent.innerHTML;
-		    	setTimeout(_=>{
-		    		WindowPrt.document.close();
-		    		WindowPrt.focus();
-		    		WindowPrt.print();
-		    		WindowPrt.close();
-		    		that.hideModal();
-		    	},500)
-		    }, 500);
+				if(res.status==200){
+					let arr = res.data;
+					if(arr.applyBarCode){
+						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+					}
+					for(let i of arr.specimenList){
+						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+					}
+					that.printLoading = false;
+					that.printData = arr;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=100,height=1000");
+						WindowPrt.document.body.innerHTML = printContent.innerHTML;
+						setTimeout(_=>{
+							WindowPrt.document.close();
+							WindowPrt.focus();
+							WindowPrt.print();
+							WindowPrt.close();
+							that.hideModal();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
+				}
 		  });
 	}
 	
@@ -511,23 +546,19 @@ export class PathologyAddComponent implements OnInit {
 			this.validatePrintForm.controls.name.setValue('');
 			return
 		}
-		let data = {
-		  idx: 0,
-		  sum: 9999,
-		  user: {
-		    account: e || "",
-		    hospital: { id: this.hosId || "" }
-		  },
+		let query = {
+		  account: e
 		};
 		this.mainService
-		  .getFetchDataList("data", "user", data)
-		  .subscribe((data) => {
-				if(data.list.length>0){
-					this.validatePrintForm.controls.name.setValue(data.list[0].name);
-					this.handoverUserId = data.list[0].id
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.validatePrintForm.controls.name.setValue(data.userName);
+					this.handoverUserId = data.userId
 				}else{
 					this.validatePrintForm.controls.name.setValue('');
-					this.handoverUserId =null
+					this.handoverUserId = null
+					// this.message.error(data.data)
 				}
 		  });
 	}
@@ -540,6 +571,10 @@ export class PathologyAddComponent implements OnInit {
 		  that.validateForm.controls[i].updateValueAndValidity();
 		}
 		if (that.validateForm.invalid) return;
+		if(this.specimenList.length==0){
+			this.message.error('标本不能为空')
+			return
+		}
 		if(this.detailsData.status.name=='未打印'){
 			this.notModal = true
 			this.validatePrintForm = this.fb.group({
@@ -573,27 +608,31 @@ export class PathologyAddComponent implements OnInit {
 		that.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {
-				let arr = res.data;
-				if(arr.applyBarCode){
-					arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
-				}
-				for(let i of arr.specimenList){
-					i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+				if(res.status==200){
+					let arr = res.data;
+					if(arr.applyBarCode){
+						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+					}
+					for(let i of arr.specimenList){
+						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+					}
+					that.btnLoading = false;
+					that.printData = arr;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=100,height=1000");
+						WindowPrt.document.body.innerHTML = printContent.innerHTML;
+						setTimeout(_=>{
+							WindowPrt.document.close();
+							WindowPrt.focus();
+							WindowPrt.print();
+							WindowPrt.close();
+							that.hideModal();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
 				}
-				that.btnLoading = false;
-				that.printData = arr;
-		    setTimeout(() => {
-		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=100,height=1000");
-					WindowPrt.document.body.innerHTML = printContent.innerHTML;
-					setTimeout(_=>{
-						WindowPrt.document.close();
-						WindowPrt.focus();
-						WindowPrt.print();
-						WindowPrt.close();
-						that.hideModal();
-					},500)
-		    }, 500);
 		  });
 	}
 	

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

@@ -1,107 +1,108 @@
 <div class="pathology-box display_flex align-items_center justify-content_flex-center">
-	<div class="pathology-content" *ngIf="!isSpinning">
-		<div class="title">查看详情
-		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
-		<div class="content">
-			<div class="content-item boder-right">
-				<div class="form-title-box">
-					<div class="form-title width-150"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
-					<div class="form-title width-200"><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 width-150"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
-					<div class="form-title width-200"><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-list">
-					<div class="form-title font-weight-500">诊断：</div>
-					<div class="indent">
-						{{detailsData.diagnose||'无'}}
+		<div class="pathology-content" *ngIf="!isSpinning">
+			<div class="title">查看详情
+			<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+			<div class="content">
+				<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.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-list">
+						<div class="form-title font-weight-500">术中所见：</div>
+						<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
 					</div>
-				</div>
-				
-				<div class="form-list">
-					<div class="form-title font-weight-500">病理摘要：</div>
-					<div class="indent">{{detailsData.medicalRecords||'无'}}</div>
-				</div>
-				<div class="form-list">
-					<div class="form-title font-weight-500">手术方案：</div>
-					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
-				</div>
-				<div class="form-list">
-					<div class="form-title font-weight-500">术中所见：</div>
-					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
-				</div>
 
-				<div class="form-title-box">
-					<div class="form-title width-150"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
-					<div class="form-title width-200"><span class="font-weight-500">标本件数：</span>{{detailsData.specimenNum||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{detailsData.takePart||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
-				</div>
-				
-				<div class="form-title-box">
-					<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-box">
-						<div class="form-title" *ngFor="let item of specimenList">
-							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
-							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-							{{item.sample?item.sample.name:''}}
+						<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-box">
+							<div class="form-title" *ngFor="let item of specimenList">
+								{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+								{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+								{{item.organ?item.organ.name:''}} <span>-</span>
+								{{item.sample?item.sample.name:item.specimenName}}
+							</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}}</div>
+										<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									</div>
+									<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+										<div>{{item.operationType.name}}</div>
+										<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									</div>
+								</ng-template>
+							</ng-container>
+					</nz-steps>
+				</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}}</div>
-									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
-								</div>
-								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
-									<div>{{item.operationType.name}}</div>
-									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
-								</div>
-							</ng-template>
-						</ng-container>
-				</nz-steps>
+			<div class="display_flex justify-content_flex-center bottom-btn">
+				<button class="btn btn-right" *ngIf="detailsData.status.value==6 || 
+				detailsData.status.value==7 || detailsData.status.value==8 || 
+				detailsData.status.value==9 || detailsData.status.value==10"nz-button nzType="primary" (click)="closeDetailMoadl()">确定</button>
+				
+				<button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+				detailsData.status.value==3 || detailsData.status.value==4 || 
+				detailsData.status.value==5" nz-button nzType="primary" (click)="submitPrint()" [nzLoading]="btnLoading">补打</button>
+				
+				<!-- <button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
+				detailsData.status.value==3 || detailsData.status.value==4 || 
+				detailsData.status.value==5" nz-button nzType="primary" 
+				(click)="immobilization()">标本固定</button> -->
+				
+				<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
 			</div>
 		</div>
-		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" *ngIf="detailsData.status.value==6 || 
-			detailsData.status.value==7 || detailsData.status.value==8 || 
-			detailsData.status.value==9 || detailsData.status.value==10"nz-button nzType="primary" (click)="closeDetailMoadl()">确定</button>
-			
-			<button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
-			detailsData.status.value==3 || detailsData.status.value==4 || 
-			detailsData.status.value==5" nz-button nzType="primary" (click)="submitPrint()" [nzLoading]="btnLoading">补打</button>
-			
-			<!-- <button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
-			detailsData.status.value==3 || detailsData.status.value==4 || 
-			detailsData.status.value==5" nz-button nzType="primary" 
-			(click)="immobilization()">标本固定</button> -->
-			
-			<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
-		</div>
-	</div>
-	
 	<div class="mask-style" *ngIf="isSpinning">
 		<nz-spin nzSimple class="spin-style"></nz-spin>
 	</div>
@@ -134,10 +135,10 @@
 					<div style="width:70%;padding:1px;">{{printData.specimenNum}}</div>
 				</div>
 			</div>
-			 <div style="height: 10px;"></div>
+			<div style="height: 10px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
-				 <div style="height: 30px;"></div>
+				 <div style="height: 30px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
 					 <img style="width: 100%;height: 90px;border-radius: 5px;" [src]="data.barCode" alt="">
 					 <div class="monad-sign" style="border-bottom: 1px solid #AAAAAA; padding-left:1px;">

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

@@ -1,3 +1,24 @@
+/* 修改垂直滚动条 */
+::-webkit-scrollbar {
+	width: 4px; /* 修改宽度 */
+	border-radius: 2px;
+}
+ 
+/* 修改滚动条轨道背景色 */
+::-webkit-scrollbar-track {
+	background-color: #f1f1f1;
+}
+ 
+/* 修改滚动条滑块颜色 */
+::-webkit-scrollbar-thumb {
+	background-color: #888;
+}
+ 
+/* 修改滚动条滑块悬停时的颜色 */
+::-webkit-scrollbar-thumb:hover {
+	background-color: #555;
+}
+
 .pathology-box {
   position: fixed;
 	left: 0;
@@ -33,7 +54,6 @@
 			background: #f9fafb;
 			border: 1px solid #e5e9ed;
 			border-radius: 5px;
-			overflow: hidden;
 			margin-top: 12px;
 			display: flex;
 			// .addForm{
@@ -46,13 +66,13 @@
 					width: 100%;
 				}
 				.content-item{
-					height: auto;
-					max-height: 460px;
+					width: 78%;
+					height: 460px;
 					overflow-y: auto;
-					width: 75%;
 					padding: 15px;
 					.form-title-box{
 						display: flex;
+						flex-wrap: wrap;
 						margin-bottom: 10px;
 						.form-title{
 							color: #333;
@@ -87,13 +107,13 @@
 						}
 					}
 					.ant-form-item {
-					  margin-bottom: 14px;
+						margin-bottom: 14px;
 						display: flex;
 						flex-wrap: wrap;
-					  .ant-form-item-label {
-					    text-align: left;
+						.ant-form-item-label {
+							text-align: left;
 							font-weight: 500;
-					  }
+						}
 						.ant-form-item-control-wrapper{
 							.ant-form-item-control{
 								width: 400px;
@@ -115,10 +135,10 @@
 						}
 					}
 				}
+			
+
 				.content-item-right{
-					width: 25%;
-					height: auto;
-					max-height: 460px;
+					height: 460px;
 					overflow-y: auto;
 					padding: 15px;
 					.step-title{
@@ -127,6 +147,8 @@
 						margin-bottom: 10px;
 					}
 				}
+				
+				
 				.boder-right{
 					border-right: 1px solid #e5e9ed;
 				}

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

@@ -75,6 +75,10 @@ export class PathologyDetailComponent implements OnInit {
 	notModal:boolean = false;
 	hosId:any;
 	pathologyLogs:any //日志
+	printLoading:boolean = false;
+	printData:any = [];
+	project:any = [];
+	
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
 		// this.initForm()
@@ -100,27 +104,31 @@ export class PathologyDetailComponent implements OnInit {
 		this.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {
-		    let arr = res.data;
-		    if(arr.applyBarCode){
-		    	arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
-		    }
-		    for(let i of arr.specimenList){
-		    	i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
-		    }
-		    that.printLoading = false;
-		    that.printData = arr;
-		    setTimeout(() => {
-		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=100,height=1000");
-		    	WindowPrt.document.body.innerHTML = printContent.innerHTML;
-		    	setTimeout(_=>{
-		    		WindowPrt.document.close();
-		    		WindowPrt.focus();
-		    		WindowPrt.print();
-		    		WindowPrt.close();
-		    		that.hideModal();
-		    	},500)
-		    }, 500);
+				if(res.status==200){
+					let arr = res.data;
+					if(arr.applyBarCode){
+						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
+					}
+					for(let i of arr.specimenList){
+						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
+					}
+					that.printLoading = false;
+					that.printData = arr;
+					setTimeout(() => {
+					  const printContent = document.getElementById("report");
+					  const WindowPrt = window.open("", "", "width=100,height=1000");
+						WindowPrt.document.body.innerHTML = printContent.innerHTML;
+						setTimeout(_=>{
+							WindowPrt.document.close();
+							WindowPrt.focus();
+							WindowPrt.print();
+							WindowPrt.close();
+							that.hideModal();
+						},500)
+					}, 500);
+				}else{
+					this.message.error(res.msg)
+				}
 		  });
 	}
 	
@@ -130,16 +138,16 @@ export class PathologyDetailComponent implements OnInit {
 	}
 	
 	// 初始化新增form表单
-	initForm() {
-		this.validateForm = this.fb.group({
-		  intraoperativeRapidity: [1, [Validators.required]],
-			specimenGenre: [null, [Validators.required]],
-			intraoperativeFindings: [null, [Validators.required]],
-			surgicalPlan: [null, [Validators.required]],
-			specimenNum: [null,[Validators.required]],
-			takePart: [null, [Validators.required]]
-		});
-	}
+	// initForm() {
+	// 	this.validateForm = this.fb.group({
+	// 	  intraoperativeRapidity: [1, [Validators.required]],
+	// 		specimenGenre: [null, [Validators.required]],
+	// 		intraoperativeFindings: [null, [Validators.required]],
+	// 		surgicalPlan: [null, [Validators.required]],
+	// 		specimenNum: [null,[Validators.required]],
+	// 		takePart: [null, [Validators.required]]
+	// 	});
+	// }
 	
 	// 获取详情
 	fetchDataList(){
@@ -160,6 +168,12 @@ export class PathologyDetailComponent implements OnInit {
 		    this.detailsData = data.list[0];
 				this.pathologyLogs = data.list[0].formLogDTOS
 				this.stepLength = this.pathologyLogs.length
+				if(this.detailsData.pathologyInspectDTOS){
+					for(let i of this.detailsData.pathologyInspectDTOS){
+						this.project.push(i.inspectProject.name)
+					}
+					this.project = this.project.join('、')
+				}
 				// if(this.detailsData.surgicalPlan){
 				// 	this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
 				// }
@@ -170,306 +184,306 @@ export class PathologyDetailComponent implements OnInit {
 		  });
 	}
 	
-	// 获取标本类型
-	getDicData(){
-		this.mainService.getDictionary("list", "pathology_specimen_type").subscribe((res) => {
-			this.specimenData = res
-		});
-	}
-	
-	// 获取标本-位置来源
-	getSourceData(){
-		this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
-			this.placeList = res
-		});
-	}
-	
-	// 获取标本-系统
-	getSysData(){
-		let postData: any = {
-		  idx: 0,
-		  sum: 9999,
-		  dictionaryTree: {
-		    level: 1,
-		    key: 'pathology_specimen',
-		    deleted: 0,
-		  },
-		};
-		this.mainService
-		  .getFetchDataList("simple/data", "dictionaryTree", postData)
-		  .subscribe((data) => {
-		    this.systemList = data.list;
-		  });
+	// // 获取标本类型
+	// getDicData(){
+	// 	this.mainService.getDictionary("list", "pathology_specimen_type").subscribe((res) => {
+	// 		this.specimenData = res
+	// 	});
+	// }
+	
+	// // 获取标本-位置来源
+	// getSourceData(){
+	// 	this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
+	// 		this.placeList = res
+	// 	});
+	// }
+	
+	// // 获取标本-系统
+	// getSysData(){
+	// 	let postData: any = {
+	// 	  idx: 0,
+	// 	  sum: 9999,
+	// 	  dictionaryTree: {
+	// 	    level: 1,
+	// 	    key: 'pathology_specimen',
+	// 	    deleted: 0,
+	// 	  },
+	// 	};
+	// 	this.mainService
+	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
+	// 	  .subscribe((data) => {
+	// 	    this.systemList = data.list;
+	// 	  });
 
-	}
-	
-	// 获取标本-器官
-	getApparatusData(id,item,type){
-		let postData: any = {
-		  idx: 0,
-		  sum: 9999,
-		  dictionaryTree: {
-		    level: 2,
-				parent:id,
-		    key: 'pathology_specimen',
-		    deleted: 0,
-		  },
-		};
-		this.mainService
-		  .getFetchDataList("simple/data", "dictionaryTree", postData)
-		  .subscribe((data) => {
-				if(data.list.length>0){
-					this.apparatusList = data.list;
-					if(type=='edit'){
-						setTimeout(_=>{
-							let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
-							this.apparatusIndex = index3
-							this.apparatusId = Number(item.organ.id);
-						},100)
-					}
-				}else{
-					this.message.info('暂无数据')
-				}
-		  });
-	}
-	
-	// 获取标本-标本名称
-	getSpNameData(id,item,type){
-		let postData: any = {
-		  idx: 0,
-		  sum: 9999,
-		  dictionaryTree: {
-		    level: 3,
-				parent:id,
-		    key: 'pathology_specimen',
-		    deleted: 0,
-		  },
-		};
-		this.mainService
-		  .getFetchDataList("simple/data", "dictionaryTree", postData)
-		  .subscribe((data) => {
-		    this.specimenNameList = data.list;
-				this.specimenNameList.push({
-					name:'其他',
-					id:'qita'
-				})
-				if(type=='edit'){
-					if(item.sample){
-						this.validateSpecimenForm = this.fb.group({
-						  remark: [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);
-						},100)
-					}else{
-						this.validateSpecimenForm = this.fb.group({
-						  remark: [null, [Validators.required]],
-							specimenName: [null, [Validators.required]]
-						});
-						this.specimenNameIndex = this.specimenNameList.length-1
-						this.specimenNameName = 'qita'
-						this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-					}
-					setTimeout(_=>{
-						this.validateSpecimenForm.controls.remark.setValue(item.remark);
-						this.specimenModal = true
-					},50)
-				}
-		  });
-	}
-	
-	// 删除标本
-	delModal:boolean = false
-	coopId:any;
-	specimenDel(e,item,index){
-		this.delModal = true
-		this.coopId = item.id
-	}
-	
-	// 确定删除
-	confirmDel(){
-		this.mainService
-		  .coopTypeConfig(
-		    "rmvData",
-		    "pathologySpecimen",
-		     [this.coopId]
-		  )
-		  .subscribe((data) => {
-		    this.btnLoading = false;
-		    this.delModal = false;
-				this.getSampleData()
-		    if (data.status==200) {
-		      this.showSpecimenModal("删除", true, "");
-		    } else {
-		      this.showSpecimenModal("删除", false, data.data[0].msg);
-		    }
-		  });
-	}
-	// 确定删除
-	hideDelModal() {
-	  this.delModal = false;
-	}
-	
-	// 编辑标本
-	specimenDetailId:any = null;
-	specimenEdit(e,item,index){
-		this.specimenDetailId = item.id
-		let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
-		this.placeIndex = index1
-		this.placeId = Number(item.partSource.id)
-		let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
-		this.systemIndex = index2
-		this.systemId = Number(item.system.id)
-		this.getApparatusData(item.system.id,item,'edit')
-		this.getSpNameData(item.organ.id,item,'edit')
-	}
-	
-	// 选择标本
-	openSpecimen(){
-		this.validateSpecimenForm = this.fb.group({
-		  remark: [null, [Validators.required]]
-		});
-		this.specimenDetailId = null;
-		this.placeIndex = null;
-		this.systemIndex = null;
-		this.apparatusIndex = null;
-		this.specimenNameIndex = null;
-		this.placeId = null;
-		this.systemId = null;
-		this.apparatusId = null;
-		this.specimenNameId = null;
-		this.placeList=[]; //位置来源数据
-		this.systemList=[]; //系统数据
-		this.apparatusList=[]; //器官数据
-		this.specimenNameList=[]; //标本名称数据
-		this.getSourceData()
-		this.getSysData()
-		this.specimenModal = true
-	}
-	
-	// 选择位置来源
-	placeId:any = null;
-	placeClick(e,item,index){
-		this.placeId = item.id
-		this.placeIndex = index
-	}
-	
-	// 选择系统
-	systemId:any = null;
-	systemClick(e,item,index){
-		this.systemId = Number(item.id)
-		this.systemIndex = index
-		this.apparatusList = [];
-		this.apparatusId = null;
-		this.apparatusIndex = null;
-		this.getApparatusData(item.id,{},'select')
-	}
-	
-	// 选择器官
-	apparatusId:any = null;
-	apparatusClick(e,item,index){
-		this.apparatusId = Number(item.id)
-		this.apparatusIndex = index
-		this.specimenNameList = [];
-		this.specimenNameId = null;
-		this.specimenNameIndex = null;
-		this.getSpNameData(item.id,{},'select')
-	}
-	
-	// 选择标本名称
-	specimenNameId:any = null;
-	specimenNameName:any = null;
-	specimenNameClick(e,item,index){
-		this.specimenNameIndex = index
-		let remark = this.validateSpecimenForm.value.remark
-		if(item.id == 'qita'){
-			this.validateSpecimenForm = this.fb.group({
-			  remark: [remark?remark:null, [Validators.required]],
-				specimenName: [null, [Validators.required]]
-			});
-			this.specimenNameId = 'null'
-			this.specimenNameName = 'qita'
-		}else{
-			this.validateSpecimenForm = this.fb.group({
-			  remark: [remark?remark:null, [Validators.required]],
-			});
-			this.specimenNameId = item.id
-			this.specimenNameName = item.name
-		}
-	}
-	
-	// 保存标本
-	btnSpLoading:boolean = false;
-	submitSpecimen(){
-		if(this.placeIndex==null){
-			this.message.error('请选择位置来源')
-			return
-		}
-		if(this.systemIndex==null){
-			this.message.error('请选择系统')
-			return
-		}
-		if(this.apparatusIndex==null){
-			this.message.error('请选择器官')
-			return
-		}
-		if(this.specimenNameIndex==null){
-			this.message.error('请选择标本名称')
-			return
-		}
-		for (const i in this.validateSpecimenForm.controls) {
-		  this.validateSpecimenForm.controls[i].markAsDirty();
-		  this.validateSpecimenForm.controls[i].updateValueAndValidity();
-		}
-		if (this.validateSpecimenForm.invalid) return;
-		let data = {
-			pathologyFormId:this.detailsData.id,
-			partSource:{
-				id:this.placeId
-			},
-			system:{
-				id:this.systemId
-			},
-			organ:{
-				id:this.apparatusId
-			},
-			sample:{
-				id:this.specimenNameId
-			},
-			hosId:this.hosId,
-			specimenName:null,
-			id:'',
-			remark:this.validateSpecimenForm.value.remark
-		};
-		if(this.specimenNameName == 'qita'){
-			delete data.sample
-			data.specimenName = this.validateSpecimenForm.value.specimenName
-		}else{
-			data.specimenName = this.specimenNameName
-		}
-		let queryType = null
-		if(this.specimenDetailId){
-			queryType = 'updData'
-			data.id = this.specimenDetailId
-		}else{
-			queryType = 'addData'
-			delete data.id
-		}
-		this.btnSpLoading = true;
-		this.mainService
-		  .simplePost(queryType, "pathologySpecimen", data)
-		  .subscribe((res) => {
-		    this.btnSpLoading = false;
-		    if (res.status == 200) {
-		      this.showSpecimenModal("操作", true, "");
-		    } else {
-		      this.showSpecimenModal("操作", false, res.msg);
-		    }
-		  });
-	}
+	// }
+	
+	// // 获取标本-器官
+	// getApparatusData(id,item,type){
+	// 	let postData: any = {
+	// 	  idx: 0,
+	// 	  sum: 9999,
+	// 	  dictionaryTree: {
+	// 	    level: 2,
+	// 			parent:id,
+	// 	    key: 'pathology_specimen',
+	// 	    deleted: 0,
+	// 	  },
+	// 	};
+	// 	this.mainService
+	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
+	// 	  .subscribe((data) => {
+	// 			if(data.list.length>0){
+	// 				this.apparatusList = data.list;
+	// 				if(type=='edit'){
+	// 					setTimeout(_=>{
+	// 						let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
+	// 						this.apparatusIndex = index3
+	// 						this.apparatusId = Number(item.organ.id);
+	// 					},100)
+	// 				}
+	// 			}else{
+	// 				this.message.info('暂无数据')
+	// 			}
+	// 	  });
+	// }
+	
+	// // 获取标本-标本名称
+	// getSpNameData(id,item,type){
+	// 	let postData: any = {
+	// 	  idx: 0,
+	// 	  sum: 9999,
+	// 	  dictionaryTree: {
+	// 	    level: 3,
+	// 			parent:id,
+	// 	    key: 'pathology_specimen',
+	// 	    deleted: 0,
+	// 	  },
+	// 	};
+	// 	this.mainService
+	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
+	// 	  .subscribe((data) => {
+	// 	    this.specimenNameList = data.list;
+	// 			this.specimenNameList.push({
+	// 				name:'其他',
+	// 				id:'qita'
+	// 			})
+	// 			if(type=='edit'){
+	// 				if(item.sample){
+	// 					this.validateSpecimenForm = this.fb.group({
+	// 					  remark: [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);
+	// 					},100)
+	// 				}else{
+	// 					this.validateSpecimenForm = this.fb.group({
+	// 					  remark: [null, [Validators.required]],
+	// 						specimenName: [null, [Validators.required]]
+	// 					});
+	// 					this.specimenNameIndex = this.specimenNameList.length-1
+	// 					this.specimenNameName = 'qita'
+	// 					this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+	// 				}
+	// 				setTimeout(_=>{
+	// 					this.validateSpecimenForm.controls.remark.setValue(item.remark);
+	// 					this.specimenModal = true
+	// 				},50)
+	// 			}
+	// 	  });
+	// }
+	
+	// // 删除标本
+	// delModal:boolean = false
+	// coopId:any;
+	// specimenDel(e,item,index){
+	// 	this.delModal = true
+	// 	this.coopId = item.id
+	// }
+	
+	// // 确定删除
+	// confirmDel(){
+	// 	this.mainService
+	// 	  .coopTypeConfig(
+	// 	    "rmvData",
+	// 	    "pathologySpecimen",
+	// 	     [this.coopId]
+	// 	  )
+	// 	  .subscribe((data) => {
+	// 	    this.btnLoading = false;
+	// 	    this.delModal = false;
+	// 			this.getSampleData()
+	// 	    if (data.status==200) {
+	// 	      this.showSpecimenModal("删除", true, "");
+	// 	    } else {
+	// 	      this.showSpecimenModal("删除", false, data.data[0].msg);
+	// 	    }
+	// 	  });
+	// }
+	// // 确定删除
+	// hideDelModal() {
+	//   this.delModal = false;
+	// }
+	
+	// // 编辑标本
+	// specimenDetailId:any = null;
+	// specimenEdit(e,item,index){
+	// 	this.specimenDetailId = item.id
+	// 	let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
+	// 	this.placeIndex = index1
+	// 	this.placeId = Number(item.partSource.id)
+	// 	let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
+	// 	this.systemIndex = index2
+	// 	this.systemId = Number(item.system.id)
+	// 	this.getApparatusData(item.system.id,item,'edit')
+	// 	this.getSpNameData(item.organ.id,item,'edit')
+	// }
+	
+	// // 选择标本
+	// openSpecimen(){
+	// 	this.validateSpecimenForm = this.fb.group({
+	// 	  remark: [null, [Validators.required]]
+	// 	});
+	// 	this.specimenDetailId = null;
+	// 	this.placeIndex = null;
+	// 	this.systemIndex = null;
+	// 	this.apparatusIndex = null;
+	// 	this.specimenNameIndex = null;
+	// 	this.placeId = null;
+	// 	this.systemId = null;
+	// 	this.apparatusId = null;
+	// 	this.specimenNameId = null;
+	// 	this.placeList=[]; //位置来源数据
+	// 	this.systemList=[]; //系统数据
+	// 	this.apparatusList=[]; //器官数据
+	// 	this.specimenNameList=[]; //标本名称数据
+	// 	this.getSourceData()
+	// 	this.getSysData()
+	// 	this.specimenModal = true
+	// }
+	
+	// // 选择位置来源
+	// placeId:any = null;
+	// placeClick(e,item,index){
+	// 	this.placeId = item.id
+	// 	this.placeIndex = index
+	// }
+	
+	// // 选择系统
+	// systemId:any = null;
+	// systemClick(e,item,index){
+	// 	this.systemId = Number(item.id)
+	// 	this.systemIndex = index
+	// 	this.apparatusList = [];
+	// 	this.apparatusId = null;
+	// 	this.apparatusIndex = null;
+	// 	this.getApparatusData(item.id,{},'select')
+	// }
+	
+	// // 选择器官
+	// apparatusId:any = null;
+	// apparatusClick(e,item,index){
+	// 	this.apparatusId = Number(item.id)
+	// 	this.apparatusIndex = index
+	// 	this.specimenNameList = [];
+	// 	this.specimenNameId = null;
+	// 	this.specimenNameIndex = null;
+	// 	this.getSpNameData(item.id,{},'select')
+	// }
+	
+	// // 选择标本名称
+	// specimenNameId:any = null;
+	// specimenNameName:any = null;
+	// specimenNameClick(e,item,index){
+	// 	this.specimenNameIndex = index
+	// 	let remark = this.validateSpecimenForm.value.remark
+	// 	if(item.id == 'qita'){
+	// 		this.validateSpecimenForm = this.fb.group({
+	// 		  remark: [remark?remark:null, [Validators.required]],
+	// 			specimenName: [null, [Validators.required]]
+	// 		});
+	// 		this.specimenNameId = 'null'
+	// 		this.specimenNameName = 'qita'
+	// 	}else{
+	// 		this.validateSpecimenForm = this.fb.group({
+	// 		  remark: [remark?remark:null, [Validators.required]],
+	// 		});
+	// 		this.specimenNameId = item.id
+	// 		this.specimenNameName = item.name
+	// 	}
+	// }
+	
+	// // 保存标本
+	// btnSpLoading:boolean = false;
+	// submitSpecimen(){
+	// 	if(this.placeIndex==null){
+	// 		this.message.error('请选择位置来源')
+	// 		return
+	// 	}
+	// 	if(this.systemIndex==null){
+	// 		this.message.error('请选择系统')
+	// 		return
+	// 	}
+	// 	if(this.apparatusIndex==null){
+	// 		this.message.error('请选择器官')
+	// 		return
+	// 	}
+	// 	if(this.specimenNameIndex==null){
+	// 		this.message.error('请选择标本名称')
+	// 		return
+	// 	}
+	// 	for (const i in this.validateSpecimenForm.controls) {
+	// 	  this.validateSpecimenForm.controls[i].markAsDirty();
+	// 	  this.validateSpecimenForm.controls[i].updateValueAndValidity();
+	// 	}
+	// 	if (this.validateSpecimenForm.invalid) return;
+	// 	let data = {
+	// 		pathologyFormId:this.detailsData.id,
+	// 		partSource:{
+	// 			id:this.placeId
+	// 		},
+	// 		system:{
+	// 			id:this.systemId
+	// 		},
+	// 		organ:{
+	// 			id:this.apparatusId
+	// 		},
+	// 		sample:{
+	// 			id:this.specimenNameId
+	// 		},
+	// 		hosId:this.hosId,
+	// 		specimenName:null,
+	// 		id:'',
+	// 		remark:this.validateSpecimenForm.value.remark
+	// 	};
+	// 	if(this.specimenNameName == 'qita'){
+	// 		delete data.sample
+	// 		data.specimenName = this.validateSpecimenForm.value.specimenName
+	// 	}else{
+	// 		data.specimenName = this.specimenNameName
+	// 	}
+	// 	let queryType = null
+	// 	if(this.specimenDetailId){
+	// 		queryType = 'updData'
+	// 		data.id = this.specimenDetailId
+	// 	}else{
+	// 		queryType = 'addData'
+	// 		delete data.id
+	// 	}
+	// 	this.btnSpLoading = true;
+	// 	this.mainService
+	// 	  .simplePost(queryType, "pathologySpecimen", data)
+	// 	  .subscribe((res) => {
+	// 	    this.btnSpLoading = false;
+	// 	    if (res.status == 200) {
+	// 	      this.showSpecimenModal("操作", true, "");
+	// 	    } else {
+	// 	      this.showSpecimenModal("操作", false, res.msg);
+	// 	    }
+	// 	  });
+	// }
 	
 	// 获取标本列表
 	getSampleData(){
@@ -496,144 +510,143 @@ export class PathologyDetailComponent implements OnInit {
 	}
 	
 	// 日期选择
-	startDate: string; //时间开始
-	formChangeDate(result?): void {
-	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+	// startDate: string; //时间开始
+	// formChangeDate(result?): void {
+	//   this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
 		
-	}
+	// }
 	
 	//未打印提交
-	printLoading:boolean = false;
-	submitPrintForm(): void{
-		for (const i in this.validatePrintForm.controls) {
-		  this.validatePrintForm.controls[i].markAsDirty();
-		  this.validatePrintForm.controls[i].updateValueAndValidity();
-		}
-		if (this.validatePrintForm.invalid) return;
+	// submitPrintForm(): void{
+	// 	for (const i in this.validatePrintForm.controls) {
+	// 	  this.validatePrintForm.controls[i].markAsDirty();
+	// 	  this.validatePrintForm.controls[i].updateValueAndValidity();
+	// 	}
+	// 	if (this.validatePrintForm.invalid) return;
 		
-		let data: any = {
-			pathologyForm:{
-				...this.validateForm.value,
-				...this.detailsData,
-				inVitroTime:this.validatePrintForm.value.inVitroTime,
-				surgeryId: this.surgeryId || "",
-				patientId: this.patientId || "",
-				hosId: this.hosId || "" ,
-				handoverUserId:this.handoverUserId,
-				specimenType:{
-					id:this.validateForm.value.specimenGenre
-				}
-			}
-		};
-		delete data.pathologyForm.patientDTO
-		delete data.pathologyForm.surgeryDeptDTO
-		delete data.pathologyForm.surgeryDoctorDTO
-		delete data.pathologyForm.specimenGenre
-		this.printLoading = true;
-		this.mainService
-		  .pathologyPrint(data)
-		  .subscribe((res:any) => {
-				console.log(5555,res)
-				this.hideModal()
-		    this.printData = res.data;
-				this.printLoading = false;
-		    setTimeout(() => {
-		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=100,height=1000");
-		      WindowPrt.document.write(printContent.innerHTML);
-		      WindowPrt.document.close();
-		      WindowPrt.focus();
-		      WindowPrt.print();
-		      WindowPrt.close();
-		    }, 500);
-		  });
-	}
-	
-	// 监听工号数据
-	handoverUserId:any = null;
-	numberChange(e){
-		if(e.length < 3) {
-			this.validatePrintForm.controls.name.setValue('');
-			return
-		}
-		let data = {
-		  idx: 0,
-		  sum: 9999,
-		  user: {
-		    account: e || "",
-		    hospital: { id: this.hosId || "" }
-		  },
-		};
-		this.mainService
-		  .getFetchDataList("data", "user", data)
-		  .subscribe((data) => {
-				if(data.list.length>0){
-					this.validatePrintForm.controls.name.setValue(data.list[0].name);
-					this.handoverUserId = data.list[0].id
-				}else{
-					this.validatePrintForm.controls.name.setValue('');
-					this.handoverUserId =null
-				}
-		  });
-	}
-	
-	printData:any;
-	submitForm(): void{
-		var that = this;
-		for (const i in that.validateForm.controls) {
-		  that.validateForm.controls[i].markAsDirty();
-		  that.validateForm.controls[i].updateValueAndValidity();
-		}
-		if (that.validateForm.invalid) return;
-		if(this.detailsData.status.name=='未打印'){
-			this.notModal = true
-			this.validatePrintForm = this.fb.group({
-			  inVitroTime: [null, [Validators.required]],
-				jobNumber: [null, [Validators.required]],
-				name:[null, [Validators.required]],
-			});
-			let date = new Date();
-			this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-			this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
-			return
-		}
+	// 	let data: any = {
+	// 		pathologyForm:{
+	// 			...this.validateForm.value,
+	// 			...this.detailsData,
+	// 			inVitroTime:this.validatePrintForm.value.inVitroTime,
+	// 			surgeryId: this.surgeryId || "",
+	// 			patientId: this.patientId || "",
+	// 			hosId: this.hosId || "" ,
+	// 			handoverUserId:this.handoverUserId,
+	// 			specimenType:{
+	// 				id:this.validateForm.value.specimenGenre
+	// 			}
+	// 		}
+	// 	};
+	// 	delete data.pathologyForm.patientDTO
+	// 	delete data.pathologyForm.surgeryDeptDTO
+	// 	delete data.pathologyForm.surgeryDoctorDTO
+	// 	delete data.pathologyForm.specimenGenre
+	// 	this.printLoading = true;
+	// 	this.mainService
+	// 	  .pathologyPrint(data)
+	// 	  .subscribe((res:any) => {
+	// 			console.log(5555,res)
+	// 			this.hideModal()
+	// 	    this.printData = res.data;
+	// 			this.printLoading = false;
+	// 	    setTimeout(() => {
+	// 	      const printContent = document.getElementById("report");
+	// 	      const WindowPrt = window.open("", "", "width=100,height=1000");
+	// 	      WindowPrt.document.write(printContent.innerHTML);
+	// 	      WindowPrt.document.close();
+	// 	      WindowPrt.focus();
+	// 	      WindowPrt.print();
+	// 	      WindowPrt.close();
+	// 	    }, 500);
+	// 	  });
+	// }
+	
+	// // 监听工号数据
+	// handoverUserId:any = null;
+	// numberChange(e){
+	// 	if(e.length < 3) {
+	// 		this.validatePrintForm.controls.name.setValue('');
+	// 		return
+	// 	}
+	// 	let data = {
+	// 	  idx: 0,
+	// 	  sum: 9999,
+	// 	  user: {
+	// 	    account: e || "",
+	// 	    hospital: { id: this.hosId || "" }
+	// 	  },
+	// 	};
+	// 	this.mainService
+	// 	  .getFetchDataList("data", "user", data)
+	// 	  .subscribe((data) => {
+	// 			if(data.list.length>0){
+	// 				this.validatePrintForm.controls.name.setValue(data.list[0].name);
+	// 				this.handoverUserId = data.list[0].id
+	// 			}else{
+	// 				this.validatePrintForm.controls.name.setValue('');
+	// 				this.handoverUserId =null
+	// 			}
+	// 	  });
+	// }
+	
+	// printData:any;
+	// submitForm(): void{
+	// 	var that = this;
+	// 	for (const i in that.validateForm.controls) {
+	// 	  that.validateForm.controls[i].markAsDirty();
+	// 	  that.validateForm.controls[i].updateValueAndValidity();
+	// 	}
+	// 	if (that.validateForm.invalid) return;
+	// 	if(this.detailsData.status.name=='未打印'){
+	// 		this.notModal = true
+	// 		this.validatePrintForm = this.fb.group({
+	// 		  inVitroTime: [null, [Validators.required]],
+	// 			jobNumber: [null, [Validators.required]],
+	// 			name:[null, [Validators.required]],
+	// 		});
+	// 		let date = new Date();
+	// 		this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+	// 		this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
+	// 		return
+	// 	}
 
-		let data: any = {
-			pathologyForm:{
-				...this.validateForm.value,
-				...this.detailsData,
-				surgeryId: this.surgeryId || "",
-				patientId: this.patientId || "",
-				hosId: this.hosId || "" ,
-				specimenType:{
-					id:this.validateForm.value.specimenGenre
-				}
-			}
-		};
-		delete data.pathologyForm.patientDTO
-		delete data.pathologyForm.surgeryDeptDTO
-		delete data.pathologyForm.surgeryDoctorDTO 
-		delete data.pathologyForm.specimenGenre 
-		that.btnLoading = true;
-		that.mainService
-		  .pathologyPrint(data)
-		  .subscribe((res:any) => {
-				this.hideModal()
-				let arr = res.data;
-		    that.printData = arr;
-				that.btnLoading = false;
-		    setTimeout(() => {
-		      const printContent = document.getElementById("report");
-		      const WindowPrt = window.open("", "", "width=100,height=1000");
-		      WindowPrt.document.write(printContent.innerHTML);
-		      WindowPrt.document.close();
-		      WindowPrt.focus();
-		      WindowPrt.print();
-		      WindowPrt.close();
+	// 	let data: any = {
+	// 		pathologyForm:{
+	// 			...this.validateForm.value,
+	// 			...this.detailsData,
+	// 			surgeryId: this.surgeryId || "",
+	// 			patientId: this.patientId || "",
+	// 			hosId: this.hosId || "" ,
+	// 			specimenType:{
+	// 				id:this.validateForm.value.specimenGenre
+	// 			}
+	// 		}
+	// 	};
+	// 	delete data.pathologyForm.patientDTO
+	// 	delete data.pathologyForm.surgeryDeptDTO
+	// 	delete data.pathologyForm.surgeryDoctorDTO 
+	// 	delete data.pathologyForm.specimenGenre 
+	// 	that.btnLoading = true;
+	// 	that.mainService
+	// 	  .pathologyPrint(data)
+	// 	  .subscribe((res:any) => {
+	// 			this.hideModal()
+	// 			let arr = res.data;
+	// 	    that.printData = arr;
+	// 			that.btnLoading = false;
+	// 	    setTimeout(() => {
+	// 	      const printContent = document.getElementById("report");
+	// 	      const WindowPrt = window.open("", "", "width=100,height=1000");
+	// 	      WindowPrt.document.write(printContent.innerHTML);
+	// 	      WindowPrt.document.close();
+	// 	      WindowPrt.focus();
+	// 	      WindowPrt.print();
+	// 	      WindowPrt.close();
 					
-		    }, 500);
-		  });
-	}
+	// 	    }, 500);
+	// 	  });
+	// }
 	
 	// 关闭标本
 	closeSpecimenModel(){

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

@@ -1663,6 +1663,7 @@
                             <!-- 【是否开启手术即将开始通知】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回病房】开启 -->
+														<button *ngIf="surgeryWKOMsg.patientDTO && surgeryConfigs && surgeryConfigs.isPathologyForm == 1" class="btn1 mr8 mb8 mt8" (click)="pathologyAddItem($event,item)">病理申请单</button>
                             <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
@@ -3955,8 +3956,7 @@
 <button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>
 
 <!-- 病理申请单 -->
-
-<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryWKOMsg.id" [patientId]="surgeryWKOMsg.patientDTO.id" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
 
 <!-- 病理详情 -->
-<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryWKOMsg.id" [patientId]="surgeryWKOMsg.patientDTO.id" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
+<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>

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

@@ -168,7 +168,9 @@ export class HushijiandanComponent implements OnInit {
 	pathologyDetailModal:boolean = false; //病理详情
   // 初始化权限按钮
   coopBtns: any = {};
-
+	surgeryDataId: any; //手术id
+	patientDataId: any; //病人id
+	
   ngOnInit() {
     this.getCoopBtns();
     this.currentHospital = this.tool.getCurrentHospital();
@@ -307,18 +309,44 @@ export class HushijiandanComponent implements OnInit {
     console.log(this.coopBtns);
   }
 	
+	// 手术排程-病理申请单
+	pathologyAddItem(e,item){
+		this.surgeryDataId = item.id
+		this.patientDataId = item.patientDTO.id
+		let data = {
+			idx: 0,
+			sum: 9999,
+			pathologyForm: {
+				surgeryId: item.id || "",
+				patientId: item.patientDTO.id || "",
+				hosId: this.currentHospital.id || "" ,
+			},
+		};
+		this.mainService
+			.getFetchDataList("data", "pathologyForm", data)
+			.subscribe((data) => {
+				if(data.list[0].status.value==1){
+					this.pathologyModal = true
+				}else{
+					this.pathologyDetailModal = true
+				}
+			});
+	}
+	
 	// 病理申请单
 	pathologyAdd(e){
-	let data = {
-		idx: 0,
-		sum: 9999,
-		pathologyForm: {
-			surgeryId: this.surgeryWKOMsg.id || "",
-			patientId: this.surgeryWKOMsg.patientDTO.id || "",
-			hosId: this.currentHospital.id || "" ,
-		},
-	};
-	this.mainService
+		this.surgeryDataId = this.surgeryWKOMsg.id
+		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		let data = {
+			idx: 0,
+			sum: 9999,
+			pathologyForm: {
+				surgeryId: this.surgeryWKOMsg.id || "",
+				patientId: this.surgeryWKOMsg.patientDTO.id || "",
+				hosId: this.currentHospital.id || "" ,
+			},
+		};
+		this.mainService
 		.getFetchDataList("data", "pathologyForm", data)
 		.subscribe((data) => {
 			if(data.list[0].status.value==1){

src/app/views/main/main.component.html

@@ -42,7 +42,8 @@
           <button nz-button nzType="primary" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')" [nzLoading]="deptTypeLoading">业务视图</button>
           <button nz-button nzType="primary" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</button>
 					<button nz-button nzType="primary" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</button>
-          <button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
+					<button nz-button nzType="primary" *ngIf="pathology" (click)="toPathology()">病理科端</button>
+					<button nz-button nzType="primary" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</button>
           <button nz-button nzType="primary" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()">配置中心</button>
         </div>
         <div class="right">

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

@@ -30,6 +30,7 @@ export class MainComponent implements OnInit {
   specimenViewRole: boolean = false; //业务视图权限
   specimenViewRole2: boolean = false; //标本视图权限
 	specimenRoomView: boolean = false; //标本间权限
+	pathology: boolean = false; //病理科权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
   configurationCenterRole: boolean = false; //配置中心权限
   PCCommutesToWork: boolean = false; //PC上下班权限
@@ -294,6 +295,10 @@ export class MainComponent implements OnInit {
 			  this.specimenRoomView = true;
 			  console.log("标本间权限");
 			}
+			if (e.link == "pathology") {
+			  this.pathology = true;
+			  console.log("病理科权限");
+			}
       if (e.link == "disinfectionSupply") {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
@@ -417,6 +422,10 @@ export class MainComponent implements OnInit {
 	toSpecimenRoomView(): void {
 	  this.router.navigateByUrl("specimenRoomView");
 	}
+	// 病理科
+	toPathology(): void {
+	  this.router.navigateByUrl("pathology");
+	}
   // 全局业务查看
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");

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

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

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

@@ -0,0 +1,622 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+		<h2 class="pharmacy-name__title">
+			<span>病理科</span>
+		</h2>
+    </div>
+    <div class="pharmacy-name">
+			<div class="mar-ri-30">
+				今日接收：
+				申请单 <span class="weight">50</span> &nbsp;
+				标本 <span class="weight">50</span>&nbsp;
+				送出 <span class="weight">50</span>&nbsp;
+				速冻 <span class="weight">50</span>&nbsp;
+			</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>
+      </div>
+			<div class="error-class">{{errorcODEMsg}}</div>
+    </div>
+    <div class="userInfo">
+      <div class="wel">欢迎您：</div>
+      <div class="user">
+        <img src="../../assets/images/icon_keshi.png" alt="" />
+        <span *ngIf="deptDisplay">{{
+          deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept
+        }}</span>
+      </div>
+      <div class="userInfo-wrap">
+        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="logOut()">退出</div>
+      </div>
+    </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)">实时术中快速<span class="red">(13)</span></div>
+			<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 2}" (click)="tabClick(2)">打包配送</div>
+		</div>
+		<div class="tabs-btn">
+			<button class="btn default" nzSize="small" (click)='connect()'>交接</button>
+			<button class="btn default" nzSize="small" (click)='packaging()'>打包</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>
+							<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-radio-group [(ngModel)]="intraoperativeRapidity">
+								<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>标本数</th>
+			          <th>申请科室</th>
+			          <th>配送人</th>
+			          <th>接收人</th>
+								<th>接收时间</th>
+			          <th>操作</th>
+			        </tr>
+			      </thead>
+			      <tbody>
+			        <tr *ngFor="let data of listOneData">
+			          <td><span style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+								<td>{{ data.patientDTO.patientName || '-' }}</td>
+			          <td>{{ data.residenceNo}}</td>
+			          <td>{{ data.takePart}}</td>
+			          <td>{{ data.specimenNum}}</td>
+			          <td>{{ data.drugNum || '0'}}</td>
+								<td>{{ data.cartonNum || '0' }}</td>
+								<td>{{ data.totalPrice || '0' }}</td>
+								<td>{{ data.time|date:'yyyy-MM-dd HH:mm'  }}</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 style="color: red;">速</span>{{ data.applyCode || '-' }}</td>
+      	          <td>{{ data.patientDTO.patientName || '-' }}</td>
+      	          <td>{{ data.residenceNo}}</td>
+      	          <td>{{ data.takePart}}</td>
+      	          <td>{{ data.specimenNum}}</td>
+      	          <td>{{ data.drugNum || '0'}}</td>
+      	          <td>{{ data.cartonNum || '0' }}</td>
+      	          <td>{{ data.totalPrice || '0' }}</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.batchNo || '-' }}</td>
+									<td>
+										<div>{{data.batchNo }}</div>
+										<div>{{data.batchNo }}</div>
+									</td>
+				          <td>{{ data.createTime|date:'yyyy-MM-dd HH:mm' }}</td>
+				          <td>{{ data.pharmacyDTO?data.pharmacyDTO.dept:'-' }}</td>
+				          <td>
+				          	<div>{{data.batchNo }}</div>
+				          	<div>{{data.batchNo }}</div>
+				          </td>
+				          <td>
+				          	<div>{{data.batchNo }}</div>
+				          	<div>{{data.batchNo }}</div>
+				          </td>
+									<td>{{ data.batchState?data.batchState.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)]="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)"
+  deptType="nurse"
+> 
+  <!-- 返回系统按钮 -->
+  <!-- 右侧悬浮框 -->
+   <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="save add display_flex align-items_center justify-content_flex-center" *ngIf="relevanceModal">
+	<div class="modalBody">
+		<div class="title">关联科室</div>
+		<overlay-scrollbars #osComponentRef1 class="content">
+		 <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="specimen" [nzSm]="5" [nzXs]="24">关联标本间</nz-form-label>
+				<nz-form-control nzErrorTip="请选择标本间!" [nzSm]="19" [nzXs]="24">
+					<nz-input-group>
+						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择标本间" formControlName="specimen">
+							<ng-container *ngFor="let option of specimenData">
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							</ng-container>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+			
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="operation" [nzSm]="5" [nzXs]="24">关联手术间</nz-form-label>
+				<nz-form-control nzErrorTip="请选择手术间!" [nzSm]="19" [nzXs]="24">
+					<nz-input-group>
+						<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择请选择手术间" formControlName="operation">
+							<ng-container *ngFor="let option of operationData">
+								<nz-option [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+							</ng-container>
+						</nz-select>
+					</nz-input-group>
+				</nz-form-control>
+			</nz-form-item>
+			
+			<nz-form-item>
+				<nz-form-label nzRequired nzFor="generate">标本是否直接生成配送单</nz-form-label>
+				<nz-form-control nzErrorTip="请选择!">
+					<nz-radio-group formControlName="generate">
+						<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">
+			<button class="btn" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">确定</button>
+		</div>
+	</div>
+</div>
+
+
+<!-- 标本接收 -->
+<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">
+						接收申请单数: <span class="weight">50</span>  &nbsp;
+						接收标本数: <span class="weight">50</span>  
+					</div>
+					<div>
+						<!-- <div class="width-120">标本条码：</div> -->
+						<input nz-input id="specimen" placeholder="可扫描物理标本条码及包码" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
+					</div>
+					<div class="error-class">{{errorMsg}}</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>申请单号 | 申请科室</th>
+										<th>患者姓名 | 住院号</th>
+										<th>标本数</th>
+										<th>部位</th>
+										<th>标本名称</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeData let index = index">
+										<td>
+											<div>{{ data.applyCode}}</div>
+											<div>{{ data.surgeryDeptDTO.dept}}</div>
+										</td>
+										<td>
+											<div>{{ data.patientDTO.patientName}}</div>
+											<div>{{ data.patientDTO.residenceNo}}</div>
+										</td>
+										<td>{{ data.specimenNum}}</td>
+										<td>{{ data.takePart}}</td>
+										<td>
+											<div *ngFor="let item of data.pathologySpecimenDTOList">
+												{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+												{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+												{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+												{{item.sample?item.sample.name:''}}
+											</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)="submitFixationForm()" [nzLoading]="btnLoading">交接完成</button>
+			<!-- <button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button> -->
+		</div>
+	</div>
+</div>
+
+
+<!-- 查看详情 -->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="listDetailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetail()"></i></div>
+		<div class="content">
+			<div class="content-item">
+				<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>申请单号 | 申请科室</th>
+										<th>患者姓名 | 住院号</th>
+										<th>标本数</th>
+										<th>部位</th>
+										<th>标本名称</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr *ngFor="let data of codeData let index = index">
+										<td>
+											<div>{{ data.applyCode}}</div>
+											<div>{{ data.surgeryDeptDTO.dept}}</div>
+										</td>
+										<td>
+											<div>{{ data.patientDTO.patientName}}</div>
+											<div>{{ data.patientDTO.residenceNo}}</div>
+										</td>
+										<td>{{ data.specimenNum}}</td>
+										<td>{{ data.takePart}}</td>
+										<td>
+											<div *ngFor="let item of data.pathologySpecimenDTOList">
+												{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+												{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+												{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+												{{item.sample?item.sample.name:''}}
+											</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)="closeDetail()">知道了</button>
+		</div>
+	</div>
+</div>
+
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo" (closeModel)="closeModel()"></app-prompt-modal>
+	
+<!-- 标本固定信息 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="verificationMoadl">
+	<div class="modalBody no-width">
+		<div class="title">标本固定信息<i class="icon_transport transport-guanbi" (click)="hideVerificationModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validateVerificationForm" class="addForm" (ngSubmit)="submitVerificationForm()">
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择固定时间!">
+				    <nz-input-group>
+							<nz-date-picker formControlName="fixationTime" 
+							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="formChangeDate($event)"></nz-date-picker>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">工号</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入工号!">
+						<input nz-input (ngModelChange)="numberChange($event)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="name">姓名</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入姓名!">
+						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固体液类型</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固体液类型!">
+				    <nz-input-group>
+							<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择固体液类型" formControlName="fixative">
+							  <ng-container *ngFor="let option of fixativeData">
+							    <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+			</form>
+		</div>
+		<div class="display_flex justify-content_flex-center bottom-btn">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitVerificationForm()" [nzLoading]="btnInfoLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideVerificationModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<!-- 标本查看详情-->
+<div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="detailMoadl">
+	<div class="pathology-content">
+		<div class="title">查看详情
+		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
+		<div class="content">
+			<div class="content-item boder-right">
+				<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.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-list">
+					<div class="form-title font-weight-500">术中所见：</div>
+					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
+				</div>
+
+				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本件数：</span>{{detailsData.specimenNum||'无'}}</div>
+					<div 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">
+							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
+							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
+							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
+							{{item.sample?item.sample.name:''}}
+						</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}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+								</div>
+								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+									<div>{{item.operationType.name}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{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>
+			<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
+		</div>
+	</div>
+</div>
+
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>

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

@@ -0,0 +1,850 @@
+@import "../../../../src/theme.less";
+:host {
+  width: 100%;
+  background-color: #f9fafb;
+  .ant-btn[disabled] {
+    color: rgba(0, 0, 0, 0.25) !important;
+    background-color: #f5f5f5 !important;
+  }
+  .red {
+    color: red !important;
+    font-weight: bold !important;
+  }
+  .green {
+    color: @primary-color!important;
+    font-weight: bold !important;
+  }
+
+  h1,
+  h2,
+  h3,
+  p {
+    margin: 0;
+  }
+  em {
+    font-style: normal;
+  }
+	
+	
+	/* 修改垂直滚动条 */
+	::-webkit-scrollbar {
+		width: 4px; /* 修改宽度 */
+		border-radius: 2px;
+	}
+	 
+	/* 修改滚动条轨道背景色 */
+	::-webkit-scrollbar-track {
+		background-color: #f1f1f1;
+	}
+	 
+	/* 修改滚动条滑块颜色 */
+	::-webkit-scrollbar-thumb {
+		background-color: #888;
+	}
+	 
+	/* 修改滚动条滑块悬停时的颜色 */
+	::-webkit-scrollbar-thumb:hover {
+		background-color: #555;
+	}
+	
+  .pharmacy {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+  // 头部 start
+  .pharmacy-header {
+    // height: 88px;
+    background-color: #fff;
+    border-bottom: 1px solid #e5e9ed;
+    box-sizing: border-box;
+    display: flex;
+		color: #000;
+    .pharmacy-logo {
+      width: 100px;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+			font-weight: bold;
+      .pharmacy-logo__img {
+        max-width: 100%;
+        max-height: 50%;
+      }
+
+      .pharmacy-logo__name {
+        font-size: 14px;
+        color: @primary-color;
+        margin-top: 8px;
+      }
+    }
+
+    .pharmacy-name {
+      // flex: 1;
+      // border-right: 1px solid #e5e9ed;
+      display: flex;
+      // justify-content: space-between;
+      align-items: center;
+			width: 70%;
+			justify-content: center;
+			.mar-ri-30{
+				margin-right: 30px;
+			}
+			.weight{
+				font-weight: bold;
+			}
+      .pharmacy-name__title {
+        font-size: 22px;
+        color: #333;
+        margin-left: 43px;
+        line-height: 87px;
+        .currentDate {
+          margin-left: 24px;
+          font-size: 16px;
+        }
+      }
+      .pharmacy-name__total {
+        width: 250px;
+        font-size: 16px;
+				display: flex;
+				.pharmacy-title{
+					width: 160px;
+					font-weight: 600;
+					font-size: 22px;
+				}
+      }
+			.error-class{
+				color: red;
+				margin-left: 10px;
+			}
+    }
+
+    .pharmacy-operate {
+      width: 211px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      position: relative;
+      .pharmacy-operatePop {
+        cursor: pointer;
+        border: 1px solid #e5e9ed;
+        background-color: #fff;
+        position: absolute;
+        left: 0;
+        top: 100%;
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        text-align: center;
+        font-size: 14px;
+        color: @primary-color;
+      }
+
+      &:after {
+        content: "";
+        display: block;
+        width: 0;
+        height: 0;
+        border-left: 7px solid transparent;
+        border-right: 7px solid transparent;
+        border-top: 10px solid #666;
+      }
+
+      .pharmacy-operate__img {
+        max-height: 40px;
+        margin-right: 8px;
+      }
+
+      .pharmacy-operate__title {
+        font-size: 20px;
+        color: #666;
+        padding-right: 24px;
+        cursor: pointer;
+      }
+    }
+  }
+	.tabs{
+		display: flex;
+		justify-content: space-between;
+		font-size: 14px;
+		background: #fff;
+		border-bottom: 1px solid #e5e9ed;
+		margin-right: 13px;
+		.tabs-item{
+			display: flex;
+			align-items: center;
+			.tabs-item-item{
+				padding: 15px 20px;
+				border-bottom: 2px solid #f9fafb;
+				cursor: pointer;
+			}
+			.red{
+				color: red;
+			}
+			.activeClass{
+				color: #64BD7B;
+				border-bottom: 2px solid #64BD7B;
+			}
+		}
+		.tabs-btn{
+			display: flex;
+			align-items: center;
+			.btn{
+				margin-left: 10px;
+			}
+		}
+	}
+	
+  .userInfo {
+    // display: none;
+    width: 336px;
+    // height: 100%;
+    // float: right;
+    padding: 8px;
+    box-sizing: border-box;
+    font-size: 14px;
+    // border-left: 1px solid #e5e9ed;
+
+    .wel {
+      line-height: 15px;
+    }
+
+    .user {
+      font-size: 20px;
+      height: 36px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      line-height: normal;
+
+      img {
+        height: 100%;
+        margin-right: 8px;
+      }
+    }
+    .userInfo-wrap {
+      display: flex;
+      justify-content: flex-end;
+      .logOut {
+        display: inline-block;
+        text-align: right;
+        color: @primary-color;
+        line-height: 20px;
+        cursor: pointer;
+        margin-right: 8px;
+      }
+    }
+  }
+  // 头部 end
+  // 主体部分 start
+  .pharmacy-main {
+    .pharmacy-main__list {
+      display: flex;
+      flex-direction: column;
+      background-color: #fff;
+      margin: 0 4px;
+      box-sizing: border-box;
+      // 标题 start
+      .pharmacy-main__title {
+        height: 40px;
+        background-color: #fff;
+        font-size: 16px;
+        color: #333;
+        font-weight: 700;
+        padding-left: 8px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #e5e9ed;
+        .autoUpdate {
+          font-size: 14px;
+          color: #49b856;
+          margin-right: 8px;
+        }
+        .pharmacy-main__printAll {
+          // width: 80px;
+          height: 28px;
+          line-height: 28px;
+          margin-right: 16px;
+          background-color: @primary-color;
+          font-size: 14px;
+          color: #fff;
+          border-radius: 4px;
+          text-align: center;
+          display: flex;
+          justify-content: center;
+        }
+      }
+      // 标题 end
+      // 搜索框 start
+      .pharmacy-main__search {
+        padding: 8px;
+        position: relative;
+				border-bottom: 1px solid #e5e9ed;
+        .pharmacy-main__searchInput {
+          border-radius: 100px;
+          padding-right: 82px;
+          border: 1px solid #e5e9ed;
+          background-color: #fff;
+          overflow: hidden;
+          input {
+            border: none;
+          }
+          .ant-input:focus {
+            border-color: #fff;
+            outline: 0;
+            box-shadow: 0 0 0 2px #fff;
+          }
+          .pharmacy-main__searchText {
+            cursor: pointer;
+            position: absolute;
+            top: 13px;
+            right: 8px;
+            width: 74px;
+            height: 22px;
+            border-left: 1px solid #e5e9ed;
+            color: #999;
+            padding-left: 8px;
+            box-sizing: border-box;
+            span {
+              color: @primary-color;
+              margin-left: 8px;
+            }
+          }
+        }
+      }
+      // 搜索框 end
+      // 列表 start
+      .pharmacy-main__selectionWrap {
+        flex: 1;
+        // height: 630px;
+        overflow: auto;
+        &:first-child {
+          border-top: 1px solid #e5e9ed;
+        }
+        .pharmacy-main__selection {
+          box-sizing: border-box;
+          border-bottom: 1px solid #e5e9ed;
+          display: flex;
+          cursor: pointer;
+          &.noPointer{
+            cursor: pointer;
+          }
+          &.pharmacy-main__selection--more {
+            color: @primary-color;
+            height: 34px;
+            cursor: pointer;
+            .pharmacy-main__selectionInfo {
+              justify-content: center;
+              align-items: center;
+              flex-direction: row;
+              .pharmacy-main__selection--icon {
+                margin-right: 8px;
+              }
+            }
+          }
+          &.pharmacy-main__selection--noData {
+            height: calc(100vh - 212px);
+            min-height: 556px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            img {
+              width: 100px;
+            }
+          }
+          .pharmacy-main__selectionInfo {
+            padding: 8px;
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            .pharmacy-main__selectionItem {
+              display: flex;
+              justify-content: space-between;
+              padding: 0 8px;
+							margin-bottom: 5px;
+							.weight{
+								font-weight: 500;
+								.sign-red{
+									color: red;
+									margin-right: 10px;
+								}
+							}
+              .moreContent{
+                width: 150px;
+                display: flex;
+                justify-content: flex-end;
+                text-align: justify;
+                &.left{
+                  justify-content: flex-start;
+                }
+              }
+              span {
+                color: #666;
+                font-size: 12px;
+              }
+              strong {
+                color: #333;
+                font-weight: 700;
+                font-size: 14px;
+              }
+            }
+          }
+          .pharmacy-main__selectionPrint {
+            width: 90px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            border-left: 1px solid #e5e9ed;
+            .pharmacy-main__selectionPrintBtn {
+              width: 60px;
+              height: 28px;
+              line-height: 28px;
+              border-radius: 4px;
+              border: 1px solid @primary-color;
+              color: @primary-color;
+              text-align: center;
+              cursor: pointer;
+            }
+          }
+        }
+      }
+      // 列表 end
+    }
+  }
+  // 主体部分 end
+
+  // 右侧悬浮菜单
+  .fixed {
+    position: fixed;
+    top: 40%;
+    right: 0;
+    z-index: 99;
+    border-radius: 5px 0 0 5px;
+
+    .fixedMark {
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.2);
+      z-index: 88;
+    }
+
+    // overflow: hidden;
+    & > .left {
+      width: 480px;
+      // height: 280px;
+      float: left;
+      background: #fff;
+      padding: 16px;
+      border-radius: 5px;
+      border: 1px solid #e5e9ed;
+      // box-shadow: -8px 5px 15px #eae9e9;
+      position: relative;
+      z-index: 98;
+
+      .con {
+        background: #f9fafb;
+        width: 100%;
+        height: 100%;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 16px 20px;
+
+        &.tableCon {
+          padding: 0;
+
+          .table {
+            font-size: 14px;
+
+            tr {
+              td {
+                padding: 15px 6px;
+                text-align: center;
+
+                & > .tdiv {
+                  overflow: hidden;
+
+                  .name {
+                    float: left;
+                  }
+
+                  .num {
+                    float: right;
+                    font-size: 12px;
+
+                    span {
+                      color: @primary-color;
+                      font-size: 14px;
+                    }
+                  }
+                }
+
+                .notOpen {
+                  color: #666;
+                  font-size: 12px;
+
+                  img {
+                    margin-bottom: 8px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .title {
+          color: #333;
+          text-align: center;
+        }
+
+        .conditions {
+          & > .ant-row {
+            margin: 8px 0;
+
+            .ant-row {
+              .ant-col-6 {
+                margin: 2px 0;
+              }
+            }
+
+            .checkAll {
+              width: 100%;
+              border-bottom: 1px solid rgb(233, 233, 233);
+              color: @primary-color;
+            }
+          }
+        }
+
+        .btns {
+          padding: 5px 20px 0 20px;
+        }
+      }
+    }
+
+    .right {
+      // opacity: .5;
+      width: 80px;
+      float: left;
+      background: rgba(255, 255, 255, 0.5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 98;
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: rgba(0, 128, 0, 0.5);
+        background: rgba(255, 255, 255, 0.5);
+        text-align: center;
+        border-radius: 5px 0 0 5px;
+        // box-shadow: -3px 4px 15px rgba(234, 233, 233, .5);
+
+        &.hujiaozhongxin {
+          margin-bottom: 5px;
+        }
+
+        .menuItems {
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: default;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height 0.4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+
+	// 新增
+	&.add {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 999;
+	  .modalBody {
+	    width: 40%;
+	    height: auto;
+			padding: 10px 20px;
+			border-radius: 5px;
+			background: #fff;
+			.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: auto;
+	      padding: 19px 14px 0 14px;
+	      // max-height: 500px;
+	      // overflow-y: auto;
+				.ant-select{
+					width: 100%;
+				}
+				.ant-form-item {
+				  margin-bottom: 14px;
+					display: flex;
+					flex-wrap: wrap;
+				  .ant-form-item-label {
+				    text-align: left;
+						font-weight: 500;
+				  }
+					.ant-form-item-control-wrapper{
+						.ant-form-item-control{
+							width: 400px;
+						}
+					}
+				}
+				.select-item{
+					margin-top: 5px;
+					display: flex;
+					flex-wrap: wrap;
+					padding: 3px 8px;
+					border: 1px solid #e5e9ed;
+					border-radius: 5px;
+					margin-right: 10px;
+					cursor: pointer;
+					display: inline-block;
+				}
+				
+	      
+	    }
+			.bottom-btn{
+				margin-top: 10px;
+				.btn-right{
+					margin-right: 10px;
+				}
+			}
+	  }
+		.no-width{
+			width: 30% !important;
+		}
+	}
+
+.pathology-box {
+  position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, 0.4);
+	z-index: 99;
+	.pathology-content{
+		width: 80%;
+		background: #fff;
+		border-radius: 5px;
+		padding: 10px 20px;
+		color: #000;
+		.title {
+		  width: 100%;
+		  text-align: center;
+		  font-size: 18px;
+		  position: relative;
+		
+		  i {
+		    position: absolute;
+		    right: 0;
+		    top: 0;
+		    font-size: 20px;
+		    color: #666;
+		    cursor: pointer;
+		    padding: 0 5px;
+		  }
+		}
+		.content{
+			width: 100%;
+			background: #f9fafb;
+			// border: 1px solid #e5e9ed;
+			border-radius: 5px;
+			margin-top: 12px;
+			height: 460px;
+			// display: flex;
+			// .addForm{
+				// display: flex;
+				.font-weight-500{
+					color: #000;
+					font-weight: 500;
+				}
+				.ant-select{
+					width: 100%;
+				}
+				.content-item{
+					// height: auto;
+					// max-height: 460px;
+					// overflow-y: auto;
+					// width: 78%;
+					padding: 15px;
+					.form-title-box{
+						display: flex;
+						margin-bottom: 10px;
+						.form-title{
+							color: #333;
+							margin-right: 40px;
+						}
+						.width-150{
+							width: 150px;
+						}
+						.width-200{
+							width: 200px;
+						}
+					}
+					.center{
+						text-align: center;
+						padding: 10px 0;
+					}
+					.disp-fl{
+						display: flex;
+						align-items: center;
+						.disp-title{
+							margin-right: 160px;
+							.weight{
+								font-weight: bold;
+							}
+						}
+						.width-120{
+							width: 85px;
+						}
+						.ant-input{
+							width: 300px;
+						}
+						.error-class{
+							color: red;
+							margin-left: 10px;
+						}
+					}
+					.form-list{
+						margin-bottom: 10px;
+						.specimen-list{
+							display: flex;
+							flex-wrap: wrap;
+							.specimen-item-class{
+								margin-right: 40px;
+								color:#333;
+							}
+						}
+						.indent{
+							text-indent: 2ch;
+							color: #333;
+						}
+					}
+					.ant-form-item {
+					  margin-bottom: 14px;
+						display: flex;
+						flex-wrap: wrap;
+					  .ant-form-item-label {
+					    text-align: left;
+							font-weight: 500;
+					  }
+						.ant-form-item-control-wrapper{
+							.ant-form-item-control{
+								width: 400px;
+							}
+						}
+					}
+					.add-icon-class{
+						border: 1px solid #e5e9ed;
+						border-radius: 3px;
+						width: 26px;
+						height: 26px;
+						line-height: 26px;
+						text-align: center;
+						position: relative;
+						top: 7px;
+						cursor: pointer;
+						.form-icon{
+							
+						}
+					}
+				}
+				.content-item-right{
+					width: 25%;
+					height: auto;
+					max-height: 460px;
+					overflow-y: auto;
+					padding: 10px;
+					.step-title{
+						font-size: 16px;
+						font-weight: 500;
+						margin-bottom: 10px;
+					}
+				}
+				.boder-right{
+					border-right: 1px solid #e5e9ed;
+				}
+				.specimen-item{
+					display: flex;
+					margin-bottom: 10px;
+					.specimen-icon{
+						color: #64BD7B;
+						cursor: pointer;
+						font-size: 20px;
+						position: relative;
+						top: -4px;
+						left: 2px;
+					}
+				}
+			// }
+		}
+		.bottom-btn{
+			margin-top: 10px;
+			.btn-right{
+				margin-right: 10px;
+			}
+		}
+	}
+	
+}
+
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
+}

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

@@ -0,0 +1,818 @@
+import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { 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 {
+  FormBuilder,
+  Validators,
+  FormGroup,
+  FormControl,
+} from "@angular/forms";
+
+@Component({
+  selector: "app-pathology",
+  templateUrl: "./pathology.component.html",
+  styleUrls: ["./pathology.component.less"],
+})
+export class PathologyComponent 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, 
+	public tool: ToolService,
+	private fb: FormBuilder,
+	private message: NzMessageService,
+	) {}
+  // 今日药单量
+  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; //核验标本
+	specimenData:any = []; //标本间数据
+	operationData:any = []; //手术间数据
+	fixationModal:boolean = false //标本接收固定
+	verificationMoadl:boolean = false //标本核验
+	specimenCode:any; //标本条码
+	listOneData:any=[
+		{applyCode:1008611,patientDTO:{patientName:''}}
+	]; 
+	listOneLength:any;
+	pageOneIndex:any = 0;
+	pageSize:any = 10;
+	listTwoData:any=[];
+	listTwoLength:any;
+	pageTwoIndex:any = 0;
+	listThreeData:any=[];
+	listThreeLength:any;
+	pageThreeIndex:any = 0;
+	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(); //防抖
+	intraoperativeRapidity:any = 1; //术中快速
+	deliveryUser:any //配送人
+	acceptTime:any; //接收时间
+	userData:any = []; //配送人数据
+	isLoading:boolean = false;
+	listDetailMoadl:boolean = false; //详情弹框
+  ngOnDestroy() {
+    clearTimeout(this.timer);
+    clearTimeout(this.logTimer);
+  }
+
+  ngOnInit() {
+		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchSpecimenData(v[0])
+		});
+		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).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.getUserData('')
+    this.changeKs();
+  }
+  // 当前时间日期
+  runTime() {
+    clearTimeout(this.timer);
+    this.timer = setTimeout(() => {
+      this.time = Date.now();
+      this.runTime();
+    }, 500);
+  }
+	
+	//tab切换
+	tabClick(type){
+		this.activeIndex = type
+	}
+	
+	//配送人搜索
+	changeUserInp(e){
+		this.changeInpSubjectUser.next([e]);
+	}
+	
+	// 获取配送人
+	getUserData(e){
+		let query={
+			idx: 0,
+			sum: 10,
+			user: {
+			  hospital: {id: this.hosId},
+			  account: 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.startDate = null;
+		this.endDate = null;
+	  this.getConnectList();
+	}
+	// 交接本数据
+	getConnectList() {
+	  var that = this;
+	  let data = {
+	    idx: that.pageOneIndex - 1,
+	    sum: that.pageSize,
+	    drugsBatch: {
+	      startTime: this.startDate,
+	  		endTime: this.endDate,
+	  		hosId: this.hosId
+	    },
+	  };
+	  this.loading1 = true;
+	  that.mainService
+	    .getFetchDataList("data", "drugsBatch", data)
+	    .subscribe((data) => {
+	      this.loading1 = false;
+	      that.listOneData = data.list;
+	      that.listOneLength = data.totalNum;
+	    });
+	}
+	
+	// 实时术中快速数据
+	getSpeedinessList() {
+	  var that = this;
+	  let data = {
+	    idx: that.pageTwoIndex - 1,
+	    sum: that.pageSize,
+	    drugsBatch: {
+	  		hosId: this.hosId
+	    },
+	  };
+	  this.loading2 = true;
+	  that.mainService
+	    .getFetchDataList("data", "drugsBatch", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      that.listTwoData = data.list;
+	      that.listTwoLength = data.totalNum;
+	    });
+	}
+	
+	// 打包配送
+	getPackList() {
+	  var that = this;
+	  let data = {
+	    idx: that.pageThreeIndex - 1,
+	    sum: that.pageSize,
+	    drugsBatch: {
+	  		hosId: this.hosId
+	    },
+	  };
+	  this.loading3 = true;
+	  that.mainService
+	    .getFetchDataList("data", "drugsBatch", data)
+	    .subscribe((data) => {
+	      this.loading3 = false;
+	      that.listThreeData = data.list;
+	      that.listThreeLength = data.totalNum;
+	    });
+	}
+	
+	// 查看
+	oneLook(e){
+		this.listDetailMoadl = true
+	}
+	
+	closeDetail(){
+		this.listDetailMoadl = false
+	}
+	
+	// 交接
+	connect(){
+		this.fixationModal = true
+		setTimeout(_=>{
+			document.getElementById('specimen').focus();
+		},200)
+	}
+	
+	
+	// 打包
+	packaging(){
+		
+	}
+	
+	// 接收时间
+	startDate:any;
+	endDate:any;
+	changeDate(result){
+		this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+		this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 标本条码搜索
+	errorcODEMsg:any = null
+	searchSpecimen(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		let data={
+			barcode:e
+		}
+		this.isSpinning = true
+		this.mainService.pathologyScanCode(data)
+		.subscribe((res:any) => {
+			this.isSpinning = false
+			if(res.status==200){
+				this.codeData = res.data
+				if(this.codeData.pathologyInspectDTOS){
+					this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+						return i.inspectProject.name
+					})
+					this.project = this.project.join('、')
+				}
+				this.errorcODEMsg = null
+				this.fixationModal = true
+				setTimeout(_=>{
+					document.getElementById('specimen').focus();
+				},200)
+			}else{
+				this.barCode = null
+				this.errorcODEMsg = res.msg
+				// this.message.error(res.msg)
+			}
+		})
+	}
+	
+	// 选择固定时间
+	formChangeDate(result){
+	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	}
+	
+	// 确定接受固定标本
+	submitFixationForm(){
+		this.validateVerificationForm = this.fb.group({
+		  fixationTime: [null, [Validators.required]],
+			jobNumber: [null, [Validators.required]],
+			name:[null, [Validators.required]],
+			fixative:[null, [Validators.required]],
+		});
+		let date = new Date();
+		this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+		this.validateVerificationForm.controls.fixationTime.setValue(this.startDate);
+		this.btnLoading = true
+		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
+			this.fixativeData = res
+			this.btnLoading = false
+			this.verificationMoadl = true
+		});
+	}
+	
+	// 关闭接受固定标本
+	hideSpecimenModal(){
+		// this.autoUpdate()
+		this.barCode = null;
+		this.specimenCode = null;
+		this.fixationModal = false;
+	}
+	
+	// 获取标本详情
+	project:any = [];
+	getSampleData(item){
+		this.mainService.getFetchData("data", "pathologyForm", item.id)
+		.subscribe((data) => {
+			this.isSpinning = false
+			this.detailsData = data.data
+		  this.specimenList = data.data.pathologySpecimenDTOList||[]
+			this.pathologyLogs = data.data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+			if(this.detailsData.pathologyInspectDTOS){
+				this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+					return i.inspectProject.name
+				})
+				this.project = this.project.join('、')
+			}
+		  this.detailMoadl = true
+		});
+	}
+	
+	// 获取科室
+	getDept(){
+		this.setSpecimen()
+		var that = this;
+		that.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			let item1 = res2.find(i=>i.name=='手术室科室')
+			let item2 = res2.find(i=>i.name=='标本间科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item1.id || "" },
+			  },
+			};
+			let data2 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: that.hosId || "" },
+			    type: { id: item2.id || "" },
+			  },
+			};
+			that.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    that.operationData = res.list;
+			  });
+				
+			that.mainService
+			  .getFetchDataList("data", "department", data2)
+			  .subscribe((res) => {
+					that.specimenData = res.list
+					this.getDeptDetail()
+			  });
+		});
+	}
+	
+	// 获取关联科室详情
+	getDeptDetail(){
+		this.mainService
+		  .transfusionPrint("user", this.userId)
+		  .subscribe((res) => {
+				let data = res.data;
+				if(data.surgeryDepts){
+					let deptArr = []
+					for(let i of data.surgeryDepts){
+						deptArr.push(i.id)
+					}
+					this.validateForm.controls.operation.setValue(deptArr);
+				}
+				this.validateForm.controls.specimen.setValue(data.dept.id);
+				if(data.autoCreateOrder){
+					this.validateForm.controls.generate.setValue(data.autoCreateOrder);
+				}
+		  });
+	}
+	
+	// 获取是否关联标本间
+	setSpecimen(){
+		this.validateForm = this.fb.group({
+		  specimen: [null, [Validators.required]],
+			operation: [null, [Validators.required]],
+			generate:[1, [Validators.required]],
+		});
+		this.relevanceModal = true
+	}
+	
+	// 确定关联科室
+	btnLoading:boolean = false;
+	submitForm(){
+		for (const i in this.validateForm.controls) {
+		  this.validateForm.controls[i].markAsDirty();
+		  this.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateForm.invalid) return;
+		let deptArr = this.validateForm.value.operation.join(',')
+		let data = {
+		  user: {
+		    autoCreateOrder: this.validateForm.value.generate,
+				dept:{
+					id:this.validateForm.value.specimen
+				},
+				surgeryDeptIds:deptArr,
+				id:this.userId
+		  },
+		};
+		this.btnLoading = true
+		this.mainService
+		  .coopData("updData", "user", data)
+		  .subscribe((data) => {
+				this.getNewDept()
+				this.btnLoading = false
+				this.relevanceModal = false
+		    if (data.status == 200) {
+		      this.showPromptModal("操作", true, "");
+		    } else {
+		      this.showPromptModal("操作", false, data.msg);
+		    }
+		  });
+	}
+	
+	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));
+	    }
+	  });
+	}
+	
+	// 输入工号查询姓名
+	handoverUserId:any = null;
+	numberChange(e){
+		if(e.length < 3) {
+			this.validateVerificationForm.controls.name.setValue('');
+			return
+		}
+		let query = {
+		  account: e
+		};
+		this.mainService
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.validateVerificationForm.controls.name.setValue(data.userName);
+					this.handoverUserId = data.userId
+				}else{
+					this.validateVerificationForm.controls.name.setValue('');
+					this.handoverUserId =null
+					this.message.error(data.data)
+				}
+		  });
+	}
+	
+	// 提交固定标本接收
+	submitVerificationForm(){
+		for (const i in this.validateVerificationForm.controls) {
+		  this.validateVerificationForm.controls[i].markAsDirty();
+		  this.validateVerificationForm.controls[i].updateValueAndValidity();
+		}
+		if (this.validateVerificationForm.invalid) return;
+		
+		let data: any = {
+			id:this.codeData.id,
+			specimenDeptId:this.validateForm.value.specimen,
+			specimenFixingLiquid:{
+				id:this.validateVerificationForm.value.fixative
+			},
+			fixationTime:this.startDate,
+			hosId: this.hosId || "" ,
+			handoverUserId:this.handoverUserId
+		};
+		this.btnInfoLoading = true;
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((res) => {
+			this.btnInfoLoading = false;
+			this.barCode = null;
+			if (res.status == 200) {
+				this.showPromptModal("操作", true, "");
+			} else {
+				this.showPromptModal("操作", false, res.msg);
+			}
+		});
+	}
+	
+	closeModel(){
+		this.verificationMoadl = false
+		this.fixationModal = false
+	}
+	
+	// 关闭固定接受标本
+	hideVerificationModal(){
+		this.verificationMoadl = false
+	}
+	
+
+	// 监听标本条码
+	specimenCodeChange(e){
+		this.changeInpSubjectSpecimen.next([e]);
+	}
+	
+	// 监听接受固定标本条码
+	tableLoading:boolean = false;
+	codeChange(e){
+		this.changeInpSubject.next([e]);
+	}
+	
+	errorMsg:any = null;
+	searchSpecimenData(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		this.tableLoading = true
+		this.mainService.pathologyScanCode({
+			barcode:e,
+			pathologyFormId:this.codeData.id
+		})
+		.subscribe((res:any) => {
+			this.tableLoading = false
+			this.specimenCode = null
+			if(res.status==200){
+				this.codeData = res.data
+				this.errorMsg = null
+			}else{
+				this.errorMsg = res.msg
+				// this.message.error(res.msg)
+			}
+		})
+	}
+	
+	// 查看详情
+	detailMoadl:boolean = false;
+	pathologyLogs:any=[];
+	specimenList:any=[]
+	stepLength:any = 0;
+	viewDetail(item,type){
+		this.isSpinning = true
+		this.getSampleData(item)
+		clearInterval(this.logTimer);
+		if(type==1){
+			
+		}else if(type==2){
+			
+		}else{
+			
+		}
+	}
+	
+	closeDetailMoadl(){
+		this.detailMoadl = false
+		// this.autoUpdate(false);
+	}
+	
+ 
+  // 自动刷新倒计时
+  autoUpdate(flag = true) {
+    if (flag) {
+      this.logTime = this.logTimeConst;
+    }
+    clearInterval(this.logTimer);
+    this.logTimer = setInterval(() => {
+      this.logTime--;
+      if (this.logTime === 0) {
+        this.logTime = this.logTimeConst;
+
+      }
+    }, 1000);
+  }
+  // 退出
+  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("phones");
+    localStorage.removeItem("index");
+    // 假退出
+    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("phones");
+        localStorage.removeItem("index");
+      }
+    });
+
+  }
+
+  // 右侧菜单
+  showLastItems: boolean = false;
+  // 下拉
+  fixedMenuXiala() {
+    this.showLastItems = true;
+  }
+
+  // 上拉
+  fixedMenuShangla() {
+    this.showLastItems = false;
+  }
+
+  mainRole: boolean = false; //回到系统管理权限
+  initRole() {
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    console.log("菜单数量" + menus.length);
+    if (menus.length >= 2) {
+      this.mainRole = true;
+      return;
+    }
+  }
+
+  // 切换右侧菜单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/pathology.module.ts

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

src/app/views/round-robin/round-robin.component.html

@@ -191,9 +191,9 @@
             </nz-form-control>
           </nz-form-item>
           <ng-container *ngIf="selectedTasktype">
-            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan'">
+            <nz-form-item *ngIf="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'">
               <nz-form-label [nzSm]="6" [nzXs]="24"
-                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan'" nzFor="endDepartment">终点科室
+                [nzRequired]="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'" nzFor="endDepartment">终点科室
               </nz-form-label>
               <nz-form-control nzErrorTip="请选择终点科室!">
                 <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
@@ -220,9 +220,8 @@
           </ng-container>
         </form>
         <ng-container *ngIf="selectedTasktype">
-          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan'" class="roundRobinTips">
-            提示：起点科室即为标本开通科室；执行人即为科室绑定人员设定；前往设置<a [routerLink]="['/main','officeManagement']">开通科室</a>、<a
-              [routerLink]="['/main','workAssignment']">工作分配</a>>>
+          <p *ngIf="selectedTasktype.associationType.value=='specimenPlan' || selectedTasktype.associationType.value=='specimen'" class="roundRobinTips">
+            提示：起点科室即为标本开通科室；执行人即为科室绑定人员设定；前往设置开通科室、工作分配
           </p>
           <p *ngIf="selectedTasktype.associationType.value=='other'&&(selectedTasktype.carryingCourses[0].departmentStrategy.value==1||selectedTasktype.carryingCourses[1].departmentStrategy.value==1)"
             class="roundRobinTips">

src/app/views/round-robin/round-robin.component.ts

@@ -114,7 +114,6 @@ export class RoundRobinComponent implements OnInit {
         this.validateForm.controls.endDepartment.setValue(null);
       }
     }
-
     let data = {
       department: {
         hospital: { id },
@@ -190,10 +189,16 @@ export class RoundRobinComponent implements OnInit {
   depting = "";
   searchDepartment(dept, type) {
     this.depting = dept;
+		let typeId = null
+		if(this.selectedTasktype.associationType.value == "specimen"){
+			typeId = 282 
+		}else{
+			typeId = 383
+		}
     let postData = {
       department: {
         dept,
-        type: { id: 383 },
+        type: { id: typeId },
         hospital: {
           id: this.hosId,
         },
@@ -288,7 +293,7 @@ export class RoundRobinComponent implements OnInit {
       sum: 5,
       taskType: {
         hosIds: this.hosId + "",
-        associationTypeIds: "380,259",
+        associationTypeIds: "380,259,256",
         taskName,
       },
     };
@@ -441,7 +446,8 @@ export class RoundRobinComponent implements OnInit {
           executeTime: new Date(this.validateForm.value.executeTime).getTime(),
         },
       };
-      if (this.selectedTasktype.associationType.value == "specimenPlan") {
+      if (this.selectedTasktype.associationType.value == "specimenPlan"||
+					this.selectedTasktype.associationType.value == "specimen") {
         //标本轮巡
         postData.orderPlan.targetDept =
           this.validateForm.value.endDepartment.join();
@@ -475,7 +481,8 @@ export class RoundRobinComponent implements OnInit {
         dayType: this.validateForm.value.datesType,
         executeTime: new Date(this.validateForm.value.executeTime).getTime(),
       };
-      if (this.selectedTasktype.associationType.value == "specimenPlan") {
+      if (this.selectedTasktype.associationType.value == "specimenPlan"||
+				this.selectedTasktype.associationType.value == "specimen") {
         //标本轮巡
         postData.targetDept = this.validateForm.value.endDepartment.join();
       } else if (this.selectedTasktype.associationType.value == "other") {
@@ -541,7 +548,7 @@ export class RoundRobinComponent implements OnInit {
         sum: 5,
         taskType: {
           hosIds: this.hosId + "",
-          associationTypeIds: "380,259",
+          associationTypeIds: "380,259,256",
           taskName: "",
         },
       };
@@ -585,7 +592,8 @@ export class RoundRobinComponent implements OnInit {
     }
     //轮巡策略（时间）end
     // --------终点科室---
-    if (data.taskType.associationType.value == "specimenPlan") {
+    if (data.taskType.associationType.value == "specimenPlan" ||
+			this.selectedTasktype.associationType.value == "specimen") {
       //标本轮巡，则回显
       let targetDeptArr = [];
       let targetDept = data.targetDept.split(",");
@@ -593,11 +601,17 @@ export class RoundRobinComponent implements OnInit {
       targetDept.forEach((item, index) => {
         targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
       });
+			let typeId = null
+			if(this.selectedTasktype.associationType.value == "specimen"){
+				typeId = 282
+			}else{
+				typeId = 383
+			}
       this.mainService
         .getFetchDataList("data", "department", {
           department: {
             hospital: { id: data.hospital },
-            type: { id: 383 },
+            type: { id: typeId },
           },
           idx: 0,
           sum: 20,

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

@@ -16,13 +16,16 @@
     <div class="pharmacy-name">
       <div class="pharmacy-name__total">
 				<div class="pharmacy-title">标本条码：</div>
-				<nz-input-group nzSearch nzSize="large" [nzAddOnAfter]="suffixButton">
-					<input type="text" [(ngModel)]="barCode" nz-input placeholder="请输入条码" />
+				<nz-input-group nzSize="large">
+					<input type="text" id="Binput" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入条码" />
 				</nz-input-group>
-				<ng-template #suffixButton>
+				<!-- <ng-template #suffixButton>
 					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>
-				</ng-template>
+				</ng-template> -->
       </div>
+			<div>
+				<div class="error-class">{{searchMsg}}</div>
+			</div>
     </div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>
@@ -46,6 +49,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>手术间标本</strong>
+				<span *ngIf="printPharmacyList.length>0">共 {{printPharmacyList.length}} 条</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -135,6 +139,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>标本间标本</strong>
+				<span *ngIf="waitPharmacyList.length>0">共 {{waitPharmacyList.length}} 条</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -224,6 +229,7 @@
       <!-- 标题 start -->
       <div class="pharmacy-main__title">
         <strong>今日离科标本</strong>
+				<span *ngIf="pharmacyList.length>0">共 {{pharmacyList.length}} 条</span>
         <span class="autoUpdate">{{ logTime }}秒</span>
       </div>
       <!-- 标题 end -->
@@ -316,7 +322,7 @@
   <router-outlet></router-outlet>
 </div>
 
-<!-- 药房端科室切换提示框 -->
+<!-- 科室切换提示框 -->
 <app-hs-prompt-modal
   [changeShow]="changeShow"
   [closeTime]="closeTime"
@@ -324,7 +330,7 @@
   [show]="hsPromptModalShow"
   (closeModelHs)="closeModelHs($event)"
   (clearModelHs)="clearModelHs($event)"
-  deptType="pharmacy"
+  deptType="nurse"
 > 
   <!-- 返回系统按钮 -->
   <!-- 右侧悬浮框 -->
@@ -373,30 +379,30 @@
 </app-hs-prompt-modal>
 
 <!-- 标本历史记录查看 -->
-<app-history-prompt-modal
+<!-- <app-history-prompt-modal
   *ngIf="logPromptModalShow"
   [show]="logPromptModalShow"
   [scode]="scode"
   (closeModelHs)="closeModelLog($event)"
-></app-history-prompt-modal>
+></app-history-prompt-modal> -->
 
 <!-- 标本列表查看 -->
-<app-spe-prompt-modal
+<!-- <app-spe-prompt-modal
   *ngIf="spePromptModalShow"
   [show]="spePromptModalShow"
   [checkDeptId]="checkDeptId"
   [pharmacySearchKey]="pharmacySearchKey"
   [printDate]="printDate"
   (closeModelHs)="closeModelSpe($event)"
-></app-spe-prompt-modal>
+></app-spe-prompt-modal> -->
 
 <!-- 工单列表查看 -->
-<app-order-prompt-modal
+<!-- <app-order-prompt-modal
   *ngIf="orderPromptModalShow"
   [show]="orderPromptModalShow"
   [workId]="workId"
   (closeModelHs)="closeModelOrder($event)"
-></app-order-prompt-modal>
+></app-order-prompt-modal> -->
 
 <!-- 关联标本/手术室 -->
 <div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="relevanceModal">
@@ -470,6 +476,9 @@
 					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{codeData.patientDTO.patientName}} ({{codeData.patientDTO.bedNum}}床)</div>
 					<div class="form-title"><span class="font-weight-500">年龄：</span>{{codeData.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">
@@ -490,13 +499,13 @@
 					<div class="indent">{{codeData.intraoperativeFindings||'无'}}</div>
 				</div>
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{codeData.specimenType.name||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">标本件数：</span>{{codeData.specimenNum||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{codeData.takePart||'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{codeData.specimenType?codeData.specimenType.name:'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">标本件数：</span>{{codeData.specimenNum?codeData.specimenNum:'无'}}</div>
 				</div>
 				<div class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">采取部位：</span>{{codeData.takePart||'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">取标本位置：</span>{{codeData.surgeryDeptDTO?codeData.surgeryDeptDTO.dept:''}}</div>
-					<div class="form-title"><span class="font-weight-500">取材医生：</span>{{codeData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+					<div class="form-title"><span class="font-weight-500">取材医生：</span>{{codeData.surgeryDoctorDTO?codeData.surgeryDoctorDTO.name : '-'}}</div>
 				</div>
 	<!-- 			<div class="form-list">
 					<div class="form-title font-weight-500">标本：</div>
@@ -511,6 +520,7 @@
 					<div class="width-120">标本条码：</div>
 					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
 				</div>
+				<div class="error-fix">{{fixationError}}</div>
 				<div class="list-template">
 				  <div class="list-template__content">
 						<div class="list-template__bottom" style="padding: 0 !important;">
@@ -530,8 +540,8 @@
 										<td>
 											{{data.partSource?data.partSource.name:''}} <span *ngIf="data.system">-</span>
 											{{data.system?data.system.name:''}} <span *ngIf="data.organ">-</span>
-											{{data.organ?data.organ.name:''}} <span *ngIf="data.sample">-</span>
-											{{data.sample?data.sample.name:''}}
+											{{data.organ?data.organ.name:''}} <span>-</span>
+											{{data.sample?data.sample.name:data.specimenName}}
 										</td>
 									</tr>
 								</tbody>
@@ -610,17 +620,21 @@
 		<div class="content">
 			<div class="content-item boder-right">
 				<div class="form-title-box">
-					<div class="form-title width-150"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
-					<div class="form-title width-200"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
+					<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.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 width-150"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
-					<div class="form-title width-200"><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.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">
@@ -642,13 +656,13 @@
 				</div>
 
 				<div class="form-title-box">
-					<div class="form-title width-150"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
-					<div class="form-title width-200"><span class="font-weight-500">标本件数：</span>{{detailsData.specimenNum||'无'}}</div>
+					<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 class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</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>
@@ -659,8 +673,8 @@
 						<div *ngFor="let item of specimenList" class="specimen-item-class">
 							{{item.partSource?item.partSource.name:''}} <span *ngIf="item.system">-</span>
 							{{item.system?item.system.name:''}} <span *ngIf="item.organ">-</span>
-							{{item.organ?item.organ.name:''}} <span *ngIf="item.sample">-</span>
-							{{item.sample?item.sample.name:''}}
+							{{item.organ?item.organ.name:''}} <span>-</span>
+							{{item.sample?item.sample.name:item.specimenName}}
 						</div>
 					</div>
 				</div>
@@ -690,8 +704,8 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">确定</button>
-			<button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="closeDetailMoadl()">知道了</button>
+			<!-- <button class="btn cancel" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button> -->
 		</div>
 	</div>
 </div>

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

@@ -24,6 +24,29 @@
   em {
     font-style: normal;
   }
+	
+	
+	/* 修改垂直滚动条 */
+	::-webkit-scrollbar {
+		width: 4px; /* 修改宽度 */
+		border-radius: 2px;
+	}
+	 
+	/* 修改滚动条轨道背景色 */
+	::-webkit-scrollbar-track {
+		background-color: #f1f1f1;
+	}
+	 
+	/* 修改滚动条滑块颜色 */
+	::-webkit-scrollbar-thumb {
+		background-color: #888;
+	}
+	 
+	/* 修改滚动条滑块悬停时的颜色 */
+	::-webkit-scrollbar-thumb:hover {
+		background-color: #555;
+	}
+	
   .pharmacy {
     display: flex;
     flex-direction: column;
@@ -86,6 +109,9 @@
 					font-size: 22px;
 				}
       }
+			.error-class{
+				color: red;
+			}
     }
 
     .pharmacy-operate {
@@ -555,10 +581,10 @@
 			}
 	    .content {
 	      width: 100%;
-	      height: auto;
+	      // height: auto;
 	      padding: 19px 14px 0 14px;
-	      max-height: 500px;
-	      overflow-y: auto;
+	      // max-height: 500px;
+	      // overflow-y: auto;
 				.ant-select{
 					width: 100%;
 				}
@@ -641,7 +667,6 @@
 			background: #f9fafb;
 			border: 1px solid #e5e9ed;
 			border-radius: 5px;
-			overflow: hidden;
 			margin-top: 12px;
 			display: flex;
 			// .addForm{
@@ -657,7 +682,7 @@
 					height: auto;
 					max-height: 460px;
 					overflow-y: auto;
-					width: 75%;
+					width: 78%;
 					padding: 15px;
 					.form-title-box{
 						display: flex;
@@ -687,6 +712,11 @@
 							width: 300px;
 						}
 					}
+					.error-fix{
+						margin-top: 10px;
+						color: red;
+						text-align: center;
+					}
 					.form-list{
 						margin-bottom: 10px;
 						.specimen-list{

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

@@ -121,7 +121,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	isSpinning:boolean = false; //全屏加载状态
 	codeData:any; //标本条码数据
 	btnInfoLoading :boolean = false; //标本加固加载
+	searchMsg:any = null;
 	changeInpSubject = new Subject(); //防抖
+	changeInpSubjectSpecimen = new Subject(); //防抖
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
@@ -129,14 +131,16 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
 		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-		  this.tableLoading = true
 		  this.searchSpecimenData(v[0])
 		});
+		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).subscribe((v) => {
+		  this.searchSpecimen(v[0])
+		});
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
     this.runTime();
     // 统计
-    this.total();
+    // this.total();
 		this.getDept()
     // 切换科室
     // this.changeKs();
@@ -145,6 +149,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
     // 自动刷新倒计时 start
     this.autoUpdate();
     // 自动刷新倒计时 end
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
   }
   // 当前时间日期
   runTime() {
@@ -156,13 +163,15 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
   }
 	
 	// 标本条码搜索
-	searchSpecimen(){
+	searchSpecimen(e){
 		if(!this.barCode){
-			this.message.error('请输入标本条码')
+			return
+		}
+		if(this.barCode.length < 10) {
 			return
 		}
 		let data={
-			barcode:this.barCode
+			barcode:e
 		}
 		this.isSpinning = true
 		clearInterval(this.logTimer);
@@ -171,16 +180,31 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.isSpinning = false
 			if(res.status==200){
 				this.codeData = res.data[0]
+				if(this.codeData.pathologyInspectDTOS){
+					this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+						return i.inspectProject.name
+					})
+					this.project = this.project.join('、')
+				}
+				this.fixationError = null
 				this.fixationModal = true
 				setTimeout(_=>{
 					document.getElementById('specimen').focus();
 				},200)
+				this.searchMsg = null
 			}else{
-				this.message.error(res.msg)
+				this.barCode = null
+				this.searchMsg = res.msg
+				// this.message.error(res.msg)
 			}
 		})
 	}
 	
+	// 选择固定时间
+	formChangeDate(result){
+	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	}
+	
 	// 确定接受固定标本
 	startDate:any;
 	submitFixationForm(){
@@ -206,10 +230,15 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.autoUpdate()
 		this.barCode = null;
 		this.specimenCode = null;
+		this.fixationError = null
 		this.fixationModal = false;
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
 	}
 	
 	// 获取标本详情
+	project:any = [];
 	getSampleData(item){
 		this.mainService.getFetchData("data", "pathologyForm", item.id)
 		.subscribe((data) => {
@@ -218,6 +247,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.specimenList = data.data.pathologySpecimenDTOList||[]
 			this.pathologyLogs = data.data.formLogDTOS
 			this.stepLength = this.pathologyLogs.length
+			if(this.detailsData.pathologyInspectDTOS){
+				this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+					return i.inspectProject.name
+				})
+				this.project = this.project.join('、')
+			}
 		  this.detailMoadl = true
 		});
 	}
@@ -313,6 +348,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.mainService
 		  .coopData("updData", "user", data)
 		  .subscribe((data) => {
+				this.getNewDept()
 				// 手术间列表
 				this.getPharmacyList(this.printPharmacyIdx, 'surgeryDept', this.printPharmacySearchKey);
 				// 标本间列表
@@ -329,6 +365,45 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  });
 	}
 	
+	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));
+	    }
+	  });
+	}
+	
 	// 输入工号查询姓名
 	handoverUserId:any = null;
 	numberChange(e){
@@ -336,25 +411,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.validateVerificationForm.controls.name.setValue('');
 			return
 		}
-		let data = {
-			idx: 0,
-			sum: 9999,
-			user: {
-				account: e || "",
-				hospital: { id: this.hosId || "" }
-			},
+		let query = {
+		  account: e
 		};
 		this.mainService
-			.getFetchDataList("data", "user", data)
-			.subscribe((data) => {
-				if(data.list.length>0){
-					this.validateVerificationForm.controls.name.setValue(data.list[0].name);
-					this.handoverUserId = data.list[0].id
+		  .jobSearch(query)
+		  .subscribe((data:any) => {
+				if(data.status==200){
+					this.validateVerificationForm.controls.name.setValue(data.userName);
+					this.handoverUserId = data.userId
 				}else{
 					this.validateVerificationForm.controls.name.setValue('');
 					this.handoverUserId =null
+					// this.message.error(data.data)
 				}
-			});
+		  });
 	}
 	
 	// 提交固定标本接收
@@ -371,7 +442,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			specimenFixingLiquid:{
 				id:this.validateVerificationForm.value.fixative
 			},
-			fixationTime:this.validateVerificationForm.value.fixationTime,
+			fixationTime:this.startDate,
 			hosId: this.hosId || "" ,
 			handoverUserId:this.handoverUserId
 		};
@@ -399,11 +470,23 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	closeModel(){
 		this.verificationMoadl = false
 		this.fixationModal = false
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
 	}
 	
 	// 关闭固定接受标本
 	hideVerificationModal(){
 		this.verificationMoadl = false
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
+	}
+	
+
+	// 监听标本条码
+	specimenCodeChange(e){
+		this.changeInpSubjectSpecimen.next([e]);
 	}
 	
 	// 监听接受固定标本条码
@@ -412,7 +495,15 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.changeInpSubject.next([e]);
 	}
 	
+	fixationError:any;
 	searchSpecimenData(e){
+		if(!e){
+			return
+		}
+		if(e.length < 10) {
+			return
+		}
+		this.tableLoading = true
 		this.mainService.pathologyScanCode({
 			barcode:e,
 			pathologyFormId:this.codeData.id
@@ -423,8 +514,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.specimenCode = null
 			if(res.status==200){
 				this.codeData = res.data[0]
+				this.fixationError = null 
 			}else{
-				this.message.error(res.msg)
+				this.fixationError = res.msg 
 			}
 		})
 	}
@@ -448,75 +540,78 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	}
 	
 	closeDetailMoadl(){
+		setTimeout(_=>{
+			document.getElementById('Binput').focus();
+		},200)
 		this.detailMoadl = false
 		this.autoUpdate(false);
 	}
 	
   // 统计
-  total() {
-    let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
-    let startTime = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
-    let endTime = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
-    let postData = {
-      startTime,
-      endTime,
-      launch,
-    };
+  // total() {
+  //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
+  //   let startTime = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+  //   let endTime = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
+  //   let postData = {
+  //     startTime,
+  //     endTime,
+  //     launch,
+  //   };
 
-    this.mainService.getDrugsBagStateCount(postData).subscribe((res: any) => {
-      if (res.status == 200) {
-        this.todayTotal = res.countMap.todayTotal;
-        this.todayComplete = res.countMap.todayComplete;
-      }
-    });
-  }
-  // 查看工单详情
-  goToOrderDetail(item){
-    console.log(item);
-    this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
-  }
+  //   this.mainService.getDrugsBagStateCount(postData).subscribe((res: any) => {
+  //     if (res.status == 200) {
+  //       this.todayTotal = res.countMap.todayTotal;
+  //       this.todayComplete = res.countMap.todayComplete;
+  //     }
+  //   });
+  // }
+  // // 查看工单详情
+  // goToOrderDetail(item){
+  //   console.log(item);
+  //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
+  // }
 	
-  // 查看流程信息弹窗
-  logPromptModalShow = false; //弹窗开关
-  scode = ""; //查看记录携带
-  showLogs(data) {
-    clearInterval(this.logTimer);
-    this.scode = data.scode;
-    this.logPromptModalShow = true;
-  }
-  // 关闭流程信息弹窗
-  closeModelLog(e) {
-    this.logPromptModalShow = JSON.parse(e).show;
-    this.autoUpdate(false);
-  }
-  // 查看标本列表弹窗
-  spePromptModalShow = false; //弹窗开关
-  checkDeptId = ""; //检查科室id
-  printDate = ""; //采集日期
-  showSpeList(data) {
-    clearInterval(this.logTimer);
-    this.checkDeptId = data.check_dept_id;
-    this.printDate = data.startTime;
-    this.spePromptModalShow = true;
-  }
+  // // 查看流程信息弹窗
+  // logPromptModalShow = false; //弹窗开关
+  // scode = ""; //查看记录携带
+  // showLogs(data) {
+  //   clearInterval(this.logTimer);
+  //   this.scode = data.scode;
+  //   this.logPromptModalShow = true;
+  // }
+  // // 关闭流程信息弹窗
+  // closeModelLog(e) {
+  //   this.logPromptModalShow = JSON.parse(e).show;
+  //   this.autoUpdate(false);
+  // }
+  // // 查看标本列表弹窗
+  // spePromptModalShow = false; //弹窗开关
+  // checkDeptId = ""; //检查科室id
+  // printDate = ""; //采集日期
+  // showSpeList(data) {
+  //   clearInterval(this.logTimer);
+  //   this.checkDeptId = data.check_dept_id;
+  //   this.printDate = data.startTime;
+  //   this.spePromptModalShow = true;
+  // }
   // 关闭标本列表弹窗
-  closeModelSpe(e) {
-    this.spePromptModalShow = JSON.parse(e).show;
-    this.autoUpdate(false);
-  }
-   // 查看工单列表弹窗
-   orderPromptModalShow = false; //弹窗开关
-   workId = ""; //配送人员ID
-   showOrderList(data) {
-     clearInterval(this.logTimer);
-     this.workId = data.workerid;
-     this.orderPromptModalShow = true;
-   }
-   // 关闭工单列表弹窗
-   closeModelOrder(e) {
-     this.orderPromptModalShow = JSON.parse(e).show;
-     this.autoUpdate(false);
-   }
+  // closeModelSpe(e) {
+  //   this.spePromptModalShow = JSON.parse(e).show;
+  //   this.autoUpdate(false);
+  // }
+  //  // 查看工单列表弹窗
+  //  orderPromptModalShow = false; //弹窗开关
+  //  workId = ""; //配送人员ID
+  //  showOrderList(data) {
+  //    clearInterval(this.logTimer);
+  //    this.workId = data.workerid;
+  //    this.orderPromptModalShow = true;
+  //  }
+  //  // 关闭工单列表弹窗
+  //  closeModelOrder(e) {
+  //    this.orderPromptModalShow = JSON.parse(e).show;
+  //    this.autoUpdate(false);
+  //  }
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {
@@ -646,33 +741,33 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
       });
   }
   // 加载更多
-  loadMore(type) {
-    switch (type) {
-      case 'surgeryDept':
-        this.printPharmacyIdx++;
-        this.printPharmacyLoad = true;
-        this.getPharmacyList(
-          this.printPharmacyIdx,
-          type,
-          this.printPharmacySearchKey
-        );
-        break;
-      case 'specimenDept':
-        this.waitPharmacyIdx++;
-        this.waitPharmacyLoad = true;
-        this.getPharmacyList(
-          this.waitPharmacyIdx,
-          type,
-          this.waitPharmacySearchKey
-        );
-        break;
-      case 'leavedDept':
-        this.pharmacyIdx++;
-        this.pharmacyLoad = true;
-        this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
-        break;
-    }
-  }
+  // loadMore(type) {
+  //   switch (type) {
+  //     case 'surgeryDept':
+  //       this.printPharmacyIdx++;
+  //       this.printPharmacyLoad = true;
+  //       this.getPharmacyList(
+  //         this.printPharmacyIdx,
+  //         type,
+  //         this.printPharmacySearchKey
+  //       );
+  //       break;
+  //     case 'specimenDept':
+  //       this.waitPharmacyIdx++;
+  //       this.waitPharmacyLoad = true;
+  //       this.getPharmacyList(
+  //         this.waitPharmacyIdx,
+  //         type,
+  //         this.waitPharmacySearchKey
+  //       );
+  //       break;
+  //     case 'leavedDept':
+  //       this.pharmacyIdx++;
+  //       this.pharmacyLoad = true;
+  //       this.getPharmacyList(this.pharmacyIdx, type, this.pharmacySearchKey);
+  //       break;
+  //   }
+  // }
   // 搜索关键词
   searchKeyHandle(type) {
     switch (type) {