mt

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

@@ -113,9 +113,9 @@
 									<nz-form-label class="label">是否支持根据手术新建申请单</nz-form-label>
 									<nz-checkbox-group [(ngModel)]="autoCreate"></nz-checkbox-group>
 								</div>
-								<!--门诊支持离体并固定 -->
+								<!--支持离体并固定 -->
 								<div class="display_flex align-items_center mb8">
-									<nz-form-label class="label">门诊支持离体并固定</nz-form-label>
+									<nz-form-label class="label">支持离体并固定</nz-form-label>
 									<nz-checkbox-group [(ngModel)]="outpatientInVitroFixation"></nz-checkbox-group>
 								</div>
 								<!--申请单条码设置 -->

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

@@ -122,7 +122,7 @@
 					<div class="specimen-list">
 						<div *ngFor="let item of specimenList;let index=index;" class="specimen-item">
 							<div class="specimen-name" (click)="specimenEdit($event,item,index)">
-								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 						</div>
@@ -196,11 +196,22 @@
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
+					<nz-form-label [nzSm]="4" [nzXs]="24">快捷键入</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of fastList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == fastIndex}" (click)="fastClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
 					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
-					<nz-form-control nzErrorTip="请输入标本名称" [nzSm]="21" [nzXs]="24">
+					<div class="specimen-tip" [ngClass]="{'isSpecumen':placeName}">{{placeName?placeName:''}}</div>
+					<nz-form-control nzErrorTip="请输入标本名称" [(nzSm)]="nzSmNum" [nzXs]="24">
 						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
 					</nz-form-control>
-					<div class="empty-box">
+					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':placeName==''}">
 						<span class="name">{{specimenNameLength}}/15</span>
 						<span class="empty" (click)="emptData($event)">清空</span>
 					</div>
@@ -262,6 +273,31 @@
 						</nz-input-group>
 					</nz-form-control>
 				</nz-form-item>
+				<nz-form-item *ngIf="ifImmobilization">
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
+				  <nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
+				    <nz-input-group style="display: flex;gap: 10px">
+							<!-- <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-date-picker formControlName="fixationDate" (ngModelChange)="fixationDateChange($event)"></nz-date-picker>
+							
+							<nz-time-picker formControlName="fixationTimes" nzFormat="HH:mm" (ngModelChange)="fixationTimeChange($event)"></nz-time-picker>
+						</nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
+				<nz-form-item *ngIf="ifImmobilization">
+				  <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>
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="5" nzFor="jobNumber">工号</nz-form-label>
 					<nz-form-control [nzSpan]="19" nzErrorTip="请输入工号!">
@@ -419,7 +455,7 @@
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
@@ -462,7 +498,7 @@
 					 </div>
 					</div>
 					<div style="margin-top:10px;padding-left: 7px;">
-						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 					</div>
 				 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>

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

@@ -225,7 +225,7 @@
 	    .content {
 	      width: 100%;
 	      height: auto;
-	      padding: 19px 14px 0 14px;
+	      padding: 15px 0px 0 0px;
 	      max-height: 500px;
 	      overflow-y: auto;
 				.content-title{
@@ -241,6 +241,14 @@
 					display: flex;
 					// flex-wrap: wrap;
 					position: relative;
+					.specimen-tip{
+						display: flex;
+						align-items: center;
+						font-weight: 600;
+					}
+					.isSpecumen{
+						margin-right: 15px;
+					}
 				  .ant-form-item-label {
 				    text-align: left;
 						font-weight: 500;
@@ -252,8 +260,6 @@
 					}
 					.empty-box{
 						position: absolute;
-						right: 6px;
-						top: 8px;
 						.name{
 							color: #ccc;
 						}
@@ -262,6 +268,14 @@
 							cursor: pointer;
 						}
 					}
+					.beSpecumenEmpty{
+						right: 6px;
+						top: 8px;
+					}
+					.noSpecumenEmpty{
+						right: 6px;
+						top: 8px;
+					}
 				}
 				.specimen-list{
 					flex: 1;

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

@@ -69,6 +69,7 @@ export class PathologyAddComponent implements OnInit {
 		this.initForm()
 		this.getTaskTypesId()
 		this.fetchDataList()
+		this.getStationaryLiquid()
   }
 	
 	// 获取任务类型（病理标本）
@@ -82,6 +83,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 获取标本配置
 	pathologyBarCode:any = 1;
+	ifImmobilization:any = false;
 	outpatientPathologyLabelSizeType:any = 1;
 	getPathologySys(){
 		let postData = {
@@ -101,6 +103,11 @@ export class PathologyAddComponent implements OnInit {
 					if(result.list[0].outpatientPathologyLabelSize){
 						this.outpatientPathologyLabelSizeType = result.list[0].outpatientPathologyLabelSize.value;
 					}
+					if(result.list[0].outpatientInVitroFixation && result.list[0].outpatientInVitroFixation==1){
+						this.ifImmobilization = true
+					}else{
+						this.ifImmobilization = false
+					}
 				}
 		  });
 	}
@@ -171,6 +178,14 @@ export class PathologyAddComponent implements OnInit {
 		  });
 	}
 	
