拉取代码

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -336,14 +336,19 @@ export class HushijiandanComponent implements OnInit {
 	// 新增申请单自选类型
 	applicationType:any;
 	addPathologyType(type){
-		this.surgeryDataId = this.surgeryWKOMsg.id
-		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		if(this.openType=='btn'){
+			this.surgeryDataId = this.surgeryWKOMsg.id
+			this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		}else{
+			this.surgeryDataId = this.scheduleItem.id
+			this.patientDataId = this.scheduleItem.patientDTO.id
+		}
 		this.applicationType = type
 		let data = {
 			idx: 0,
 			sum: 9999,
-			surgeryId: this.surgeryWKOMsg.id || "",
-			patientId: this.surgeryWKOMsg.patientDTO.id || "",
+			surgeryId: this.surgeryDataId || "",
+			patientId: this.patientDataId || "",
 			hosId: this.currentHospital.id || "" ,
 			operationType: 'pathologyForm',
 			pathologyFormType: type
@@ -358,9 +363,13 @@ export class HushijiandanComponent implements OnInit {
 	}
 	
 	// 手术排程-病理申请单
+	openType:any;
+	scheduleItem:any;
 	pathologyAddItem(e,item){
-		this.surgeryDataId = item.id
-		this.patientDataId = item.patientDTO.id
+		this.openType = 'schedule'
+		this.scheduleItem = item
+		// this.surgeryDataId = item.id
+		// this.patientDataId = item.patientDTO.id
 		let data = {
 			idx: 0,
 			sum: 9999,
@@ -419,6 +428,7 @@ export class HushijiandanComponent implements OnInit {
 	isSpinning:any = false;
 	viewData:any = [];
 	pathologyAdd(e){
+		this.openType = 'btn'
 		this.surgeryDataId = this.surgeryWKOMsg.id
 		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
 		let data = {
@@ -471,7 +481,6 @@ export class HushijiandanComponent implements OnInit {
 						}
 					}
 				}
-				console.log(777,this.viewData)
 				this.multiDialog = true
 			}else if(data.list.length==0){
 				this.message.error('无申请单')