门诊病理采样端开发

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

@@ -118,6 +118,14 @@
 									<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>

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

@@ -80,7 +80,10 @@ export class ConfigurationSpecimenComponent implements OnInit {
   defaultScanSpe:any[] = [
     {label:'是否开启',value: 0}
   ];
-
+	
+	//申请单条码设置
+	pathologyBarCode:any;
+	
   // 配置
   configs:any = {};
   // 任务类型
@@ -176,6 +179,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		  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
@@ -298,6 +302,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 					// 病理标本
 					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/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>
@@ -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
@@ -656,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)
 	}
 	
 	//未打印提交
@@ -675,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 || "" ,
@@ -831,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('无新标本需要打印')
 			}
@@ -868,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:{
@@ -916,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/pathology-sample/pathology-sample.component.html

@@ -35,20 +35,20 @@
   </div>
   <div class="pharmacy-main">
 		<div class="left" *ngIf="adviceList">
-			<div class="top">
+			<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.diagnosisCode}}</div>
+					<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}}</div>
-				<div class="list">状态：{{item.orderStatus.name}}</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'">
@@ -99,7 +99,7 @@
 								<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 nzMode="multiple" nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
+										<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>
@@ -151,8 +151,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>
@@ -222,8 +221,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)">
-											{{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>
@@ -233,7 +231,7 @@
 				</div>
 			</div>
 		
-		<div class="content-item-right" *ngIf="viewType=='view' || viewType=='edit'">
+		<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">
@@ -244,11 +242,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>
@@ -327,7 +325,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>
@@ -337,7 +335,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"
@@ -347,7 +345,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"
@@ -457,21 +455,27 @@
 			<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 [nzSpan]="18" nzErrorTip="请选择离体时间!">
-				    <nz-input-group>
-							<nz-date-picker formControlName="inVitroTime" 
+				  <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>
+							(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 [nzSpan]="18" nzErrorTip="请选择固定时间!">
-				    <nz-input-group>
-							<nz-date-picker formControlName="fixationTime" 
+				  <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>
+							(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>
@@ -514,7 +518,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>
@@ -523,6 +527,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>
@@ -531,8 +544,8 @@
 				<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}}</div>
+				<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>
@@ -578,8 +591,8 @@
 					<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}}</div>
+					<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>
@@ -593,7 +606,7 @@
 				 <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.organ}}{{data.specimenName}}</div>
+					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>

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

@@ -406,7 +406,6 @@
 	
 	.pharmacy-main {
 	  height: calc(100vh - 48px);
-	  // min-height: 680px;
 		flex: 1;
 	  display: flex;
 	  justify-content: space-between;
@@ -493,7 +492,7 @@
 						
 						.content-item{
 							flex: 1;
-							height: 460px;
+							height: calc(100vh - 159px);
 							overflow-y: auto;
 							padding: 0 15px;
 							.disp-fl{
@@ -717,7 +716,7 @@
 									
 						
 						.content-item-right{
-							height: 460px;
+							// height: calc(100vh - 48px);
 							overflow-y: auto;
 							padding: 15px;
 							.step-title{
@@ -756,7 +755,7 @@
 		}
 		.content-item-right{
 			width: 20%;
-			height: 570px;
+			// height: calc(100vh - 48px);
 			overflow-y: auto;
 			padding: 15px;
 			.step-title{
@@ -915,7 +914,7 @@
 			}
 	  }
 		.no-width{
-			width: 30% !important;
+			width: 33% !important;
 		}
 	}
 

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

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild, OnDestroy } from "@angular/core";
 import { MainService } from "../../services/main.service";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { startOfDay, format, endOfDay } from "date-fns";
 import { ToolService } from 'src/app/services/tool.service';
@@ -24,6 +24,7 @@ export class PathologySampleComponent implements OnInit {
   constructor(
 	private mainService: MainService,
 	public router: Router,
+	public route: ActivatedRoute,
 	public tool: ToolService,
 	private fb: FormBuilder,
 	private message: NzMessageService,
@@ -81,13 +82,13 @@ export class PathologySampleComponent implements OnInit {
 	detailId:any = '200';
 	project:any;
 	viewType:any = 'no';
-	
+	mainRole:any;
   ngOnInit() {
 		this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  this.searchSpecimenData(v[0])
 		});
 		this.changeInpSubjectSpecimen.pipe(debounceTime(500)).subscribe((v) => {
-		  this.searchSpecimen(v[0])
+		  this.searchSpecimen(v[0],'search')
 		});
 		this.hosId = this.tool.getCurrentHospital().id;
 		this.userId = this.tool.getCurrentUserId()
@@ -98,6 +99,10 @@ export class PathologySampleComponent implements OnInit {
 		this.getSysData()
 		this.getTaskTypesId();
 		this.getStationaryLiquid();
+		if(this.route.snapshot.params && this.route.snapshot.params.param){
+			this.barCode = this.route.snapshot.params.param
+			this.searchSpecimen(this.barCode,'search')
+		}
 		setTimeout(_=>{
 			document.getElementById('Binput').focus();
 		},500)
@@ -135,6 +140,7 @@ export class PathologySampleComponent implements OnInit {
 			this.addLoading = false
 			this.viewType = 'edit';
 			this.fetchDataList(data.data.id);
+			this.searchSpecimen(this.adviceList.patientNo,'add');
 		});
 	}
 	
@@ -148,6 +154,7 @@ export class PathologySampleComponent implements OnInit {
 	}
 	
 	// 获取配置
+	pathologyBarCode:any = 1;
 	ifImmobilization:any = false;
 	getConfig() {
 		let postData = {
@@ -167,6 +174,7 @@ export class PathologySampleComponent implements OnInit {
 					}else{
 						this.ifImmobilization = false
 					}
+					this.pathologyBarCode = result.list[0].pathologyBarCode?result.list[0].pathologyBarCode:1;
 	      }
 	    });
 	}
@@ -184,25 +192,28 @@ export class PathologySampleComponent implements OnInit {
 		}
 	}
 	
