病理标本类型添加

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

@@ -116,7 +116,7 @@
 								<!--门诊支持离体并固定 -->
 								<div class="display_flex align-items_center mb8">
 									<nz-form-label class="label">门诊支持离体并固定</nz-form-label>
-									<nz-checkbox-group [(ngModel)]="immobilization"></nz-checkbox-group>
+									<nz-checkbox-group [(ngModel)]="outpatientInVitroFixation"></nz-checkbox-group>
 								</div>
 							</div>
 							<div class="bottom">

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

@@ -32,7 +32,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	];
 	
 	// 门诊支持离体并固定
-	immobilization:any[] = [
+	outpatientInVitroFixation:any[] = [
 	  {label:'是否开启',value: 0}
 	];
 	
@@ -175,7 +175,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		  taskType: this.taskTypeData.id,
 		  hosId: this.hosId,
 		  autoCreate: this.autoCreate[0].checked ? 1 : 0,
-			immobilization: this.immobilization[0].checked ? 1 : 0,
+			outpatientInVitroFixation: this.outpatientInVitroFixation[0].checked ? 1 : 0,
 		};
 		this.btnLoading = true;
 		this.mainService
@@ -297,7 +297,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
           this.configs = result.list[0] || {};
 					// 病理标本
 					this.autoCreate[0].checked = this.configs.autoCreate == 1;
-					this.immobilization[0].checked = this.configs.immobilization == 1;
+					this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
 					// 检查标本
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;

src/app/services/main.service.ts

@@ -1038,5 +1038,11 @@ export class MainService {
 	    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

@@ -156,7 +156,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 +166,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 +176,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"

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

@@ -227,6 +227,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,
@@ -235,16 +236,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({
@@ -258,21 +260,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)
+					}
+			  });
+		}
+
 	}
 	
 	// 删除标本
@@ -311,18 +335,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]],
@@ -340,10 +374,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()
+		}
 	}
 	
 	// 选择位置来源
@@ -393,17 +436,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){
@@ -413,10 +445,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
@@ -424,7 +452,6 @@ export class PathologyAddComponent implements OnInit {
 				namn = item.name
 			}
 			this.validateSpecimenForm.controls.specimenName.setValue(namn);
-		// }
 	}
 	
 	// 保存标本
@@ -432,19 +459,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
 		}
@@ -480,12 +510,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'
@@ -504,10 +528,8 @@ export class PathologyAddComponent implements OnInit {
 					setTimeout(_=>{
 						this.closeSpecimenModel()
 					},200)
-		      // this.showSpecimenModal("操作", true, "");
 		    } else {
 					this.message.error(res.msg)
-		      // this.showSpecimenModal("操作", false, res.msg);
 		    }
 		  });
 	}
@@ -534,12 +556,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'
@@ -548,11 +564,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({
@@ -565,10 +579,6 @@ export class PathologyAddComponent implements OnInit {
 					
 					this.placeIndex = null;
 					this.placeId = null;
-					
-					// this.specimenNameList=[]; //标本名称数据
-					// this.specimenNameName = null;
-					
 					this.addSpLoading = false;
 					this.addMadal = false;
 					
@@ -615,11 +625,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);