病理优化

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.html

@@ -2,30 +2,44 @@
   <div class="contentInner">
 		<div class="hos-title">{{currentHospital.hosName}}</div>
     <div class="addressAssign">
-      <overlay-scrollbars #osComponentRef2 class="contentBody2">
+      <div class="contentBody2">
         <div class="contentBody">
           <div class="classList" *ngFor="let item of hospitalList">
-            <span>{{ item.desc }}：</span>
-            <nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)" *ngIf="item.type==null">
-              <label nz-radio nzValue="1">是</label>
-              <label nz-radio nzValue="0">否</label>
-            </nz-radio-group>
+						<div class="mar-10" *ngIf="item.key!='itsmWorkHourQuoteDept' && item.key!='itsmConsumableQuoteDept' && !item.show">
+							<span>{{ item.desc }}：</span>
+							<nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)">
+							  <label nz-radio nzValue="1">是</label>
+							  <label nz-radio nzValue="0">否</label>
+							</nz-radio-group>
+						</div>
+            
+						<div class="mar-10" *ngIf="item.key=='itsmWorkHourQuoteDept' && itsmQuoteOtherDeptWorkHourType">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of maintainDept">
+							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						
+						<div class="mar-10" *ngIf="item.key=='itsmConsumableQuoteDept' && itsmQuoteOtherDeptConsumableType">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of maintainDept">
+							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
 						
-						<!-- <nz-select class="w320px" *ngIf="item.type" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
-						  (nzOnSearch)="changeSelect($event)" [nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
-						  <ng-container *ngFor="let option of item.data">
-						    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [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>
-      </overlay-scrollbars>
-      <div class="contentBtns">
-        <button nz-button nzType="primary" (click)="submitMessageForm()">确定</button>
+				<div class="contentBtns">
+				  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+				</div>
       </div>
+      
     </div>
   </div>
 </div>

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.less

@@ -5,6 +5,12 @@
   flex-direction: column;
   justify-content: space-between;
   background-color: #F0F2F5;
+	.w220px{
+		width: 220px;
+	}
+	.w100px{
+			width: 100px !important;
+		}
   .list-template__nzTable,
   .list-template__bottom{
     padding: 0!important;
@@ -23,11 +29,11 @@
     justify-content: space-between;
     border: 1px solid #EEF3F9;
     &.priority{
-      margin: 24px 275px 0;
+      margin: 24px 275px;
       background-color: #fff;
       .contentInner{
-        padding: 90px 158px 72px;
-        border: 1px solid #E8EBEF;
+        // padding: 90px 158px 72px;
+        // border: 1px solid #E8EBEF;
 				.hos-title{
 					font-weight: 600;
 					font-size: 16px;
@@ -40,15 +46,19 @@
           flex: 1;
           display: flex;
           flex-direction: column;
-          align-items: center;
+          // align-items: center;
           padding: 0 16px;
-          gap: 32px;
+          // gap: 32px;
         }
         .hospital{
           width: 100%;
           text-align: left;
         }
         .classList{
+					// padding: 5px 0;
+					.mar-10{
+						margin: 8px 0;
+					}
           .select{
             width: 313px;
           }
@@ -118,7 +128,7 @@
       .addressAssign{
         flex: 3;
         height: 100%;
-        background: #FFFFFF;
+        // background: #FFFFFF;
         border: 1px solid #E8EBEF;
         display: flex;
         flex-direction: column;
@@ -142,10 +152,8 @@
       }
     }
     .contentBtns{
-      margin-bottom: 16px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      margin-top: 20px;
+      text-align: center;
     }
   }
 }

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.ts

@@ -19,34 +19,45 @@ export class ConfigurationHospitalComponent implements OnInit {
 
   coopData: any = {}; //当前操作列
   currentHospital; //当前院区
-
+	maintainDept:any=[];
+	
   ngOnInit() {
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
     this.currentHospital = this.tool.getCurrentHospital();
     this.getList();
   }
 	
+	itsmQuoteOtherDeptWorkHourType:any;
+	itsmQuoteOtherDeptConsumableType:any;
 	radioChange(data){
 		console.log(123,data)
-		return
-		let index = this.hospitalList.findIndex(i=>i.id == data.id)
+		if(data.key=='itsmParentConsumable' && data.value==1){
+			let item = this.hospitalList.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+			item.show = true
+			item.value = '0'
+			this.itsmQuoteOtherDeptConsumableType = false
+			let item2 = this.hospitalList.find(i=>i.key == 'itsmConsumableQuoteDept')
+			item2.value = null
+			
+		}else if(data.key=='itsmParentConsumable' && data.value==0){
+			let item = this.hospitalList.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+			item.show = false
+		}
+		
 		if(data.key=='itsmQuoteOtherDeptWorkHour' && data.value==1){
-			let item = {
-				desc:'引用科室',
-				key:'hour',
-				type:'select',
-				data:[],
-				value:''
-			}
-			this.hospitalList.splice(index, 0, item)
-		}else if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==1){
-			let item = {
-				desc:'引用科室',
-				key:'consumable',
-				type:'select',
-				data:[],
-				value:''
-			}
-			this.hospitalList.splice(index, 0, item)
+			this.itsmQuoteOtherDeptWorkHourType = true
+		}else if(data.key=='itsmQuoteOtherDeptWorkHour' && data.value==0){
+			this.itsmQuoteOtherDeptWorkHourType = false
+			let item = this.hospitalList.find(i=>i.key == 'itsmWorkHourQuoteDept')
+			item.value = null
+		}
+		
+		if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==1){
+			this.itsmQuoteOtherDeptConsumableType = true
+		}else if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==0){
+			this.itsmQuoteOtherDeptConsumableType = false
+			let item = this.hospitalList.find(i=>i.key == 'itsmConsumableQuoteDept')
+			item.value = null
 		}
 	}
 	
@@ -89,7 +100,41 @@ export class ConfigurationHospitalComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.hospitalList = data.list || [];
+					data.list.forEach(i =>{
+					  i.show = false
+					})
+					let newData = data.list
+					for(let i of newData){
+						if(i.key=='itsmParentConsumable' && i.value==1){
+							let item = newData.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+							item.show = true
+							item.value = '0'
+							this.itsmQuoteOtherDeptConsumableType = false
+							let item2 = newData.find(i=>i.key == 'itsmConsumableQuoteDept')
+							item2.value = null
+						}else if(i.key=='itsmParentConsumable' && i.value==0){
+							let item = newData.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+							item.show = false
+						}
+						
+						if(i.key=='itsmQuoteOtherDeptWorkHour' && i.value==1){
+							this.itsmQuoteOtherDeptWorkHourType = true
+							let item = newData.find(i=>i.key == 'itsmWorkHourQuoteDept')
+							item.value = Number(item.value)
+						}else if(i.key=='itsmQuoteOtherDeptWorkHour' && i.value==0){
+							this.itsmQuoteOtherDeptWorkHourType = false
+						}
+						
+						if(i.key=='itsmQuoteOtherDeptConsumable' && i.value==1){
+							this.itsmQuoteOtherDeptConsumableType = true
+							let item = newData.find(i=>i.key == 'itsmConsumableQuoteDept')
+							item.value = Number(item.value)
+						}else if(i.key=='itsmQuoteOtherDeptConsumable' && i.value==0){
+							this.itsmQuoteOtherDeptConsumableType = false
+						}
+					}
+
+          this.hospitalList = newData || [];
         }else{
           this.message.error(data.msg || "请求数据失败");
         }