-	isShowMove:any = false
+	isShowMove:any = true
 	showLook(){
 		this.isShowMove = !this.isShowMove
 	}
 	
 	// 标本条码搜索
 	adviceList:any = null;
-	searchSpecimen(e){
-		if(!this.barCode){
-			return
-		}
-		if(this.barCode.length < 10) {
-			return
+	searchSpecimen(e,type){
+		console.log(7777,this.route.snapshot.params.param)
+		if(type!='add'){
+			if(!this.barCode){
+				return
+			}
+			if(this.barCode.length < 10) {
+				return
+			}
 		}
 		let data:any = {
 			idx: 0,
 			sum: 9999,
 			pathologyAdvice:{
-				patientNo:this.barCode
+				patientNo:this.barCode?this.barCode:e
 			}
 		}
 		this.isSpinning = true
@@ -210,22 +221,24 @@ export class PathologySampleComponent implements OnInit {
 		.subscribe((res:any) => {
 			this.isSpinning = false
 			if(res.status==200){
-				this.adviceList = res.list[0]
-				console.log(4545,this.adviceList)
-				// let item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == e)
-				// if(!item.fixationTime && this.codeData.pathologyFormType==0){
-				// 	this.fixationError = null
-				// 	this.searchMsg = null
-				// }else if(item.fixationTime && this.codeData.pathologyFormType==0){
-				// 	this.barCode = null
-				// 	this.fixationError = null
-				// 	this.searchMsg = null
-				// }else{
-				// 	this.barCode = null
-				// 	this.fixationError = null
-				// 	this.searchMsg = '该申请单类型不是病理检查申请单'
-				// }
-				
+				this.barCode = null
+				this.searchMsg = null
+				this.isShowMove = true
+				if(type=='search'){
+					this.leftIndex = null
+					this.detailsData = null
+					this.statusValue = 1
+					this.pathologyLogs = []
+					this.stepLength = 0
+					this.viewType = 'no';
+				}
+				if(res.list.length>0){
+					this.adviceList = res.list[0]
+				}else{
+					this.adviceList = []
+					this.viewType = 'no';
+				}
+				this.patientId = this.adviceList.patientId
 			}else{
 				this.barCode = null
 				this.searchMsg = res.msg
@@ -259,15 +272,31 @@ export class PathologySampleComponent implements OnInit {
 	}
 	
 	// 选择固定时间
-	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)
 	}
 	
 	// 选择离体时间
 	inVitroTime:any;
+	inVitroData:any;
+	inVitroDateChange(result){
+		this.inVitroData = format(result, 'yyyy-MM-dd');
+		console.log(this.inVitroData)
+	}
+	inVitroTimeSelect:any;
 	inVitroTimeChange(result){
-	  this.inVitroTime = format(result, 'yyyy-MM-dd HH:mm:ss');
+		this.inVitroTimeSelect = format(result, 'HH:mm');
+		console.log(this.inVitroData + ' ' + this.inVitroTimeSelect)
 	}
+
 	
 	// 提交固定标本接收
 	startDate:any;
@@ -279,13 +308,13 @@ export class PathologySampleComponent implements OnInit {
 		  this.validatePrintForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validatePrintForm.invalid) return;
-		let ids = this.validateForm.value.project.join(',')
+		let ids = this.validateForm.value.project
 		let data: any = {
 			pathologyForm:{
 				...this.detailsData,
 				...this.validateForm.value,
-				inVitroTime:this.inVitroTime,
-				fixationTime:this.startDate,
+				inVitroTime:this.inVitroData + ' ' + this.inVitroTimeSelect+':00',
+				fixationTime:this.fixationData + ' ' + this.fixationTimeSelect+':00',
 				specimenFixingLiquid:{
 					id:this.validatePrintForm.value.fixative
 				},
@@ -314,7 +343,7 @@ export class PathologySampleComponent implements OnInit {
 			delete data.pathologySpecimenIds
 		}
 		if(this.ifImmobilization){
-			data.pathologyForm.fixationTime = this.startDate
+			data.pathologyForm.fixationTime = this.fixationData + ' ' + this.fixationTimeSelect +':00'
 			data.pathologyForm.specimenFixingLiquid.id = this.validatePrintForm.value.fixative
 		}else{
 			delete data.pathologyForm.fixationTime
@@ -374,7 +403,6 @@ export class PathologySampleComponent 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.detailsData.status.value==5){
 				this.viewType = 'view'
@@ -404,16 +432,20 @@ export class PathologySampleComponent implements OnInit {
 			}
 			
 			// 检验项目
-			let arr = []
-			if(this.detailsData.pathologyInspectDTOS){
-				for(let i of this.detailsData.pathologyInspectDTOS){
-					arr.push(i.inspectProject.id)
+			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
 				}
-				this.validateForm.controls.project.setValue(arr);
 			}else{
-				this.validateForm.controls.project.setValue(arr);
+				let str = null
+				if(this.detailsData.pathologyInspectDTOS){
+					str = this.detailsData.pathologyInspectDTOS[0].inspectProject.id
+					this.validateForm.controls.project.setValue(str);
+				}else{
+					this.validateForm.controls.project.setValue(str);
+				}
 			}
-			
+
 			// 标本类型
 			if(this.detailsData.specimenType){
 				this.validateForm.controls.specimenGenre.setValue(this.detailsData.specimenType.id);
@@ -444,7 +476,7 @@ export class PathologySampleComponent implements OnInit {
 	
 	// 获取检验项目
 	getProDicData(){
-		this.mainService.getDictionary("list", "pathology_inspect_type").subscribe((res) => {
+		this.mainService.getDictionary("list", "outpatient_pathology_inspect_type").subscribe((res) => {
 			this.projectData = res
 		});
 	}
@@ -507,6 +539,7 @@ export class PathologySampleComponent 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,
@@ -515,12 +548,17 @@ export class PathologySampleComponent implements OnInit {
 				parent:id,
 		    key: 'pathology_specimen',
 		    deleted: 0,
+				extra1:'',
 		  },
 		};
-		this.mainService
-		  .getFetchDataList("simple/data", "dictionaryTree", postData)
-		  .subscribe((data) => {
-		    this.specimenNameList = data.list;
+		
+		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({
@@ -540,7 +578,37 @@ export class PathologySampleComponent implements OnInit {
 						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)
+					}
+			  });
+		}
+
 	}
 	
 	// 删除标本
@@ -579,18 +647,28 @@ export class PathologySampleComponent 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]],
@@ -608,10 +686,19 @@ export class PathologySampleComponent 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()
+		}
 	}
 	
 	// 选择位置来源
@@ -684,19 +771,22 @@ export class PathologySampleComponent 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
 		}
@@ -847,7 +937,11 @@ export class PathologySampleComponent 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);
@@ -897,25 +991,34 @@ export class PathologySampleComponent implements OnInit {
 				this.specimenNum = res.specimenNum
 				this.pathologySpecimenIds = res.ids
 				let date = new Date();
-				this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-				this.inVitroTime = format(date, "yyyy-MM-dd HH:mm:ss")
+				
+				let inVitroDate = format(date, "yyyy-MM-dd")
 				if(this.ifImmobilization){
 					this.validatePrintForm = this.fb.group({
-						inVitroTime: [null, [Validators.required]],
-						fixationTime: [null, [Validators.required]],
+						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]],
 					});
-					this.validatePrintForm.controls.fixationTime.setValue(this.startDate);
+					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({
-						inVitroTime: [null, [Validators.required]],
+						inVitroTimes: [null, [Validators.required]],
+						inVitroDate: [null, [Validators.required]],
 						jobNumber: [null, [Validators.required]],
 						name:[null, [Validators.required]],
 					});
 				}
-				this.validatePrintForm.controls.inVitroTime.setValue(this.inVitroTime);
+				this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+				this.validatePrintForm.controls.inVitroTimes.setValue(date);
+				this.inVitroData = inVitroDate;
+				this.inVitroTimeSelect = format(date, 'HH:mm');
 				if(this.detailsData.surgeryDoctorDTO){
 					this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
 					this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
@@ -937,12 +1040,10 @@ export class PathologySampleComponent implements OnInit {
 	submitForm(type): void{
 		var that = this;
 		this.operation = 'wholePrint'
-		console.log(5555,that.validateForm.controls)
 		for (const i in that.validateForm.controls) {
 			that.validateForm.controls[i].markAsDirty();
 			that.validateForm.controls[i].updateValueAndValidity();
 		}
-		console.log(444,that.validateForm.invalid)
 		if (that.validateForm.invalid) return;
 		if(this.specimenList.length==0){
 			this.message.error('标本不能为空')
@@ -957,25 +1058,34 @@ export class PathologySampleComponent implements OnInit {
 					this.specimenNum = res.specimenNum
 					this.pathologySpecimenIds = res.ids
 					let date = new Date();
-					this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-					this.inVitroTime = format(date, "yyyy-MM-dd HH:mm:ss")
+					
+					let inVitroDate = format(date, "yyyy-MM-dd")
 					if(this.ifImmobilization){
 						this.validatePrintForm = this.fb.group({
-							inVitroTime: [null, [Validators.required]],
-							fixationTime: [null, [Validators.required]],
+							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]],
 						});
-						this.validatePrintForm.controls.fixationTime.setValue(this.startDate);
+						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({
-							inVitroTime: [null, [Validators.required]],
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
 							jobNumber: [null, [Validators.required]],
 							name:[null, [Validators.required]],
 						});
 					}
-					this.validatePrintForm.controls.inVitroTime.setValue(this.inVitroTime);
+					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+					this.validatePrintForm.controls.inVitroTimes.setValue(date);
+					this.inVitroData = inVitroDate;
+					this.inVitroTimeSelect = format(date, 'HH:mm');
 					if(this.detailsData.surgeryDoctorDTO){
 						this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
 						this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
@@ -988,7 +1098,7 @@ export class PathologySampleComponent implements OnInit {
 							surgeryId: this.surgeryId || "",
 							patientId: this.patientId || "",
 							hosId: this.hosId || "" ,
-							pathologyInspectIds: this.validateForm.value.project.join(','),
+							pathologyInspectIds: this.validateForm.value.project,
 							specimenType:{
 								id:this.validateForm.value.specimenGenre
 							}
@@ -1022,25 +1132,34 @@ export class PathologySampleComponent implements OnInit {
 					this.totalNum = res.totalNum
 					this.specimenNum = res.specimenNum
 					let date = new Date();
-					this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-					this.inVitroTime = format(date, "yyyy-MM-dd HH:mm:ss")
+					
+					let inVitroDate = format(date, "yyyy-MM-dd")
 					if(this.ifImmobilization){
 						this.validatePrintForm = this.fb.group({
-							inVitroTime: [null, [Validators.required]],
-							fixationTime: [null, [Validators.required]],
+							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]],
 						});
-						this.validatePrintForm.controls.fixationTime.setValue(this.startDate);
+						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({
-							inVitroTime: [null, [Validators.required]],
+							inVitroTimes: [null, [Validators.required]],
+							inVitroDate: [null, [Validators.required]],
 							jobNumber: [null, [Validators.required]],
 							name:[null, [Validators.required]],
 						});
 					}
-					this.validatePrintForm.controls.inVitroTime.setValue(this.inVitroTime);
+					this.validatePrintForm.controls.inVitroDate.setValue(inVitroDate);
+					this.validatePrintForm.controls.inVitroTimes.setValue(date);
+					this.inVitroData = inVitroDate;
+					this.inVitroTimeSelect = format(date, 'HH:mm');
 					if(this.detailsData.surgeryDoctorDTO){
 						this.validatePrintForm.controls.jobNumber.setValue(this.detailsData.surgeryDoctorDTO.account);
 						this.validatePrintForm.controls.name.setValue(this.detailsData.surgeryDoctorDTO.name);
@@ -1055,7 +1174,7 @@ export class PathologySampleComponent implements OnInit {
 					surgeryId: this.surgeryId || "",
 					patientId: this.patientId || "",
 					hosId: this.hosId || "" ,
-					pathologyInspectIds:this.validateForm.value.project.join(','),
+					pathologyInspectIds:this.validateForm.value.project,
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
 					}

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
 		};