合并代码

src/app/app-routing.module.ts

@@ -96,6 +96,11 @@ const routes: Routes = [
 	  path: 'pathologyScan',
 	  loadChildren: () => import('./views/pathologyScan/pathologyScan.module').then(m => m.PathologyScanModule),
 	},
+	// 门诊病理采样端
+	{
+		path: 'pathologySample',
+		loadChildren: () => import('./views/pathology-sample/pathology-sample.module').then(m => m.PathologySampleModule),
+	},
   // 全局业务查看
   {
     path: 'disinfectionSupply',

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

@@ -107,22 +107,37 @@
 				<div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='pathology'">
 					<div class="taskTypeInfo">
 						<div class="list">
-							<!--是否支持根据手术新建申请单 -->
-							<div class="display_flex align-items_center mb8">
-								<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-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-checkbox-group [(ngModel)]="outpatientInVitroFixation"></nz-checkbox-group>
+								</div>
+								<!--申请单条码设置 -->
+								<div class="display_flex align-items_center mb8">
+									<nz-form-label class="label">申请单条码设置</nz-form-label>
+									<nz-radio-group type="active" [(ngModel)]="pathologyBarCode">
+										<label nz-radio [nzValue]="1">条形码</label>
+										<label nz-radio [nzValue]="2">二维码</label>
+									</nz-radio-group>
+								</div>
 							</div>
 							<div class="bottom">
 								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitPathologyForm()">保存</button>
 							</div>
-							<div class="list" *ngIf="loading">
-							  <div class="loadingFull display_flex justify-content_flex-center align-items_center">
-							    <div class="loadingFullInner">
-							      <img src="../../../assets/images/loading.gif" alt="">
-							      <div>加载中...</div>
-							    </div>
-							  </div>
-							</div>
+						</div>
+						<div class="list" *ngIf="loading">
+						  <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+						    <div class="loadingFullInner">
+						      <img src="../../../assets/images/loading.gif" alt="">
+						      <div>加载中...</div>
+						    </div>
+						  </div>
 						</div>
 					</div>
 				</div>

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

@@ -26,11 +26,16 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		}
 	];
 	
-	// 扫描时指定科室不提醒勾选项
+	// 是否支持根据手术新建申请单
 	autoCreate:any[] = [
 	  {label:'是否开启',value: 0}
 	];
 	
+	// 门诊支持离体并固定
+	outpatientInVitroFixation:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
   // 扫描时指定科室不提醒勾选项
   deptNotAlert:any[] = [
     {label:'是否开启',value: 0}
@@ -75,7 +80,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
   defaultScanSpe:any[] = [
     {label:'是否开启',value: 0}
   ];
-
+	
+	//申请单条码设置
+	pathologyBarCode:any;
+	
   // 配置
   configs:any = {};
   // 任务类型
@@ -170,6 +178,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		  taskType: this.taskTypeData.id,
 		  hosId: this.hosId,
 		  autoCreate: this.autoCreate[0].checked ? 1 : 0,
+			outpatientInVitroFixation: this.outpatientInVitroFixation[0].checked ? 1 : 0,
+			pathologyBarCode : this.pathologyBarCode,
 		};
 		this.btnLoading = true;
 		this.mainService
@@ -291,6 +301,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
           this.configs = result.list[0] || {};
 					// 病理标本
 					this.autoCreate[0].checked = this.configs.autoCreate == 1;
+					this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
+					this.pathologyBarCode = this.configs.pathologyBarCode;
 					// 检查标本
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;

src/app/services/main.service.ts

@@ -1043,5 +1043,11 @@ export class MainService {
 	  return this.http.post(host.host + `/user/data/findPhoneDept`, data, {
 	    headers: this.headers,
 	  });
+	}	// 获取细胞学标本
+	getCellDictionary(data) {
+	  return this.http.post(host.host + `/common/common/getDictionary`,data, {
+	    headers: this.headers,
+	  });
 	}
+
 }

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

@@ -122,8 +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)">
-							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
-							({{item.specimenCode}})
+								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
 							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 						</div>
@@ -156,7 +155,7 @@
 		</div>
 		<div class="content">
 			<form nz-form [formGroup]="validateSpecimenForm" class="addForm" (ngSubmit)="submitSpecimen()">
-				<nz-form-item class="form-item">
+				<nz-form-item class="form-item" *ngIf="!selectType">
 					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">位置来源</nz-form-label>
 					<div class="specimen-list">
 						<div>
@@ -166,7 +165,7 @@
 					</div>
 				</nz-form-item>
 				
-				<nz-form-item class="form-item">
+				<nz-form-item class="form-item" *ngIf="!selectType">
 					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">系统</nz-form-label>
 					<div class="specimen-list">
 						<div *ngFor="let item of systemList;let index=index;" class="select-item"
@@ -176,7 +175,7 @@
 					</div>
 				</nz-form-item>
 				
-				<nz-form-item class="form-item">
+				<nz-form-item class="form-item" *ngIf="!selectType">
 					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">器官</nz-form-label>
 					<div class="specimen-list">
 						<div *ngFor="let item of apparatusList;let index=index;" class="select-item"
@@ -247,14 +246,21 @@
 			<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>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择标本离体时间!">