src/app/services/main.service.ts

@@ -925,8 +925,8 @@ export class MainService {
 	 }
 	
 	//病理申请单追加打印/全量打印
-	 pathologyCheckPrint(type,businessId) {
-	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, {}, {
+	 pathologyCheckPrint(type,businessId,data) {
+	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, data, {
 	     headers: this.headers,
 	   });
 	 }

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

@@ -54,7 +54,7 @@
 					<nz-form-item class="form-item" *ngIf="detailsData.pathologyFormType==null">
 						<nz-form-label nzRequired nzFor="pathologyFormType" [nzSm]="6" [nzXs]="24">申请单类型</nz-form-label>
 						<nz-form-control nzErrorTip="请选择申请单类型!" [nzSm]="18" [nzXs]="24">
-							<nz-radio-group formControlName="pathologyFormType">
+							<nz-radio-group formControlName="pathologyFormType" (ngModelChange)="radioChange($event)">
 								<label nz-radio [nzValue]="1">术中快速病理检查申请单</label>
 								<label nz-radio [nzValue]="0">病理检查申请单</label>
 							</nz-radio-group>
@@ -244,6 +244,7 @@
 		<div class="title">未打印<i class="icon_transport transport-guanbi" (click)="hideNotModal()"></i>
 		</div>
 		<div class="content">
+			<div class="content-title">本次需要记录离体标本<span class="reds">{{specimenNum}}</span>份，本申请单共<span class="reds">{{totalNum}}</span>份标本</div>
 			<form nz-form [formGroup]="validatePrintForm" class="addForm" (ngSubmit)="submitPrintForm()">
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="inVitroTime">标本离体时间</nz-form-label>

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

@@ -228,6 +228,14 @@
 	      padding: 19px 14px 0 14px;
 	      max-height: 500px;
 	      overflow-y: auto;
+				.content-title{
+					text-align: center;
+					margin-bottom: 10px;
+					font-weight: 600;
+					.reds{
+						color: red;
+					}
+				}
 				.ant-form-item {
 				  margin-bottom: 14px;
 					display: flex;

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

@@ -69,6 +69,20 @@ export class PathologyAddComponent implements OnInit {
 		this.fetchDataList()
   }
 	
+	radioChange(data){
+		let arr = [];
+		let item = null
+		if(!this.validateForm.value.project){
+			if(data==1){
+				item = this.projectData.find(i=>i.value=='2241') //冰冻切片检查
+			}else{
+				item = this.projectData.find(i=>i.value=='1810') //病理小标本
+			}
+			arr.push(item.id)
+			this.validateForm.controls.project.setValue(arr);
+		}
+	}
+	
 	// 初始化新增form表单
 	initForm() {
 		this.validateForm = this.fb.group({
@@ -123,6 +137,9 @@ export class PathologyAddComponent implements OnInit {
 			this.specimenData = res.filter(i=>i.extra1 == 'pathologySpecimen')
 			if(this.detailsData.specimenType){
 				this.validateForm.controls.specimenGenre.setValue(this.detailsData.specimenType.id);
+			}else{
+				let item = this.specimenData.find(i=>i.value==10)
+				this.validateForm.controls.specimenGenre.setValue(item.id);
 			}
 			if(this.detailsData.specimenNum){
 				this.validateForm.controls.specimenNum.setValue(this.detailsData.specimenNum);
@@ -766,6 +783,8 @@ export class PathologyAddComponent implements OnInit {
 	zjLoading:any = false;
 	operation:any;
 	pathologySpecimenIds:any;
+	totalNum:any;
+	specimenNum:any;
 	superaddition(): void{
 		var that = this;
 		this.operation = 'addPrint'
@@ -778,9 +797,12 @@ export class PathologyAddComponent implements OnInit {
 			this.message.error('标本不能为空')
 			return
 		}
-		that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+		that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+			this.separationMsg = res.msg
 			if(res.ids){
 				this.notModal = true
+				this.totalNum = res.totalNum
+				this.specimenNum = res.specimenNum
 				this.pathologySpecimenIds = res.ids
 				this.validatePrintForm = this.fb.group({
 				  inVitroTime: [null, [Validators.required]],
@@ -798,6 +820,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 打印标本/全量
 	printData:any;
+	separationMsg:any = '本次需要记录离体标本6份，本申请单共6份标本';
 	submitForm(type): void{
 		var that = this;
 		this.operation = 'wholePrint'
@@ -811,9 +834,12 @@ export class PathologyAddComponent implements OnInit {
 			return
 		}
 		if(type=='all'){
-			that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+			that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+				this.separationMsg = res.msg
 				if(res.ids){
 					this.notModal = true
+					this.totalNum = res.totalNum
+					this.specimenNum = res.specimenNum
 					this.pathologySpecimenIds = res.ids
 					this.validatePrintForm = this.fb.group({
 					  inVitroTime: [null, [Validators.required]],
@@ -858,16 +884,21 @@ export class PathologyAddComponent implements OnInit {
 		}else{
 			this.operation = 'null'
 			if(this.statusValue==1){
-				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
+				this.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+					this.separationMsg = res.msg
+					this.notModal = true
+					this.totalNum = res.totalNum
+					this.specimenNum = res.specimenNum
+					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:{

src/app/views/incident-management/incident-management.component.html

@@ -8,7 +8,7 @@
 				<div class="list-template__searchItem" *ngIf="coopBtns.strideLook && queryTask!='todo' && queryTask!='doing' && queryTask!='storage'">
 				  <span class="label">维修科室</span>：
 				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
-				     nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="searchDTO.maintainDepartment">
+				     (ngModelChange)="deptChange($event)" nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="searchDTO.maintainDepartment">
 				    <ng-container *ngFor="let option of maintainDept">
 				      <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
 				    </ng-container>

src/app/views/incident-management/incident-management.component.ts

@@ -75,6 +75,17 @@ export class IncidentManagementComponent implements OnInit {
 		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
 		if(itemDept){
 			this.searchDTO.maintainDepartment = itemDept.id
+			if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
+				let arr = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == itemDept.id)
+				if(arr){
+					this.maintainGroup = arr
+				}else{
+					this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+				}
+			}else{
+				this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+			}
+			
 		}
     this.loading1 = true;
     this.debounceSubject.next(true);
@@ -82,11 +93,9 @@ export class IncidentManagementComponent implements OnInit {
 
   ngOnInit() {
 		this.maintainDept = this.tool.getUserInfoPermission().dutyList
-		this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
 		this.hosIds = this.tool.getCurrentHospital().id
-		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
-		if(itemDept){
-			this.searchDTO.maintainDepartment = itemDept.id
+		if(this.coopBtns.strideLook){
+			this.defaDept()
 		}
     this.initSearchForm();
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -125,7 +134,25 @@ export class IncidentManagementComponent implements OnInit {
     //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0, isRed: false});
     // }
   }
-
+	
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
+		if(itemDept){
+			this.searchDTO.maintainDepartment = itemDept.id
+		}
+	}
+	
+	// 选择维修科室
+	deptChange(e){
+		this.searchDTO.maintainGroup = null
+		let arr  = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == e)
+		if(arr){
+			this.maintainGroup = arr
+		}else{
+			this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+		}
+	}
+	
   // 搜索
   search() {
     this.loading1 = true;
@@ -134,6 +161,9 @@ export class IncidentManagementComponent implements OnInit {
   // 重置
   reset() {
     this.searchDTO = {};
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
     this.initSearchForm();
     this.loading1 = true;
     this.debounceSubject.next(true);
@@ -394,7 +424,15 @@ export class IncidentManagementComponent implements OnInit {
             delete incident.duty;
             delete incident.hosId;
         }
-
+				
+				if(incident.queryTask!='todo' && incident.queryTask!='doing' && incident.queryTask!='storage'){
+					if(this.searchDTO.maintainDepartment){
+						let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+						incident.duty = itemDept;
+						delete incident.hosId;
+					}
+				}
+				
         incident.assignee = this.tool.getCurrentUserId();
 
         if(incident.queryTask === 'todo' || incident.queryTask === 'owns'){
@@ -402,6 +440,12 @@ export class IncidentManagementComponent implements OnInit {
         }else{
           delete incident.candidateGroups;
         }
+				
+				if(incident.queryTask!='todo' && incident.queryTask!='owns' && incident.queryTask!='storage'){
+					incident.candidateGroupId = this.searchDTO.maintainGroup
+				}else{
+					delete incident.candidateGroupId;
+				}
     })
     this.mainService
       .getCount(postData)

src/app/views/repository-manage/repository-manage.component.ts

@@ -40,16 +40,15 @@ export class RepositoryManageComponent implements OnInit {
 		private sanitizer: DomSanitizer
   ) {}
   ngOnInit() {
-		this.maintainDept = this.tool.getUserInfoPermission().dutyList
-		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
-		if(itemDept){
-			this.maintainDepartment = itemDept.id
-		}
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
 
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
 		this.getList();
   }
 	maintainDept:any = []; //维修科室
@@ -116,7 +115,15 @@ export class RepositoryManageComponent implements OnInit {
     this.coopData = data;
     this.showDelModal1();
   }
-
+	
+	// 默认科室
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
+		if(itemDept){
+			this.maintainDepartment = itemDept.id
+		}
+	}
+	
   showDelModal1() {
     this.editModal = true;
   }
@@ -163,6 +170,9 @@ export class RepositoryManageComponent implements OnInit {
     this.pageIndex = 1;
 		this.solutionNumber = null;
 		this.title = null;
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
     this.getList();
   }
   // 表格数据

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

@@ -511,7 +511,7 @@
 			</div>
 			
 			<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="center">提示：本申请单内共有<span class="red">{{totalNum}}</span>只标本固定，已固定<span class="red">{{fixationNum}}</span>份还需固定<span class="red">{{specimenNum}}</span>份</div>
 				<div class="disp-fl">
 					<div class="width-120">标本条码：</div>
 					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>

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

@@ -191,10 +191,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 								})
 								this.project = this.project.join('、')
 							}
-							this.fixationModal = true
-							setTimeout(_=>{
-								document.getElementById('specimen').focus();
-							},200)
+							this.getFixationNum(this.codeData.id)
 						}else{
 							this.viewDetail(this.codeData,'4')
 						}
@@ -217,7 +214,25 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-
+	
+	// 获取申请单扫标本信息
+	fixationNum:any;
+	specimenNum:any;
+	totalNum:any
+	getFixationNum(id){
+		this.mainService.pathologyCheckPrint('pathologyForm',id,{
+			operationType:'fixation'
+		}).subscribe((res:any)=>{
+			this.fixationModal = true
+			this.fixationNum = res.fixationNum
+			this.specimenNum = res.specimenNum
+			this.totalNum = res.totalNum
+			setTimeout(_=>{
+				document.getElementById('specimen').focus();
+			},200)
+		})
+	}
+	
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
@@ -553,7 +568,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-
+	
 	fixationError:any;
 	searchSpecimenData(e){
 		if(!e){
@@ -573,10 +588,10 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.specimenCode = null
 			if(res.status==200){
 				let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
-				console.log(8,item)
 				if(item.fixationTime){
 					this.fixationError = '该标本已经固定过'
 				}else{
+					this.getFixationNum(res.data[0].id)
 					this.codeData = res.data[0]
 					this.fixationError = null
 				}