Merge branch 'master' into develop

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2988,7 +2988,7 @@
 		<div class="title">多条申请单提示<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
 		</div>
 		<div class="content">
-			<div class="weight">
+			<div class="weight" *ngIf="viewData.length>0">
 				提示：查询到{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）患者有多条申请单，请选择对应申请单
 			</div>
 			<div class="list-template__bottom">

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

@@ -339,14 +339,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
@@ -361,9 +366,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,
@@ -422,6 +431,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 = {
@@ -449,7 +459,6 @@ export class HushijiandanComponent implements OnInit {
 					}
 				}
 			}
-			console.log(777,this.viewData)
 			this.multiDialog = true
 			return
 			if(data.list.length==1){
@@ -475,7 +484,6 @@ export class HushijiandanComponent implements OnInit {
 						}
 					}
 				}
-				console.log(777,this.viewData)
 				this.multiDialog = true
 			}else if(data.list.length==0){
 				this.message.error('无申请单')