+				  <nz-form-label nzRequired [nzSpan]="6" nzFor="inVitroTime">离体时间</nz-form-label>
+		<!-- 		  <nz-form-control [nzSpan]="16" nzErrorTip="请选择标本离体时间!">
 				    <nz-input-group>
 							<nz-date-picker formControlName="inVitroTime" 
 							[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-control> -->
+					<nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择离体时间!">
+					  <nz-input-group style="display: flex;gap: 10px">
+							<nz-date-picker formControlName="inVitroDate" (ngModelChange)="inVitroDateChange($event)"></nz-date-picker>
+							
+							<nz-time-picker formControlName="inVitroTimes" nzFormat="HH:mm" (ngModelChange)="inVitroTimeChange($event)"></nz-time-picker>
+						</nz-input-group>
+					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="5" nzFor="jobNumber">工号</nz-form-label>
@@ -283,7 +289,7 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+				 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
 						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
 						 <div>{{printData.applyCode}}</div>
@@ -292,7 +298,15 @@
 						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
-				
+				 <div *ngIf="pathologyBarCode==2" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 40%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -6px;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+					 </div>
+				 </div>
 				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
 					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>

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

@@ -239,7 +239,7 @@
 				.ant-form-item {
 				  margin-bottom: 14px;
 					display: flex;
-					flex-wrap: wrap;
+					// flex-wrap: wrap;
 					position: relative;
 				  .ant-form-item-label {
 				    text-align: left;
@@ -292,6 +292,6 @@
 			}
 	  }
 		.no-width{
-			width: 30% !important;
+			width: 33% !important;
 		}
 	}

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

@@ -67,9 +67,40 @@ export class PathologyAddComponent implements OnInit {
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.initForm()
+		this.getTaskTypesId()
 		this.fetchDataList()
   }
 	