+	// 固定液类型
+	fixativeData:any = [];
+	getStationaryLiquid(){
+		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
+			this.fixativeData = res
+		});
+	}
+	
 	// 获取标本类型
 	getDicData(){
 		this.mainService.getDictionary("list", "specimen_type").subscribe((res) => {
@@ -287,12 +302,14 @@ export class PathologyAddComponent implements OnInit {
 					  remark: [null, []],
 						specimenName: [null, [Validators.required]]
 					});
+					this.fastIndex = null
 					if(item.sample){
 						setTimeout(_=>{
 							let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
 							this.specimenNameIndex = index4
 							this.specimenNameName = item.sample.name
 							this.specimenNameId = Number(item.sample.id);
+							this.specimenNameLength = item.specimenName.length;
 							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 							this.validateSpecimenForm.controls.remark.setValue(item.remark);
 							this.specimenModal = true
@@ -302,6 +319,7 @@ export class PathologyAddComponent implements OnInit {
 							this.specimenNameIndex = null
 							this.specimenNameName = ''
 							this.specimenNameId = null
+							this.specimenNameLength = item.specimenName.length;
 							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 							this.validateSpecimenForm.controls.remark.setValue(item.remark);
 							this.specimenModal = true
@@ -328,6 +346,7 @@ export class PathologyAddComponent implements OnInit {
 								this.specimenNameIndex = index4
 								this.specimenNameName = item.sample.name
 								this.specimenNameId = Number(item.sample.id);
+								this.specimenNameLength = item.specimenName.length;
 								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 								this.validateSpecimenForm.controls.remark.setValue(item.remark);
 								this.specimenModal = true
@@ -337,6 +356,7 @@ export class PathologyAddComponent implements OnInit {
 								this.specimenNameIndex = null
 								this.specimenNameName = ''
 								this.specimenNameId = null
+								this.specimenNameLength = item.specimenName.length;
 								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 								this.validateSpecimenForm.controls.remark.setValue(item.remark);
 								this.specimenModal = true
@@ -383,11 +403,14 @@ export class PathologyAddComponent implements OnInit {
 	specimenDetailId:any = null;
 	specimenEdit(e,item,index){
 		this.specimenDetailId = item.id
+		this.fastIndex = null
 		if(item.system && item.organ){
 			this.selectType = false
 			let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
 			this.placeIndex = index1
 			this.placeId = Number(item.partSource.id)
+			this.placeName = item.partSource.value==1?'':item.partSource.name
+			this.nzSmNum = item.partSource.value==1 ? 21 : 20
 			let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
 			this.systemIndex = index2
 			this.systemId = Number(item.system.id)
@@ -409,6 +432,7 @@ export class PathologyAddComponent implements OnInit {
 		  remark: [null, []],
 			specimenName:[null, [Validators.required]],
 		});
+		this.fastIndex = null
 		this.specimenDetailId = null;
 		this.placeIndex = null;
 		this.systemIndex = null;
@@ -439,8 +463,12 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 选择位置来源
 	placeId:any = null;
+	placeName:any = null;
+	nzSmNum:any = 21;
 	placeClick(e,item,index){
 		this.placeId = item.id
+		this.placeName = item.value==1?'':item.name
+		this.nzSmNum = item.value==1 ? 21 : 20
 		this.placeIndex = index
 	}
 	
@@ -457,6 +485,7 @@ export class PathologyAddComponent implements OnInit {
 		this.specimenNameId = null;
 		this.specimenNameIndex = null;
 		this.specimenNameName = null;
+		this.fastIndex = null;
 		if(this.validateSpecimenForm.value.specimenName){
 			this.validateSpecimenForm.controls.specimenName.setValue('')
 		}
@@ -472,6 +501,7 @@ export class PathologyAddComponent implements OnInit {
 		this.specimenNameId = null;
 		this.specimenNameIndex = null;
 		this.specimenNameName = null;
+		this.fastIndex = null;
 		if(this.validateSpecimenForm.value.specimenName){
 			this.validateSpecimenForm.controls.specimenName.setValue('')
 		}
@@ -502,6 +532,31 @@ export class PathologyAddComponent implements OnInit {
 			this.validateSpecimenForm.controls.specimenName.setValue(namn);
 	}
 	
+	// 选择标本名称
+	fastList:any = [
+		{name:'活检'},
+		{name:'切除'},
+		{name:'穿刺'}
+	];
+	fastIndex:any = null;
+	fastClick(e,item,index){
+		this.fastIndex = index
+			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
+					this.message.error('字符长度不能超过15个')
+					return
+				}
+			}
+			
+			let namn = null
+			if(this.validateSpecimenForm.value.specimenName){
+				namn = this.validateSpecimenForm.value.specimenName + item.name
+			}else{
+				namn = item.name
+			}
+			this.validateSpecimenForm.controls.specimenName.setValue(namn);
+	}
+	
 	// 保存标本
 	btnSpLoading:boolean = false;
 	addSpLoading:boolean = false;
@@ -704,6 +759,19 @@ export class PathologyAddComponent implements OnInit {
 		this.notModal = false
 	}
 	
+	// 选择固定时间
+	fixationTime:any;
+	fixationData:any;
+	fixationDateChange(result){
+		this.fixationData = format(result, 'yyyy-MM-dd');
+		console.log(this.fixationData)
+	}
+	fixationTimeSelect:any;
+	fixationTimeChange(result){
+		this.fixationTimeSelect = format(result, 'HH:mm');
+		console.log(this.fixationData + ' ' + this.fixationTimeSelect)
+	}
+	
 	// 选择离体时间
 	inVitroTime:any;
 	inVitroData:any;
@@ -732,6 +800,10 @@ export class PathologyAddComponent implements OnInit {
 				...this.detailsData,
 				...this.validateForm.value,
 				inVitroTime:this.inVitroData + ' ' + this.inVitroTimeSelect+':00',
+				fixationTime:this.fixationData + ' ' + this.fixationTimeSelect+':00',
+				specimenFixingLiquid:{
+					id:this.validatePrintForm.value.fixative
+				},
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
 				hosId: this.hosId || "" ,
@@ -756,6 +828,13 @@ export class PathologyAddComponent implements OnInit {
 			delete data.operation
 			delete data.pathologySpecimenIds
 		}
+		if(this.ifImmobilization){
+			data.pathologyForm.fixationTime = this.fixationData + ' ' + this.fixationTimeSelect +':00'
+			data.pathologyForm.specimenFixingLiquid.id = this.validatePrintForm.value.fixative
+		}else{
+			delete data.pathologyForm.fixationTime
+			delete data.pathologyForm.specimenFixingLiquid
+		}
 		this.printLoading = true;
 		this.mainService
 		  .pathologyPrint(data)
@@ -886,14 +965,35 @@ export class PathologyAddComponent implements OnInit {
 				this.totalNum = res.totalNum
 				this.specimenNum = res.specimenNum
 				this.pathologySpecimenIds = res.ids
-				this.validatePrintForm = this.fb.group({
-				  inVitroTimes: [null, [Validators.required]],
-				  inVitroDate: [null, [Validators.required]],
-					jobNumber: [null, [Validators.required]],
-					name:[null, [Validators.required]],
-				});
+				
 				let date = new Date();
+				
 				let inVitroDate = format(date, "yyyy-MM-dd")
+				if(this.ifImmobilization){
+					this.validatePrintForm = this.fb.group({
+						inVitroTimes: [null, [Validators.required]],
+						inVitroDate: [null, [Validators.required]],
+						fixationTimes: [null, [Validators.required]],
+						fixationDate: [null, [Validators.required]],
+						fixative:[null, [Validators.required]],
+						jobNumber: [null, [Validators.required]],
+						name:[null, [Validators.required]],
+						
+					});
+					let item = this.fixativeData.find(i=>i.value==1)
+					this.validatePrintForm.controls.fixative.setValue(item.id);
+					this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
+					// this.validatePrintForm.controls.fixationTimes.setValue(date);
+					this.fixationData = inVitroDate;
+					this.fixationTimeSelect = format(date, 'HH:mm');
+				}else{
+					this.validatePrintForm = this.fb.group({
+						inVitroTimes: [null, [Validators.required]],
+						inVitroDate: [null, [Validators.required]],
+						jobNumber: [null, [Validators.required]],
+						name:[null, [Validators.required]],
+					});
+				}
 				this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
 				this.validatePrintForm.controls.inVitroTimes.setValue(date);
 				this.inVitroData = inVitroDate;
@@ -927,14 +1027,33 @@ export class PathologyAddComponent implements OnInit {
 					this.totalNum = res.totalNum
 					this.specimenNum = res.specimenNum
 					this.pathologySpecimenIds = res.ids
-					this.validatePrintForm = this.fb.group({
-					  inVitroTimes: [null, [Validators.required]],
-					  inVitroDate: [null, [Validators.required]],
-						jobNumber: [null, [Validators.required]],
-						name:[null, [Validators.required]],
-					});
 					let date = new Date();
+					
 					let inVitroDate = format(date, "yyyy-MM-dd")
+					if(this.ifImmobilization){
+						this.validatePrintForm = this.fb.group({
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
+							fixationTimes: [null, [Validators.required]],
+							fixationDate: [null, [Validators.required]],
+							fixative:[null, [Validators.required]],
+							jobNumber: [null, [Validators.required]],
+							name:[null, [Validators.required]],
+						});
+						let item = this.fixativeData.find(i=>i.value==1)
+						this.validatePrintForm.controls.fixative.setValue(item.id);
+						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
+						// this.validatePrintForm.controls.fixationTimes.setValue(date);
+						this.fixationData = inVitroDate;
+						this.fixationTimeSelect = format(date, 'HH:mm');
+					}else{
+						this.validatePrintForm = this.fb.group({
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
+							jobNumber: [null, [Validators.required]],
+							name:[null, [Validators.required]],
+						});
+					}
 					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
 					this.validatePrintForm.controls.inVitroTimes.setValue(date);
 					this.inVitroData = inVitroDate;
@@ -979,14 +1098,33 @@ export class PathologyAddComponent implements OnInit {
 					this.notModal = true
 					this.totalNum = res.totalNum
 					this.specimenNum = res.specimenNum
-					this.validatePrintForm = this.fb.group({
-					  inVitroTimes: [null, [Validators.required]],
-					  inVitroDate: [null, [Validators.required]],
-						jobNumber: [null, [Validators.required]],
-						name:[null, [Validators.required]],
-					});
 					let date = new Date();
+					
 					let inVitroDate = format(date, "yyyy-MM-dd")
+					if(this.ifImmobilization){
+						this.validatePrintForm = this.fb.group({
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
+							fixationTimes: [null, [Validators.required]],
+							fixationDate: [null, [Validators.required]],
+							fixative:[null, [Validators.required]],
+							jobNumber: [null, [Validators.required]],
+							name:[null, [Validators.required]],
+						});
+						let item = this.fixativeData.find(i=>i.value==1)
+						this.validatePrintForm.controls.fixative.setValue(item.id);
+						this.validatePrintForm.controls.fixationDate.setValue(inVitroDate);
+						// this.validatePrintForm.controls.fixationTimes.setValue(date);
+						this.fixationData = inVitroDate;
+						this.fixationTimeSelect = format(date, 'HH:mm');
+					}else{
+						this.validatePrintForm = this.fb.group({
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
+							jobNumber: [null, [Validators.required]],
+							name:[null, [Validators.required]],
+						});
+					}
 					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
 					this.validatePrintForm.controls.inVitroTimes.setValue(date);
 					this.inVitroData = inVitroDate;

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

@@ -62,7 +62,7 @@
 						<div class="form-title font-weight-500">标本：</div>
 						<div class="form-title-box">
 							<div class="form-title cursor" *ngFor="let item of specimenList" (click)="specimenView(item)">
-								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 							</div>
 						</div>
 					</div>
@@ -243,7 +243,7 @@
 								<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 							</div>
 							<div style="margin-top:10px;">
-								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+								<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 							</div>
 						 </div>
 						 <div style="width: 30%;">
@@ -286,7 +286,7 @@
 					 </div>
 					</div>
 					<div style="margin-top:10px;padding-left: 7px;">
-						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+						<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 					</div>
 				 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 				</div>

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

@@ -223,17 +223,34 @@ export class LoginComponent implements OnInit {
     let successLoginMsg = true; //登录成功提示,true是提示，false不提示
     let fwt = false;
     let ddt = false;
+		let bbj = false;
+		let mzbl = false;
+		let bljjb = false;
+		let blk = false;
     let yfang = false;
     roleMenus.forEach((e) => {
       if (e.link == "pharmacy") {
         yfang = true;
         console.log("药房端");
       } else if (e.link == "nurse") {
+				console.log(44,e.link)
         fwt = true;
         console.log("护士端");
       } else if (e.link == "dispatchingDesk") {
         ddt = true;
         console.log("调度台");
+      } else if (e.link == "specimenRoomView") {
+        bbj = true;
+        console.log("标本间端");
+      } else if (e.link == "pathologySample") {
+        mzbl = true;
+        console.log("门诊病理采样端");
+      } else if (e.link == "pathologyCommunicationBook") {
+        bljjb = true;
+        console.log("病理交接本");
+      } else if (e.link == "pathology") {
+        blk = true;
+        console.log("病理科端");
       }
       canLogin = true;
     });
@@ -271,7 +288,51 @@ export class LoginComponent implements OnInit {
       localStorage.setItem("user", JSON.stringify(data.user));
       this.router.navigateByUrl("/dispatchingDesk");
       return;
-    } else if (yfang) {
+    } else if (bbj) {
+      // 标本间端
+      if (successLoginMsg) {
+        this.msg.success("登录成功！", {
+          nzDuration: 1000,
+        });
+      }
+      successLoginMsg = false;
+      localStorage.setItem("user", JSON.stringify(data.user));
+      this.router.navigateByUrl("/specimenRoomView");
+      return;
+    }else if (mzbl) {
+      // 门诊病理采样端
+      if (successLoginMsg) {
+        this.msg.success("登录成功！", {
+          nzDuration: 1000,
+        });
+      }
+      successLoginMsg = false;
+      localStorage.setItem("user", JSON.stringify(data.user));
+      this.router.navigateByUrl("/pathologySample");
+      return;
+    }else if (bljjb) {
+      // 病理交接本
+      if (successLoginMsg) {
+        this.msg.success("登录成功！", {
+          nzDuration: 1000,
+        });
+      }
+      successLoginMsg = false;
+      localStorage.setItem("user", JSON.stringify(data.user));
+      this.router.navigateByUrl("/pathologyCommunicationBook");
+      return;
+    }else if (blk) {
+      // 病理科端
+      if (successLoginMsg) {
+        this.msg.success("登录成功！", {
+          nzDuration: 1000,
+        });
+      }
+      successLoginMsg = false;
+      localStorage.setItem("user", JSON.stringify(data.user));
+      this.router.navigateByUrl("/pathology");
+      return;
+    }else if (yfang) {
       // 药房端2
       if (successLoginMsg) {
         this.msg.success("登录成功！", {

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

@@ -115,7 +115,7 @@
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
-											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
+											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.specimenName}}
 										</td>
 										<td>
 											<div *ngIf="data.isScan==1">已扫描</div>

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

@@ -369,7 +369,7 @@
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
 						<div *ngFor="let item of specimenList" class="specimen-item-class form-title cursors" (click)="specimenView(item)">
-							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
 				</div>

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

@@ -140,7 +140,7 @@
 								<nz-form-item class="form-item-right">
 									<nz-form-label nzRequired nzFor="specimenNum">标本数量</nz-form-label>
 									<nz-form-control nzErrorTip="请输入标本数量!">
-										<input nz-input formControlName="specimenNum" disabled placeholder="请输入标本数量" nzSize="default" />
+										<input nz-input formControlName="specimenNum" placeholder="请输入标本数量" nzSize="default" />
 									</nz-form-control>
 								</nz-form-item>
 							</div>
@@ -163,7 +163,7 @@
 							<div class="specimen-list">
 								<div *ngFor="let item of specimenList;let index=index;" class="specimen-item">
 									<div class="specimen-name" (click)="specimenEdit($event,item,index)">
-										<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+										<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 									</div>
 									<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 								</div>
@@ -233,7 +233,7 @@
 									<div class="form-title font-weight-500">标本：</div>
 									<div class="form-title-box-detail">
 										<div class="form-title cursors" *ngFor="let item of specimenList" (click)="specimenView(item)">
-											<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+											<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 										</div>
 									</div>
 								</div>
@@ -381,11 +381,22 @@
 				</nz-form-item>
 				
 				<nz-form-item class="form-item">
+					<nz-form-label [nzSm]="4" [nzXs]="24">快捷键入</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of fastList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == fastIndex}" (click)="fastClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
 					<nz-form-label nzRequired nzFor="specimenName" [nzSm]="3" [nzXs]="24">标本名称</nz-form-label>
-					<nz-form-control nzErrorTip="请输入标本名称" [nzSm]="21" [nzXs]="24">
+					<div class="specimen-tip" [ngClass]="{'isSpecumen':placeName}">{{placeName?placeName:''}}</div>
+					<nz-form-control nzErrorTip="请输入标本名称" [(nzSm)]="nzSmNum" [nzXs]="24">
 						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
 					</nz-form-control>
-					<div class="empty-box">
+					<div class="empty-box" [ngClass]="{'beSpecumenEmpty':placeName, 'noSpecumenEmpty':placeName==''}">
 						<span class="name">{{specimenNameLength}}/15</span>
 						<span class="empty" (click)="emptData($event)">清空</span>
 					</div>
@@ -564,7 +575,7 @@
 							<div>日期: {{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
 						</div>
 						<div style="margin-top:10px;">
-							<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+							<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 						</div>
 					 </div>
 					 <div style="width: 30%;">
@@ -607,7 +618,7 @@
 				 </div>
 				</div>
 				<div style="margin-top:10px;padding-left: 7px;">
-					<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.organ}}{{data.specimenName}}</div>
+					<div style="width: 100%;height: 32px;overflow: hidden;">部位: {{data.partSource}}{{data.specimenName}}</div>
 				</div>
 			 <div style="height: 11px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && index+1 < printData.specimenList.length"></div>
 			</div>

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

@@ -885,8 +885,16 @@
 				.ant-form-item {
 				  margin-bottom: 14px;
 					display: flex;
-					flex-wrap: wrap;
+					// flex-wrap: wrap;
 					position: relative;
+					.specimen-tip{
+						display: flex;
+						align-items: center;
+						font-weight: 600;
+					}
+					.isSpecumen{
+						margin-right: 15px;
+					}
 				  .ant-form-item-label {
 				    text-align: left;
 						font-weight: 500;
@@ -898,8 +906,6 @@
 					}
 					.empty-box{
 						position: absolute;
-						right: 6px;
-						top: 8px;
 						.name{
 							color: #ccc;
 						}
@@ -908,6 +914,14 @@
 							cursor: pointer;
 						}
 					}
+					.beSpecumenEmpty{
+						right: 6px;
+						top: 8px;
+					}
+					.noSpecumenEmpty{
+						right: 6px;
+						top: 8px;
+					}
 				}
 				.specimen-list{
 					flex: 1;

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

@@ -92,13 +92,20 @@ export class PathologySampleComponent implements OnInit {
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
-		this.initForm();
 		this.getProDicData()
 		this.getDicData()
 		this.getSourceData()
 		this.getSysData()
 		this.getTaskTypesId();
 		this.getStationaryLiquid();
+		this.validateForm = this.fb.group({
+			specimenGenre: [null, [Validators.required]],
+			intraoperativeFindings: [null, []],
+			project: [null, [Validators.required]],
+			surgicalPlan: [null, []],
+			specimenNum: [{value: null, disabled: true},[Validators.required]],
+			takePart: [null, [Validators.required]]
+		});
 		if(this.route.snapshot.params && this.route.snapshot.params.param){
 			this.barCode = this.route.snapshot.params.param
 			this.searchSpecimen(this.barCode,'search')
@@ -109,15 +116,89 @@ export class PathologySampleComponent implements OnInit {
   }
 	
 	// 初始化新增form表单
-	initForm() {
-		this.validateForm = this.fb.group({
-			specimenGenre: [null, [Validators.required]],
-			intraoperativeFindings: [null, []],
-			project: [null, [Validators.required]],
-			surgicalPlan: [null, []],
-			specimenNum: [null,[Validators.required]],
-			takePart: [null, [Validators.required]]
-		});
+	initForm(data) {
+		this.syncFlag = data.syncFlag;
+		if(data.syncFlag==1){
+			this.validateForm.removeControl('project')
+		}else{
+			this.validateForm.addControl(
+				'project',
+				new FormControl(null, Validators.required)
+			);
+		}
+		setTimeout(_=>{
+			this.detailsData = data
+			this.surgeryId = data.surgeryId;
+			if(this.detailsData.status && this.detailsData.status.value>=5){
+				this.viewType = 'view'
+			}else{
+				this.viewType = 'edit'
+			}
+			this.statusValue = this.detailsData.status.value
+			this.pathologyLogs = data.formLogDTOS
+			this.stepLength = this.pathologyLogs.length
+			
+			if(this.detailsData.medicalRecords){
+				this.medicalRecordsLength = this.detailsData.medicalRecords.length
+			}else{
+				this.medicalRecordsLength = 0
+			}
+			
+			if(this.detailsData.intraoperativeFindings){
+				this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
+			}else{
+				this.validateForm.controls.intraoperativeFindings.setValue('');
+			}
+			
+			if(this.detailsData.surgicalPlan){
+				this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
+			}else{
+				this.validateForm.controls.surgicalPlan.setValue('');
+			}
+			
+			// 检验项目
+			if(this.detailsData.status && this.detailsData.status.value==5){
+				if(this.detailsData.pathologyInspectDTOS&&this.detailsData.pathologyInspectDTOS.length>0){
+					this.project = this.detailsData.pathologyInspectDTOS[0].inspectProject.name
+				}
+			}else{
+				let str = null
+				if(this.detailsData.pathologyInspectDTOS){
+					if(data.syncFlag==1){
+						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.name
+						this.project = str
+					}else{
+						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.id
+						this.validateForm.controls.project.setValue(str);
+					}
+				}else{
+					if(data.syncFlag==1){
+						this.project = ''
+					}else{
+						this.validateForm.controls.project.setValue(str);
+					}
+				}
+			}
+			
+			// 标本类型
+			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);
+			}else{
+				this.validateForm.controls.specimenNum.setValue('');
+			}
+			if(this.detailsData.takePart){
+				this.validateForm.controls.takePart.setValue(this.detailsData.takePart);
+			}else{
+				this.validateForm.controls.takePart.setValue('');
+			}
+			this.getSampleData('load')
+		},0)
 	}
 	
 	// 新增申请单
@@ -335,7 +416,11 @@ export class PathologySampleComponent implements OnInit {
 	}
 	fixationTimeSelect:any;
 	fixationTimeChange(result){
-		this.fixationTimeSelect = format(result, 'HH:mm');
+		if(result){
+			this.fixationTimeSelect = format(result, 'HH:mm');
+		}else{
+			this.fixationTimeSelect = null;
+		}
 		console.log(this.fixationData + ' ' + this.fixationTimeSelect)
 	}
 	
@@ -358,6 +443,10 @@ export class PathologySampleComponent implements OnInit {
 	printLoading:any = false;
 	submitVerificationForm(){
 		let that = this
+		if(!this.fixationTimeSelect && this.fixationTimeSelect == null){
+			this.message.error('请选择固定时间')
+			return
+		}
 		for (const i in this.validatePrintForm.controls) {
 		  this.validatePrintForm.controls[i].markAsDirty();
 		  this.validatePrintForm.controls[i].updateValueAndValidity();
@@ -459,78 +548,8 @@ export class PathologySampleComponent implements OnInit {
 		this.mainService.getFetchData("data", "pathologyForm", id)
 		.subscribe((data) => {
 			this.isSpinning = false;
-			this.detailsData = data.data;
-			this.syncFlag = data.data.syncFlag;
-			this.surgeryId = data.data.surgeryId;
-			if(this.detailsData.status && this.detailsData.status.value==5){
-				this.viewType = 'view'
-			}else{
-				this.viewType = 'edit'
-			}
-			this.statusValue = this.detailsData.status.value
-			this.pathologyLogs = data.data.formLogDTOS
-			this.stepLength = this.pathologyLogs.length
-			
-			if(this.detailsData.medicalRecords){
-				this.medicalRecordsLength = this.detailsData.medicalRecords.length
-			}else{
-				this.medicalRecordsLength = 0
-			}
-
-			if(this.detailsData.intraoperativeFindings){
-				this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
-			}else{
-				this.validateForm.controls.intraoperativeFindings.setValue('');
-			}
-			
-			if(this.detailsData.surgicalPlan){
-				this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
-			}else{
-				this.validateForm.controls.surgicalPlan.setValue('');
-			}
-			
-			// 检验项目
-			if(this.detailsData.status && this.detailsData.status.value==5){
-				if(this.detailsData.pathologyInspectDTOS&&this.detailsData.pathologyInspectDTOS.length>0){
-					this.project = this.detailsData.pathologyInspectDTOS[0].inspectProject.name
-				}
-			}else{
-				let str = null
-				if(this.detailsData.pathologyInspectDTOS){
-					if(this.syncFlag==1){
-						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.name
-						this.project = str
-					}else{
-						str = this.detailsData.pathologyInspectDTOS[0].inspectProject.id
-						this.validateForm.controls.project.setValue(str);
-					}
-				}else{
-					if(this.syncFlag==1){
-						this.project = ''
-					}else{
-						this.validateForm.controls.project.setValue(str);
-					}
-				}
-			}
-
-			// 标本类型
-			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);
-			}else{
-				this.validateForm.controls.specimenNum.setValue('');
-			}
-			if(this.detailsData.takePart){
-				this.validateForm.controls.takePart.setValue(this.detailsData.takePart);
-			}else{
-				this.validateForm.controls.takePart.setValue('');
-			}
-			this.getSampleData('load')
+			this.initForm(data.data);
+			// this.detailsData = data.data;
 		});
 	}
 	
@@ -637,6 +656,7 @@ export class PathologySampleComponent implements OnInit {
 							this.specimenNameIndex = index4
 							this.specimenNameName = item.sample.name
 							this.specimenNameId = Number(item.sample.id);
+							this.specimenNameLength = item.specimenName.length;
 							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 						},100)
 					}
@@ -665,6 +685,7 @@ export class PathologySampleComponent implements OnInit {
 								this.specimenNameIndex = index4
 								this.specimenNameName = item.sample.name
 								this.specimenNameId = Number(item.sample.id);
+								this.specimenNameLength = item.specimenName.length;
 								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 							},100)
 						}
@@ -714,12 +735,15 @@ export class PathologySampleComponent implements OnInit {
 	// 编辑标本
 	specimenDetailId:any = null;
 	specimenEdit(e,item,index){
+		this.fastIndex = null
 		this.specimenDetailId = item.id
 		if(item.system && item.organ){
 			this.selectType = false
 			let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
 			this.placeIndex = index1
 			this.placeId = Number(item.partSource.id)
+			this.placeName = item.partSource.value==1?'':item.partSource.name
+			this.nzSmNum = item.partSource.value==1 ? 21 : 20
 			let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
 			this.systemIndex = index2
 			this.systemId = Number(item.system.id)
@@ -741,6 +765,7 @@ export class PathologySampleComponent implements OnInit {
 		  remark: [null, []],
 			specimenName:[null, [Validators.required]],
 		});
+		this.fastIndex = null;
 		this.specimenDetailId = null;
 		this.placeIndex = null;
 		this.systemIndex = null;
@@ -771,8 +796,12 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 选择位置来源
 	placeId:any = null;
+	placeName:any = null;
+	nzSmNum:any = 21;
 	placeClick(e,item,index){
 		this.placeId = item.id
+		this.placeName = item.value==1?'':item.name
+		this.nzSmNum = item.value==1 ? 21 : 20
 		this.placeIndex = index
 	}
 	
@@ -789,6 +818,7 @@ export class PathologySampleComponent implements OnInit {
 		this.specimenNameId = null;
 		this.specimenNameIndex = null;
 		this.specimenNameName = null;
+		this.fastIndex = null;
 		if(this.validateSpecimenForm.value.specimenName){
 			this.validateSpecimenForm.controls.specimenName.setValue('')
 		}
@@ -804,6 +834,7 @@ export class PathologySampleComponent implements OnInit {
 		this.specimenNameId = null;
 		this.specimenNameIndex = null;
 		this.specimenNameName = null;
+		this.fastIndex = null;
 		if(this.validateSpecimenForm.value.specimenName){
 			this.validateSpecimenForm.controls.specimenName.setValue('')
 		}
@@ -834,6 +865,31 @@ export class PathologySampleComponent implements OnInit {
 			this.validateSpecimenForm.controls.specimenName.setValue(namn);
 	}
 	
+	// 选择标本名称
+	fastList:any = [
+		{name:'活检'},
+		{name:'切除'},
+		{name:'穿刺'}
+	];
+	fastIndex:any = null;
+	fastClick(e,item,index){
+		this.fastIndex = index
+			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
+				if(item.name.length+this.validateSpecimenForm.value.specimenName.length>14){
+					this.message.error('字符长度不能超过15个')
+					return
+				}
+			}
+			
+			let namn = null
+			if(this.validateSpecimenForm.value.specimenName){
+				namn = this.validateSpecimenForm.value.specimenName + item.name
+			}else{
+				namn = item.name
+			}
+			this.validateSpecimenForm.controls.specimenName.setValue(namn);
+	}
+	
 	// 保存标本
 	btnSpLoading:boolean = false;
 	addSpLoading:boolean = false;
@@ -1117,6 +1173,10 @@ export class PathologySampleComponent implements OnInit {
 			that.validateForm.controls[i].updateValueAndValidity();
 		}
 		if (that.validateForm.invalid) return;
+		// if(this.validateForm.controls.takePart.value==''){
+		// 	this.message.error('请输入采取部位')
+		// 	return
+		// }
 		if(this.specimenList.length==0){
 			this.message.error('标本不能为空')
 			return
@@ -1434,7 +1494,15 @@ export class PathologySampleComponent implements OnInit {
 			this.tableLoading = false
 			this.specimenCode = null
 			if(res.status==200){
-				let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				let item = null
+				let str = null
+				if(e.indexOf(':')!=-1){
+					str = e.split(':')
+					item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == str[1])
+				}else{
+					item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				}
+				// let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
 				if(item.fixationTime){
 					this.fixationError = '该标本已经固定过'
 				}else{

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

@@ -371,7 +371,7 @@
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
 						<div *ngFor="let item of specimenList" class="specimen-item-class form-title cursors" (click)="specimenView(item)">
-							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
 				</div>

src/app/views/pathologyScan/pathologyScan.component.html

@@ -53,7 +53,7 @@
 										<td>{{ data.takePart}}</td>
 										<td>
 											<div *ngFor="let item of data.pathologySpecimenDTOList">
-												<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}
+												<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}
 											</div>
 										</td>
 									</tr>
@@ -114,7 +114,7 @@
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
-											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
+											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.specimenName}}
 										</td>
 										<td *ngIf="dataType=='receive'">
 											<div *ngIf="data.isScan==1">已接收</div>

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

@@ -471,7 +471,7 @@
 <!-- 标本接收 -->
 <div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="fixationModal">
 	<div class="pathology-content width-80">
-		<div class="title">标本接收固定
+		<div class="title">标本接收及固定
 		<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i></div>
 		<div class="content">
 			<div class="content-item boder-right">
@@ -525,7 +525,8 @@
 			</div>
 			
 			<div class="content-item">
-				<div class="center">提示：本申请单内共有<span class="red">{{totalNum}}</span>只标本固定，已固定<span class="red">{{fixationNum}}</span>份还需固定<span class="red">{{specimenNum}}</span>份</div>
+				<!-- <div class="center">提示：本申请单内共有<span class="red">{{totalNum}}</span>只标本固定，已固定<span class="red">{{fixationNum}}</span>份还需固定<span class="red">{{specimenNum}}</span>份</div> -->
+				<div class="center">提示：本申请单内共有<span class="red">{{codeData.specimenNum}}</span>只标本</div>
 				<div class="disp-fl">
 					<div class="width-120">标本条码：</div>
 					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>
@@ -548,7 +549,7 @@
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
-											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
+											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.specimenName}}
 										</td>
 									</tr>
 								</tbody>
@@ -573,11 +574,11 @@
 <!-- 标本固定信息 -->
 <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 class="title">{{!ifFixType?'标本固定信息':'标本接受收信息'}}<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-item *ngIf="!ifFixType">
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				<!--  <nz-form-control [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group>
@@ -595,18 +596,18 @@
 					</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,1)" formControlName="jobNumber" placeholder="请输入工号" nzSize="default" />
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">医生工号</nz-form-label>
+					<nz-form-control [nzSpan]="18" nzErrorTip="请输入医生工号!">
+						<input nz-input (ngModelChange)="numberChange($event,1)" 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-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-item>
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="nurseJobNumber">护士工号</nz-form-label>
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士工号!">
 						<input nz-input (ngModelChange)="numberChange($event,2)" formControlName="nurseJobNumber" placeholder="请输入护士工号" nzSize="default" />
@@ -617,8 +618,8 @@
 					<nz-form-control [nzSpan]="18" nzErrorTip="请输入护士姓名!">
 						<input nz-input disabled formControlName="nurseName" placeholder="请输入护士姓名" nzSize="default" />
 					</nz-form-control>
-				</nz-form-item> -->
-				<nz-form-item>
+				</nz-form-item>
+				<nz-form-item *ngIf="!ifFixType">
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">
 				    <nz-input-group>
@@ -704,7 +705,7 @@
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
 						<div *ngFor="let item of specimenList" class="specimen-item-class" (click)="specimenView(item)">
-							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
 				</div>
@@ -721,11 +722,13 @@
 							</nz-step>
 							<ng-template #tpl>
 								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-									<div style="color: #49B856;">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div style="color: #49B856;" *ngIf="item.doctorDTO"> {{item.operationType?item.operationType.name:''}} {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}} </div>
+									<div style="color: #49B856;" *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
 									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
 								</div>
 								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
-									<div>{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+									<div *ngIf="item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.doctorDTO?item.doctorDTO.name:''}} {{item.nurseDTO?item.nurseDTO.name:''}}</div>
+									<div *ngIf="!item.doctorDTO">{{item.operationType?item.operationType.name:''}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
 									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
 								</div>
 							</ng-template>

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

@@ -603,7 +603,7 @@
 	    .content {
 	      width: 100%;
 	      // height: auto;
-	      padding: 19px 14px 0 14px;
+	      padding: 15px 0px 0 0px;
 	      // max-height: 500px;
 	      // overflow-y: auto;
 				.ant-select{

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

@@ -181,6 +181,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	
 	// 标本条码搜索
 	codeDataSpecimenList:any = null;
+	fixType:any = false
 	searchSpecimen(e){
 		if(!this.barCode){
 			return
@@ -198,11 +199,20 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.isSpinning = false
 			if(res.status==200){
 				this.codeData = res.data[0]
-				let item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList
+				// this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList.filter(i=>!i.fixationTime)
+				let item = null
+				let str = null
+				if(e.indexOf(':')!=-1){
+					str = e.split(':')
+					item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == str[1])
+				}else{
+					item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				}
 				if(!item.fixationTime && this.codeData.pathologyFormType==0){
 					if(this.codeData.status.value==2 || this.codeData.status.value==3 ||
 						this.codeData.status.value==4){
-							this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList.filter(i=>!i.fixationTime)
+							// this.fixType = false
 							if(this.codeData.pathologyInspectDTOS){
 								this.project = this.codeData.pathologyInspectDTOS.map(i=>{
 									return i.inspectProject.name
@@ -216,7 +226,28 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 					this.fixationError = null
 					this.searchMsg = null
 				}else if(item.fixationTime && this.codeData.pathologyFormType==0){
-					this.viewDetail(this.codeData,'4')
+					if(item.storageTime){
+						this.viewDetail(this.codeData,'4')
+					}else{
+						if(this.codeData.pathologyInspectDTOS){
+							this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+								return i.inspectProject.name
+							})
+							this.project = this.project.join('、')
+						}
+						this.getFixationNum(this.codeData.id)
+					}
+					// if(this.codeData.status.value==2 || this.codeData.status.value==3 || this.codeData.status.value==4){
+					// 	if(this.codeData.pathologyInspectDTOS){
+					// 		this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+					// 			return i.inspectProject.name
+					// 		})
+					// 		this.project = this.project.join('、')
+					// 	}
+					// 	this.getFixationNum(this.codeData.id)
+					// }else{
+					// 	this.viewDetail(this.codeData,'4')
+					// }
 					this.barCode = null
 					this.fixationError = null
 					this.searchMsg = null
@@ -260,33 +291,63 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	}
 	fixationTimeSelect:any;
 	fixationTimeChange(result){
-		this.fixationTimeSelect = format(result, 'HH:mm');
+		if(result){
+			this.fixationTimeSelect = format(result, 'HH:mm');
+		}else{
+			this.fixationTimeSelect = null
+		}
 		console.log(this.fixationData + ' ' + this.fixationTimeSelect)
 	}
 
 	// 确定接受固定标本
 	startDate:any;
+	ifFixType:any = false;
 	submitFixationForm(){
+		let item = this.codeDataSpecimenList.filter(i=>!i.fixationTime)
+		console.log(1111,item)
 		this.validateVerificationForm = this.fb.group({
 		  fixationTimes: [null, [Validators.required]],
 		  fixationDate: [null, [Validators.required]],
 			jobNumber: [null, [Validators.required]],
 			name:[null, [Validators.required]],
-			// nurseJobNumber: [null, [Validators.required]],
-			// nurseName:[null, [Validators.required]],
+			nurseJobNumber: [null, [Validators.required]],
+			nurseName:[null, [Validators.required]],
 			fixative:[null, [Validators.required]],
 		});
 		let date = new Date();
 		let inVitroDate = format(date, "yyyy-MM-dd")
-		this.validateVerificationForm.controls.fixationDate.setValue(inVitroDate);
-		this.validateVerificationForm.controls.fixationTimes.setValue(date);
-		this.fixationData = inVitroDate;
-		this.fixationTimeSelect = format(date, 'HH:mm');
+		if(item.length==0){
+			this.ifFixType = true
+			this.validateVerificationForm.removeControl('fixationTimes')
+			this.validateVerificationForm.removeControl('fixationDate')
+			this.validateVerificationForm.removeControl('fixative')
+		}else{
+			this.ifFixType = false
+			this.validateVerificationForm.addControl(
+				'fixationTimes',
+				new FormControl(null, Validators.required)
+			);
+			this.validateVerificationForm.addControl(
+				'fixationDate',
+				new FormControl(null, Validators.required)
+			);
+			this.validateVerificationForm.addControl(
+				'fixative',
+				new FormControl(null, Validators.required)
+			);
+			this.validateVerificationForm.controls.fixationDate.setValue(inVitroDate);
+			// this.validateVerificationForm.controls.fixationTimes.setValue(date);
+			this.fixationData = inVitroDate;
+			// this.fixationTimeSelect = format(date, 'HH:mm');
+		}
+
 		this.btnLoading = true
 		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
 			this.fixativeData = res
-			let item = this.fixativeData.find(i=>i.value==1)
-			this.validateVerificationForm.controls.fixative.setValue(item.id);
+			if(!this.ifFixType){
+				let item = this.fixativeData.find(i=>i.value==1)
+				this.validateVerificationForm.controls.fixative.setValue(item.id);
+			}
 			this.btnLoading = false
 			this.verificationMoadl = true
 		});
@@ -515,12 +576,12 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
 	// 输入工号查询姓名
 	handoverUserId:any = null; //医生工号
-	handoverNurseUserId:any = null; //护士工号
+	nurseId:any = null; //护士工号
 	numberChange(e,type){
-		if(e.length < 3) {
-			this.validateVerificationForm.controls.name.setValue('');
-			return
-		}
+		// if(e.length < 3) {
+		// 	this.validateVerificationForm.controls.name.setValue('');
+		// 	return
+		// }
 		let query = {
 		  account: e
 		};
@@ -533,15 +594,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 						this.handoverUserId = data.userId
 					}else{
 						this.validateVerificationForm.controls.nurseName.setValue(data.userName);
-						this.handoverNurseUserId = data.userId
-					}
-				}else{
-					if(type==1){
-						this.validateVerificationForm.controls.name.setValue('');
-						this.handoverUserId = null
-					}else{
-						this.validateVerificationForm.controls.nurseName.setValue('');
-						this.handoverNurseUserId = null
+						this.nurseId = data.userId
 					}
 				}
 		  });
@@ -549,11 +602,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
 	// 提交固定标本接收
 	submitVerificationForm(){
+		if(!this.ifFixType && !this.fixationTimeSelect && this.fixationTimeSelect == null){
+			this.message.error('请选择固定时间')
+			return
+		}
 		for (const i in this.validateVerificationForm.controls) {
 		  this.validateVerificationForm.controls[i].markAsDirty();
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
+		let arr = []
+		// if(!this.ifFixType){
+		// 	arr = this.codeDataSpecimenList.filter(i=>!i.fixationTime)
+		// }else{
+		// 	arr = this.codeDataSpecimenList.filter(i=>i.fixationTime)
+		// }
 		let str = this.codeDataSpecimenList.map(i=>{
 			return i.specimenCode
 		})
@@ -561,13 +624,21 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
 			specimenFixingLiquid:{
-				id:this.validateVerificationForm.value.fixative
+				id:''
 			},
 			specimenCodes:str.join(','),
-			fixationTime:this.fixationData + ' ' + this.fixationTimeSelect+':00',
+			fixationTime:'',
 			hosId: this.hosId || "" ,
-			handoverUserId:this.handoverUserId
+			doctor:this.handoverUserId,
+			nurse:this.nurseId
 		};
+		if(!this.ifFixType){
+			data.specimenFixingLiquid.id = this.validateVerificationForm.value.fixative
+			data.fixationTime = this.fixationData + ' ' + this.fixationTimeSelect+':00'
+		}else{
+			delete data.specimenFixingLiquid.id
+			delete data.fixationTime
+		}
 		this.btnInfoLoading = true;
 		this.mainService
 		.simplePost("addData", "pathologyForm", data)
@@ -635,12 +706,22 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.tableLoading = false
 			this.specimenCode = null
 			if(res.status==200){
-				let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
-				if(item.fixationTime){
-					this.fixationError = '该标本已经固定过'
+				let item = null
+				let str = null
+				if(e.indexOf(':')!=-1){
+					str = e.split(':')
+					item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == str[1])
+				}else{
+					item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				}
+				// let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				if(item.fixationTime && item.storageTime){
+					this.fixationError = '该标本已存放标本间'
 				}else{
 					this.getFixationNum(res.data[0].id)
 					this.codeData = res.data[0]
+					// this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList.filter(i=>!i.fixationTime)
+					this.codeDataSpecimenList = this.codeData.pathologySpecimenDTOList
 					this.fixationError = null
 				}
 			}else{