+	// 获取任务类型（病理标本）
+	taskTypeData:any;
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='pathology')
+			this.getPathologySys();
+		});
+	}
+	
+	// 获取标本配置
+	pathologyBarCode:any = 1;
+	getPathologySys(){
+		let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:this.taskTypeData.id
+			  }
+		}
+	
+		this.mainService
+		  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+		  .subscribe((result) => {
+		    if (result.status == 200) {
+					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
+		    }
+		  });
+	}
+	
 	radioChange(data){
 		let arr = [];
 		let item = null
@@ -100,15 +131,15 @@ export class PathologyAddComponent implements OnInit {
 	
 	statusValue:any = 1;
 	fetchDataList(){
-		let data = {
-		  idx: 0,
-		  sum: 9999,
-		  pathologyForm: {
-				surgeryId: "",
-		    patientId: this.patientId || "",
-		    hosId: this.hosId || "" ,
-		  },
-		};
+		// let data = {
+		//   idx: 0,
+		//   sum: 9999,
+		//   pathologyForm: {
+		// 		surgeryId: "",
+		//     patientId: this.patientId || "",
+		//     hosId: this.hosId || "" ,
+		//   },
+		// };
 		this.isSpinning = true;
 		// this.mainService
 		//   .getFetchDataList("data", "pathologyForm", data)
@@ -116,6 +147,8 @@ export class PathologyAddComponent implements OnInit {
 		  .subscribe((data) => {
 		    this.isSpinning = false;
 		    this.detailsData = data.data;
+				this.patientId = data.data.patientId;
+				this.surgeryId = data.data.surgeryId;
 				if(this.detailsData.status){
 					this.statusValue = this.detailsData.status.value
 				}
@@ -225,6 +258,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 获取标本-标本名称
 	getSpNameData(id,item,type){
+		this.selectItem = this.specimenData.find(i=>i.id == this.validateForm.value.specimenGenre)
 		let postData: any = {
 		  idx: 0,
 		  sum: 9999,
@@ -233,16 +267,17 @@ export class PathologyAddComponent implements OnInit {
 				parent:id,
 		    key: 'pathology_specimen',
 		    deleted: 0,
+				extra1:'',
 		  },
 		};
-		this.mainService
-		  .getFetchDataList("simple/data", "dictionaryTree", postData)
-		  .subscribe((data) => {
-		    this.specimenNameList = data.list;
-				// this.specimenNameList.push({
-				// 	name:'其他',
-				// 	id:'qita'
-				// })
+		
+		if(this.selectType){
+			postData.dictionaryTree.key = 'cell_specimen'
+			postData.dictionaryTree.extra1 = this.selectItem.value
+			delete postData.dictionaryTree.parent
+			delete postData.dictionaryTree.level
+			this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData).subscribe((res) => {
+				this.specimenNameList = res.list;
 				if(type=='edit'){
 					if(item.sample){
 						this.validateSpecimenForm = this.fb.group({
@@ -256,21 +291,43 @@ export class PathologyAddComponent implements OnInit {
 							this.specimenNameId = Number(item.sample.id);
 							this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
 						},100)
-					}else{
-						// this.validateSpecimenForm = this.fb.group({
-						//   remark: [null, []],
-						// 	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)
 				}
-		  });
+			});
+		}else{
+			postData.dictionaryTree.key = 'pathology_specimen'
+			postData.dictionaryTree.parent = id
+			postData.dictionaryTree.level = 3
+			delete postData.dictionaryTree.extra1
+			this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData)
+			  .subscribe((data) => {
+			    this.specimenNameList = data.list;
+					if(type=='edit'){
+						if(item.sample){
+							this.validateSpecimenForm = this.fb.group({
+							  remark: [null, []],
+								specimenName: [null, [Validators.required]]
+							});
+							setTimeout(_=>{
+								let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
+								this.specimenNameIndex = index4
+								this.specimenNameName = item.sample.name
+								this.specimenNameId = Number(item.sample.id);
+								this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
+							},100)
+						}
+						setTimeout(_=>{
+							this.validateSpecimenForm.controls.remark.setValue(item.remark);
+							this.specimenModal = true
+						},50)
+					}
+			  });
+		}
+
 	}
 	
 	// 删除标本
@@ -309,18 +366,28 @@ export class PathologyAddComponent implements OnInit {
 	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')
+		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)
+			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')
+		}else{
+			this.selectType = true
+			this.getSpNameData(item.specimenId,item,'edit')
+		}
 	}
 	
 	// 选择标本
+	selectItem:any;
+	selectType:any = false;
 	openSpecimen(){
+		this.selectItem = this.specimenData.find(i=>i.id == this.validateForm.value.specimenGenre)
+		console.log(this.selectItem.value) //20 21 22 24 60 80
 		this.validateSpecimenForm = this.fb.group({
 		  remark: [null, []],
 			specimenName:[null, [Validators.required]],
@@ -338,10 +405,19 @@ export class PathologyAddComponent implements OnInit {
 		this.systemList=[]; //系统数据
 		this.apparatusList=[]; //器官数据
 		this.specimenNameList=[]; //标本名称数据
-		this.specimenNameName = null;
-		this.getSourceData()
-		this.getSysData()
+		this.specimenNameName = null
 		this.specimenModal = true
+		if(this.selectItem.value==20 || this.selectItem.value==21 ||
+		this.selectItem.value==22 || this.selectItem.value==23 ||
+		this.selectItem.value==24 || this.selectItem.value==60 || 
+		this.selectItem.value==70 || this.selectItem.value==80){
+			this.selectType = true
+			this.getSpNameData('',{},'select')
+		}else{
+			this.selectType = false
+			this.getSourceData()
+			this.getSysData()
+		}
 	}
 	
 	// 选择位置来源
@@ -391,17 +467,6 @@ export class PathologyAddComponent implements OnInit {
 	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, []],
-		// 		specimenName: [null, [Validators.required]]
-		// 	});
-		// 	this.specimenNameId = 'null'
-		// 	this.specimenNameName = 'qita'
-		// }else{
-			// this.validateSpecimenForm = this.fb.group({
-			//   remark: [remark?remark:null, []],
-			// });
 			this.specimenNameId = item.id
 			this.specimenNameName = item.name
 			if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length){
@@ -411,10 +476,6 @@ export class PathologyAddComponent implements OnInit {
 				}
 			}
 			
-			// if(this.validateSpecimenForm.value.specimenName && this.validateSpecimenForm.value.specimenName.length>15){
-			// 	this.message.error('字符长度不能超过15个')
-			// 	return
-			// }
 			let namn = null
 			if(this.validateSpecimenForm.value.specimenName){
 				namn = this.validateSpecimenForm.value.specimenName + '、'+ item.name
@@ -422,7 +483,6 @@ export class PathologyAddComponent implements OnInit {
 				namn = item.name
 			}
 			this.validateSpecimenForm.controls.specimenName.setValue(namn);
-		// }
 	}
 	
 	// 保存标本
@@ -430,19 +490,22 @@ export class PathologyAddComponent implements OnInit {
 	addSpLoading:boolean = false;
 	addMadal:boolean = false;
 	submitSpecimen(type){
-		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.selectType){
+			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){
+		
+		if(this.specimenNameIndex==null && this.validateSpecimenForm.value.specimenName == ''){
 			this.message.error('请选择标本名称')
 			return
 		}
@@ -478,12 +541,6 @@ export class PathologyAddComponent implements OnInit {
 			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'
@@ -502,10 +559,8 @@ export class PathologyAddComponent implements OnInit {
 					setTimeout(_=>{
 						this.closeSpecimenModel()
 					},200)
-		      // this.showSpecimenModal("操作", true, "");
 		    } else {
 					this.message.error(res.msg)
-		      // this.showSpecimenModal("操作", false, res.msg);
 		    }
 		  });
 	}
@@ -532,12 +587,6 @@ export class PathologyAddComponent implements OnInit {
 			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'
@@ -546,11 +595,9 @@ export class PathologyAddComponent implements OnInit {
 			queryType = 'addData'
 			delete data.id
 		}
-		// this.btnSpLoading = true;
 		this.mainService
 		  .simplePost(queryType, "pathologySpecimen", data)
 		  .subscribe((res) => {
-		    // this.btnSpLoading = false;
 		    if (res.status == 200) {
 					this.message.success('操作成功')
 					this.validateSpecimenForm = this.fb.group({
@@ -563,10 +610,6 @@ export class PathologyAddComponent implements OnInit {
 					
 					this.placeIndex = null;
 					this.placeId = null;
-					
-					// this.specimenNameList=[]; //标本名称数据
-					// this.specimenNameName = null;
-					
 					this.addSpLoading = false;
 					this.addMadal = false;
 					
@@ -613,11 +656,22 @@ export class PathologyAddComponent implements OnInit {
 					let str = []
 					if(res.list.length>0){
 						for(let i of res.list){
-							str.push(i.system.name + '-' + i.organ.name)
+							if(i.system && i.organ){
+								str.push(i.system.name + '-' + i.organ.name)
+							}else{
+								str.push(i.specimenName)
+							}
 						}
 						const newStr = new Set(str);
 						const newData = Array.from(newStr);
 						this.validateForm.controls.takePart.setValue(newData.join('、'));
+						// if(this.selectType){
+						// 	this.validateForm.controls.takePart.setValue(
+						// 	this.validateSpecimenForm.controls.specimenName
+						// 	)
+						// }else{
+							
+						// }
 					}
 				}
 				this.validateForm.controls.specimenNum.setValue(this.specimenList.length);
@@ -633,9 +687,17 @@ export class PathologyAddComponent implements OnInit {
 		this.notModal = false
 	}
 	
-	// 日期选择
-	formChangeDate(result?): void {
-	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	// 选择离体时间
+	inVitroTime:any;
+	inVitroData:any;
+	inVitroDateChange(result){
+		this.inVitroData = format(result, 'yyyy-MM-dd');
+		console.log(this.inVitroData)
+	}
+	inVitroTimeSelect:any;
+	inVitroTimeChange(result){
+		this.inVitroTimeSelect = format(result, 'HH:mm');
+		console.log(this.inVitroData + ' ' + this.inVitroTimeSelect)
 	}
 	
 	//未打印提交
@@ -652,7 +714,7 @@ export class PathologyAddComponent implements OnInit {
 			pathologyForm:{
 				...this.detailsData,
 				...this.validateForm.value,
-				inVitroTime:this.startDate,
+				inVitroTime:this.inVitroData + ' ' + this.inVitroTimeSelect+':00',
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
 				hosId: this.hosId || "" ,
@@ -808,13 +870,17 @@ export class PathologyAddComponent implements OnInit {
 				this.specimenNum = res.specimenNum
 				this.pathologySpecimenIds = res.ids
 				this.validatePrintForm = this.fb.group({
-				  inVitroTime: [null, [Validators.required]],
+				  inVitroTimes: [null, [Validators.required]],
+				  inVitroDate: [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);
+				let inVitroDate = format(date, "yyyy-MM-dd")
+				this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+				this.validatePrintForm.controls.inVitroTimes.setValue(date);
+				this.inVitroData = inVitroDate;
+				this.inVitroTimeSelect = format(date, 'HH:mm');
 			}else{
 				this.message.info('无新标本需要打印')
 			}
@@ -845,13 +911,17 @@ export class PathologyAddComponent implements OnInit {
 					this.specimenNum = res.specimenNum
 					this.pathologySpecimenIds = res.ids
 					this.validatePrintForm = this.fb.group({
-					  inVitroTime: [null, [Validators.required]],
+					  inVitroTimes: [null, [Validators.required]],
+					  inVitroDate: [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);
+					let inVitroDate = format(date, "yyyy-MM-dd")
+					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+					this.validatePrintForm.controls.inVitroTimes.setValue(date);
+					this.inVitroData = inVitroDate;
+					this.inVitroTimeSelect = format(date, 'HH:mm');
 				}else{
 					let data: any = {
 						pathologyForm:{
@@ -893,13 +963,17 @@ export class PathologyAddComponent implements OnInit {
 					this.totalNum = res.totalNum
 					this.specimenNum = res.specimenNum
 					this.validatePrintForm = this.fb.group({
-						inVitroTime: [null, [Validators.required]],
+					  inVitroTimes: [null, [Validators.required]],
+					  inVitroDate: [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);
+					let inVitroDate = format(date, "yyyy-MM-dd")
+					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+					this.validatePrintForm.controls.inVitroTimes.setValue(date);
+					this.inVitroData = inVitroDate;
+					this.inVitroTimeSelect = format(date, 'HH:mm');
 				})
 				return
 			}

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

@@ -62,8 +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)">
-								{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
-								({{item.specimenCode}})
+								<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
 							</div>
 						</div>
 					</div>
@@ -78,12 +77,12 @@
 								</nz-step>
 								<ng-template #tpl>
 									<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-										<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-										<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+										<div style="color: #49B856;">{{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.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-										<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+										<div>{{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>
 							</ng-container>
@@ -115,7 +114,7 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+				 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
 						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
 						 <div>{{printData.applyCode}}</div>
@@ -124,6 +123,15 @@
 						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
+				 <div *ngIf="pathologyBarCode==2" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 40%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -6px;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+					 </div>
+				 </div>
 				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
 					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>

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

@@ -82,6 +82,7 @@ export class PathologyDetailComponent implements OnInit {
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
 		// this.initForm()
+		this.getTaskTypesId()
 		this.fetchDataList()
   }
 	
@@ -139,6 +140,36 @@ export class PathologyDetailComponent implements OnInit {
 		this.pathologyCancel.emit()
 	}
 	
+	// 获取任务类型（病理标本）
+	taskTypeData:any;
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='pathology')
+			this.getPathologySys();
+		});
+	}
+	
+	// 获取标本配置
+	pathologyBarCode:any = 1;
+	getPathologySys(){
+		let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:this.taskTypeData.id
+			  }
+		}
+	
+		this.mainService
+		  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+		  .subscribe((result) => {
+		    if (result.status == 200) {
+					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
+		    }
+		  });
+	}
+	
 	// 获取详情
 	statusValue:any;
 	fetchDataList(){

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

@@ -60,6 +60,7 @@ export class LoginComponent implements OnInit {
     }
   }
   //单点登录
+	paramsData:any= {};
   singleSignOn() {
     let url = location.href;
     let paramsStr = url.split("?")[1];
@@ -68,6 +69,8 @@ export class LoginComponent implements OnInit {
       let arr = item.split("=");
       paramsObj[arr[0] + 1] = arr[1];
     });
+		this.paramsData = paramsObj;
+		console.log(99999,paramsObj)
     this.singleSignOnLogin(paramsObj);
   }
   // 单点登录
@@ -203,8 +206,7 @@ export class LoginComponent implements OnInit {
           this.tool.setFavicon(faviconUrl);
           this.titleService.setTitle(this.tool.logoTitle);
           (document.querySelector('#favicon') as any).href = this.tool.faviconUrl;
-
-          this.toRoute2(data);
+					this.toRoute2(data);
           this.initMenu(data.user.menu);
         })
       } else {
@@ -235,6 +237,15 @@ export class LoginComponent implements OnInit {
       }
       canLogin = true;
     });
+		if(this.paramsData.toPage1 && this.paramsData.cardNO1){
+			this.msg.success("登录成功！", {
+			  nzDuration: 1000,
+			});
+			successLoginMsg = false;
+			localStorage.setItem("user", JSON.stringify(data.user));
+			this.router.navigate([`/${this.paramsData.toPage1}`, { param: this.paramsData.cardNO1 }])
+			return
+		}
     if (fwt) {
       // 护士角色跳护士端
       if (successLoginMsg) {

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

@@ -35,7 +35,7 @@
           <i class="icon_transport transport-peizhi1 green" *ngIf="incidentConfigRole || otherConfigRole || pageConfigRole || nurseConfigRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
-          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole">
+          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling">
             <i class="icon_transport transport-gengduoda-copy" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false"></i>
             <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>
@@ -46,7 +46,8 @@
               <div class="dropdownItem" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</div>
               <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>
               <div class="dropdownItem" *ngIf="pathology" (click)="toPathology()">病理科端</div>
-              <div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
+							<div class="dropdownItem" *ngIf="sampling" (click)="toSampling()">门诊病理采样端</div>
+							<div class="dropdownItem" *ngIf="disinfectionSupplyRole" (click)="toDisinfectionSupply()">全局业务查看</div>
             </div>
           </div>
         </div>

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

@@ -31,6 +31,7 @@ export class MainComponent implements OnInit {
   specimenViewRole2: boolean = false; //标本视图权限
 	specimenRoomView: boolean = false; //标本间权限
 	pathology: boolean = false; //病理科权限
+	sampling: boolean = false; //门诊病理采样端权限
   disinfectionSupplyRole: boolean = false; //全局业务查看权限
   incidentConfigRole: boolean = false; //事件配置权限
   otherConfigRole: boolean = false; //三方配置权限
@@ -302,6 +303,10 @@ export class MainComponent implements OnInit {
 			  this.pathology = true;
 			  console.log("病理科权限");
 			}
+			if (e.link == "pathologySample") {
+			  this.sampling = true;
+			  console.log("门诊病理采样端权限");
+			}
       if (e.link == "disinfectionSupply") {
         this.disinfectionSupplyRole = true;
         console.log("全局业务查看权限");
@@ -441,6 +446,10 @@ export class MainComponent implements OnInit {
 	toPathology(): void {
 	  this.router.navigateByUrl("pathology");
 	}
+	// 门诊病理采样端
+	toSampling(): void {
+	  this.router.navigateByUrl("pathologySample");
+	}
   // 全局业务查看
   toDisinfectionSupply(): void {
     this.router.navigateByUrl("disinfectionSupply");

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

@@ -0,0 +1,24 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { PathologySampleComponent } from "./pathology-sample.component";
+import { DetailSampleComponent } from 'src/app/share/detail-sample/detail-sample.component';
+
+const routes: Routes = [
+  {
+    path: "",
+    component: PathologySampleComponent,
+    // children: [
+    //   {
+    //     // 工单详情-标本
+    //     path: "detailSample/:id",
+    //     component: DetailSampleComponent,
+    //   },
+    // ],
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class PathologySampleRoutingModule {}

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

@@ -0,0 +1,627 @@
+<div class="pharmacy">
+  <!-- 头部 start -->
+  <div class="pharmacy-header">
+   <div class="pharmacy-logo">
+			<div class="pharmacy-name__title">一站式服务管理平台</div>
+    </div>
+    <div class="pharmacy-name">
+			<div class="pharmacy-title">门诊病理采样端</div>
+      <div class="pharmacy-name__total">
+				<nz-input-group nzSize="large">
+					<input type="text" id="Binput" (ngModelChange)="specimenCodeChange($event)" [(ngModel)]="barCode" nz-input placeholder="请输入患者信息" />
+				</nz-input-group>
+				<!-- <ng-template #suffixButton>
+					<button nz-button nzType="primary" nzSize="large" nzSearch (click)="searchSpecimen()">搜索</button>
+				</ng-template> -->
+      </div>
+			<div>
+				<div class="error-class">{{searchMsg}}</div>
+			</div>
+    </div>
+    <div class="right">
+      <div class="userInfo dropdown">
+        <div class="user" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <img src="../../assets/images/icon_keshi.png" alt="">
+          <span><ng-container *ngIf="loginUser.dept">{{deptDisplay == 2 ? loginUser.dept.deptalias : loginUser.dept.dept}}-</ng-container>{{loginUser.name}}</span>
+          <i class="icon_transport transport-xiala1 ml8"></i>
+        </div>
+        <div class="dropdown-content r8" [hidden]="!showDropdown" (mouseenter)="showDropdown = true" (mouseleave)="showDropdown = false">
+          <div class="dropdownItem" (click)="changeKsNow()">切换科室</div>
+					<div class="dropdownItem" (click)="toMain()">回到系统管理</div>
+          <div class="dropdownItem" (click)="logOut()">退出</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="pharmacy-main">
+		<div class="left" *ngIf="adviceList">
+			<div class="top" *ngIf="adviceList.patientNo">
+				<div>{{adviceList.patientName}} {{adviceList.patientGender?adviceList.patientGender.name:'-'}} ({{adviceList.patientAge||'-'}}岁)</div>
+				<div class="border">{{adviceList.patientNo}}</div>
+			</div>
+			<div class="content" *ngFor="let item of adviceList.pathologyAdviceDTOS;let index=index;" (click)="listClick(item,index)" [ngClass]="{'activeLeftClass': index == leftIndex}">
+				<div class="list list-df">
+					<div class="code">{{item.adviceId}}</div>
+					<div class="form-title">{{item.adviceType.name}}</div>
+				</div>
+				<div class="list">项目：{{item.inspectType.name}}</div>
+				<div class="list">部位：{{item.inspectPart}}</div>
+				<div class="list">诊断：{{item.diagnosis}}</div>
+				<div class="list">开单时间：{{item.orderTime | date:'yyyy-MM-dd HH:mm:ss'}}</div>
+				<!-- <div class="list">状态：{{item.orderStatusName}}</div> -->
+			</div>
+		</div>
+		<div class="center" *ngIf="detailsData && viewType!='add'">
+			<div class="pathology-content" *ngIf="viewType=='edit'">
+				<div class="title">病理检查申请单</div>
+				<div class="content">
+					<form nz-form [formGroup]="validateForm" class="addForm">
+						<div class="content-item">
+							<nz-form-item class="form-title-box">
+								<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+								<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
+							</nz-form-item>
+							
+							<nz-form-item>
+								<div class="form-title width-100 font-weight-500">诊断：</div>
+								<div>
+									{{detailsData.diagnose||'无'}}
+								</div>
+							</nz-form-item>
+							
+							<nz-form-item>
+								<div class="form-title width-100 font-weight-500">病历摘要：</div>
+								<div class="indent" [ngClass]="{'height-200': isShowMove, 'height-100': !isShowMove && detailsData.medicalRecords}">{{detailsData.medicalRecords||'无'}}</div>
+								<div (click)="showLook()" class="cursor" *ngIf="medicalRecordsLength>10">
+									<i *ngIf="isShowMove" nz-icon nzType="caret-down" nzTheme="outline"></i>
+									<i *ngIf="!isShowMove" nz-icon nzType="caret-up" nzTheme="outline"></i>
+								</div>
+							</nz-form-item>
+							
+							<nz-form-item class="form-item">
+								<nz-form-label nzFor="surgicalPlan" [nzSm]="24" [nzXs]="24">手术方案</nz-form-label>
+								<nz-form-control nzErrorTip="请输入手术方案" [nzSm]="24" [nzXs]="24">
+									<input nz-input formControlName="surgicalPlan" placeholder="请输入手术方案"/>
+								</nz-form-control>
+							</nz-form-item>
+							
+							<nz-form-item class="form-item">
+								<nz-form-label nzFor="intraoperativeFindings" [nzSm]="24" [nzXs]="24">术中所见</nz-form-label>
+								<nz-form-control nzErrorTip="请输入术中所见" [nzSm]="24" [nzXs]="24">
+									<input nz-input formControlName="intraoperativeFindings" placeholder="请输入术中所见"/>
+								</nz-form-control>
+							</nz-form-item>
+							
+							<nz-form-item class="form-item">
+								<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
+								<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
+									<nz-input-group>
+										<nz-select nzSearch nzShowSearch 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>
+							
+							<div class="df-sb">
+								<nz-form-item class="form-item">
+									<nz-form-label nzRequired nzFor="specimenGenre">标本类型</nz-form-label>
+									<nz-form-control nzErrorTip="请选择标本类型!">
+										<nz-input-group>
+											<nz-select nzSearch nzShowSearch nzPlaceHolder="请选择标本类型" formControlName="specimenGenre">
+												<ng-container *ngFor="let option of specimenData">
+													<nz-option *ngIf="!isDeptLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+												</ng-container>
+												<nz-option *ngIf="isDeptLoading" nzDisabled nzCustomContent>
+													<i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+												</nz-option>
+											</nz-select>
+										</nz-input-group>
+									</nz-form-control>
+								</nz-form-item>
+								
+								<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" />
+									</nz-form-control>
+								</nz-form-item>
+							</div>
+							
+							
+							<nz-form-item class="form-item">
+								<nz-form-label nzRequired nzFor="takePart" [nzSm]="4" [nzXs]="24">采取部位</nz-form-label>
+								<nz-form-control nzErrorTip="请输入采取部位!" [nzSm]="20" [nzXs]="24">
+									<input nz-input formControlName="takePart"  placeholder="请输入采取部位" nzSize="default" />
+								</nz-form-control>
+							</nz-form-item>
+							
+							<nz-form-item class="form-item">
+								<nz-form-label nzRequired [nzSm]="3" [nzXs]="24">标本</nz-form-label>
+								<div class="add-icon-class" (click)='openSpecimen()'>
+									<span class="icon_transport transport-tag27fuben form-icon"></span>
+								</div>
+							</nz-form-item>
+							
+							<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}})
+									</div>
+									<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
+								</div>
+							</div>
+						</div>
+					</form>
+				</div>
+				<div class="display_flex justify-content_flex-center bottom-btn">
+					<button *ngIf="statusValue==1" class="btn btn-right" nz-button nzType="primary" (click)="submitForm('print')" [nzLoading]="btnLoading">标本打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
+				</div>
+			</div>
+			
+			<div class="pathology-content" *ngIf="detailsData && viewType=='view'">
+				<div class="title">病理检查申请单</div>
+				<div class="content">
+					<div class="viewForm">
+						<div class="content-item">
+							<div class="form-list form-title-box">
+								<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
+								<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+								<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</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 width-100 font-weight-500">病历摘要：</div>
+								<div class="indent" [ngClass]="{'height-200': isShowMove, 'height-100': !isShowMove && detailsData.medicalRecords}">{{detailsData.medicalRecords||'无'}}</div>
+								<div (click)="showLook()" class="cursor" *ngIf="medicalRecordsLength>10">
+									<i *ngIf="isShowMove" nz-icon nzType="caret-down" nzTheme="outline"></i>
+									<i *ngIf="!isShowMove" nz-icon nzType="caret-up" nzTheme="outline"></i>
+								</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-list">
+									<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
+								</div>
+								
+								<div class="form-list">
+									<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
+								</div>
+								
+								<div class="form-list form-title-box">
+									<div class="form-title"><span class="font-weight-500">采取部位：</span>{{detailsData.takePart||'无'}}</div>
+									<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
+								</div>
+								
+								<div class="form-list">
+									<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}})
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		
+		<div class="content-item-right" *ngIf="pathologyLogs.length && (viewType=='view' || viewType=='edit')">
+			<div class="step-title">病理闭环</div>
+			<nz-steps [nzCurrent]="stepLength" nzDirection="vertical" nzSize="small">
+				<ng-container *ngFor="let item of pathologyLogs; let index = index">
+						<nz-step
+							[nzDescription]="tpl"
+						>
+						</nz-step>
+						<ng-template #tpl>
+							<div *ngIf="index==pathologyLogs.length-1" class="step-size">
+								<div style="color: #49B856;">{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+								<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+							</div>
+							<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
+								<div>{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
+								<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
+							</div>
+						</ng-template>
+					</ng-container>
+			</nz-steps>
+		</div>
+		<div class="pathology-content-btn" *ngIf="viewType=='add'">
+			<button class="btn" nz-button nzType="primary" (click)="addPathology()" [nzLoading]="addLoading">新增病理申请单</button>
+		</div>
+  </div>
+</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>
+
+<!-- 操作成功/失败提示框 -->
+<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="specimenModal">
+	<div class="modalBody">
+		<div class="title">新增病理标本<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i>
+		</div>
+		<div class="content">
+			<form nz-form [formGroup]="validateSpecimenForm" class="addForm" (ngSubmit)="submitSpecimen()">
+				<nz-form-item class="form-item" *ngIf="!selectType">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">位置来源</nz-form-label>
+					<div class="specimen-list">
+						<div>
+							<div *ngFor="let item of placeList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == placeIndex}" (click)="placeClick($event,item,index)" class="select-item">{{item.name}}</div>
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item" *ngIf="!selectType">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">系统</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of systemList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == systemIndex}" (click)="systemClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item" *ngIf="!selectType">
+					<nz-form-label nzRequired [nzSm]="2" [nzXs]="24">器官</nz-form-label>
+					<div class="specimen-list">
+						<div *ngFor="let item of apparatusList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == apparatusIndex}" (click)="apparatusClick($event,item,index)">
+							{{item.name}}
+						</div>
+					</div>
+				</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 specimenNameList;let index=index;" class="select-item"
+							[ngClass]="{'activeClass': index == specimenNameIndex}" (click)="specimenNameClick($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">
+						<input nz-input maxlength="15" (ngModelChange)="specimenInput($event)" formControlName="specimenName" placeholder="请输入标本名称"/>
+					</nz-form-control>
+					<div class="empty-box">
+						<span class="name">{{specimenNameLength}}/15</span>
+						<span class="empty" (click)="emptData($event)">清空</span>
+					</div>
+				</nz-form-item>
+				
+				<nz-form-item class="form-item">
+					<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>
+				</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)="submitSpecimen(1)" [nzLoading]="btnSpLoading">确定</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitSpecimen(2)">新增下一个标本</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+<app-prompt-modal *ngIf="specimenModalShow" [content]="promptContent" [success]="ifSuccess" [show]="specimenModalShow"
+  [info]="promptInfo" (closeModel)="closeSpecimenModel()"></app-prompt-modal>
+
+ <!-- 新增下一个标本 -->
+<app-dialog-delete [delModal]="addMadal" (hideDelModalEvent)="hideAddModal()" [btnLoading]="addSpLoading"
+  (confirmDelEvent)="confirmAdd()" content="您确认要新增下一个标本吗？"></app-dialog-delete>
+	
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+	(confirmDelEvent)="confirmDel()" content="您确认要删除标本吗？"></app-dialog-delete>
+		
+<!-- 查看标本 -->
+<div class="look">
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenViewDialog">
+		<div class="modalBody modalBody-ga">
+			<div class="title">查看标本<i class="icon_transport transport-guanbi" (click)="closeSpecimenModal()"></i>
+			</div>
+			<overlay-scrollbars #osComponentRef1 class="content">
+				<div class="list-template__bottom">
+					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+						[nzLoading]="loading1">
+						<thead>
+							<tr class="thead">
+								<th>标本名称</th>
+								<th>编码</th>
+								<th>备注</th>
+								<th>离体时间</th>
+								<th>离体操作人</th>
+								<th>固定时间</th>
+								<th>固定操作人</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr *ngFor="let data of viewData">
+								<td>{{ data.specimenName }}</td>
+								<td>{{ data.specimenCode }}</td>
+								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
+								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
+							</tr>
+						</tbody>
+					</nz-table>
+				</div>
+			</overlay-scrollbars>
+			<div class="display_flex justify-content_flex-center">
+				<button class="btn" nz-button nzType="primary" (click)="closeSpecimenModal()">知道了</button>
+			</div>
+		</div>
+	</div>
+</div>
+
+<!-- 离体并固定 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="notModal">
+	<div class="modalBody no-width">
+		<div class="title">{{ifImmobilization?'离体并固定':'离体'}}<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]="6" nzFor="inVitroTime">离体时间</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="inVitroTime" 
+							[nzShowTime]="{ nzFormat: 'yyyy-MM-dd HH:mm:ss' }" nzFormat="yyyy-MM-dd HH:mm:ss"
+							(ngModelChange)="inVitroTimeChange($event)"></nz-date-picker> -->
+							<nz-date-picker formControlName="inVitroDate" (ngModelChange)="inVitroDateChange($event)"></nz-date-picker>
+							
+							<nz-time-picker formControlName="inVitroTimes" nzFormat="HH:mm" (ngModelChange)="inVitroTimeChange($event)"></nz-time-picker>
+						</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="请输入工号!">
+						<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]="5" nzFor="name">姓名</nz-form-label>
+					<nz-form-control [nzSpan]="19" nzErrorTip="请输入姓名!">
+						<input nz-input disabled formControlName="name" placeholder="请输入姓名" nzSize="default" />
+					</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]="printLoading">确定</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideNotModal()">取消</button>
+		</div>
+	</div>
+</div>
+
+
+<!-- 打印 -->
+<div id="report" style="display: none;">
+	<div class="monad">
+		<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
+			border-radius: 5px;font-size: 12px;">
+			 <div *ngIf="pathologyBarCode==1" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+				 <div style="width: 60%;height: 70px;text-align: center;">
+					 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+					 <div>{{printData.applyCode}}</div>
+				 </div>
+				 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+					 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+				 </div>
+			 </div>
+			 <div *ngIf="pathologyBarCode==2" style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+				 <div style="width: 40%;height: 70px;text-align: center;">
+					 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+					 <div>{{printData.applyCode}}</div>
+				 </div>
+				 <div style="width: 60%;height: 100%;text-align: center;display: flex;align-items: center;position: relative;top: -6px;">
+					 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+				 </div>
+			 </div>
+			
+			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+				<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+				<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
+				<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+				<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
+			</div>
+			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">门诊号</div>
+				<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo?printData.residenceNo:printData.patientNo}}</div>
+				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+				<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
+			</div>
+			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+				<div style="width:50%;border-right: 1px solid #AAAAAA;
+				padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
+				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+				<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
+			</div>
+			<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+				<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
+				<div style="width:50%;border-right: 1px solid #AAAAAA;
+				padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
+				<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+				<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
+			</div>
+			<div style="display: flex;">
+				<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+				<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
+			</div>
+		</div>
+		
+		<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1"></div>
+		<div style="height: 20px;" *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: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+			 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
+						 <div>{{data.specimenCode}}</div>
+					 </div>
+					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+					 </div>
+				 </div>
+				 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
+					<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{data.patientName}}</div>
+					<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+					<div style="width:16%;box-sizing: border-box;padding:1px;border-top: 1px solid #aaa;">{{data.patientGender}}</div>
+				 </div>
+				 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">门诊号</div>
+					<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">{{data.residenceNo?data.residenceNo:data.patientNo}}</div>
+					<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+					<div style="width:16%;box-sizing: border-box;padding:1px;"> {{data.patientAge}}岁</div>
+				 </div>
+				 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					<div style="width:50%;box-sizing: border-box;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{data.patientDept}}</div>
+					<div style="width:14%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+					<div style="width:16%;box-sizing: border-box;padding:1px;">{{data.patientBedNum}}床</div>
+				 </div>
+				 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">标本名称</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;
+					padding:1px;overflow: hidden;white-space: nowrap">({{index+1}}/{{printData.specimenList.length}}){{data.partSource?data.partSource:''}}{{data.organ}}{{data.specimenName}}</div>
+				 </div>
+				 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">申请单号</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.applyCode }}</div>
+				 </div>
+				 <div style="display: flex;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{data.inVitroTime|date:'yyyy-MM-dd'}}</div>
+				 </div>
+			 </div>
+			</div>
+		</div>
+	</div>
+</div>
+	
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>

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

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

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">
-							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
 				</div>
@@ -389,11 +389,11 @@
 							<ng-template #tpl>
 								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
 									<div style="color: #49B856;">{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
 								</div>
 								<div *ngIf="index!=pathologyLogs.length-1" class="step-size">
 									<div>{{item.operationType.name}} {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto?item.operationUserDto.name:''}}</div>
 								</div>
 							</ng-template>
 						</ng-container>

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

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

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

@@ -534,7 +534,7 @@
 										<td>{{index+1}}</td>
 										<td>{{ data.specimenCode}}</td>
 										<td>
-											{{data.partSource?data.partSource.name:''}}{{data.organ?data.organ.name:''}}{{data.specimenName}}
+											<span *ngIf="data.partSource && data.partSource.value!=1">{{data.partSource?data.partSource.name:''}}</span>{{data.organ?data.organ.name:''}}{{data.specimenName}}
 										</td>
 									</tr>
 								</tbody>
@@ -565,13 +565,20 @@
 			<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-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-control> -->
+					<nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
+					  <nz-input-group style="display: flex;gap: 10px">
+							<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>
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="jobNumber">工号</nz-form-label>
@@ -586,10 +593,10 @@
 					</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-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">
+							<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>
@@ -671,8 +678,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)">
-							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
-							({{item.specimenCode}})
+							<span *ngIf="item.partSource && item.partSource.value!=1">{{item.partSource?item.partSource.name:''}}</span>{{item.organ?item.organ.name:''}}{{item.specimenName}}({{item.specimenCode}})
 						</div>
 					</div>
 				</div>
@@ -689,12 +695,12 @@
 							</nz-step>
 							<ng-template #tpl>
 								<div *ngIf="index==pathologyLogs.length-1" class="step-size">
-									<div style="color: #49B856;">{{item.operationType.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div style="color:#333;">{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									<div style="color: #49B856;">{{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.name}}  {{item.handoverUserDto?item.handoverUserDto.name:''}}</div>
-									<div>{{item.createTime|date:'yyyy-MM-dd HH:mm:ss'}} {{item.operationUserDto.name}}</div>
+									<div>{{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>
 						</ng-container>

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

@@ -234,22 +234,34 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	}
 	
 	// 选择固定时间
-	formChangeDate(result){
-	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
+	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)
 	}
 
 	// 确定接受固定标本
 	startDate:any;
 	submitFixationForm(){
 		this.validateVerificationForm = this.fb.group({
-		  fixationTime: [null, [Validators.required]],
+		  fixationTimes: [null, [Validators.required]],
+		  fixationDate: [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);
+		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');
 		this.btnLoading = true
 		this.mainService.getDictionary("list", "fixing_liquid_type").subscribe((res) => {
 			this.fixativeData = res
@@ -516,7 +528,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 				id:this.validateVerificationForm.value.fixative
 			},
 			specimenCodes:str.join(','),
-			fixationTime:this.startDate,
+			fixationTime:this.fixationData + ' ' + this.fixationTimeSelect+':00',
 			hosId: this.hosId || "" ,
 			handoverUserId:this.handoverUserId
 		};