|
@@ -2653,10 +2653,11 @@ export class FuwutaiComponent implements OnInit {
|
2653
|
2653
|
if(this.currentTabIndex === '患者转运'){
|
2654
|
2654
|
console.log(this.workTypesArrange);
|
2655
|
2655
|
let obj = this.workTypesArrange.find(v => v.key == this.currentTabIndex);
|
|
2656
|
+ let tabIndex = this.workTypesArrange.findIndex(v => v.key == this.currentTabIndex);
|
2656
|
2657
|
let arr = obj.value || [];
|
2657
|
2658
|
let index = arr.findIndex(v => v.associationTypeValue === 'inspect');
|
2658
|
2659
|
let o = arr.find(v => v.associationTypeValue === 'inspect');
|
2659
|
|
- o && this.radioChangeZy(o.id, index);
|
|
2660
|
+ o && this.radioChangeZy(o.id, tabIndex);
|
2660
|
2661
|
}
|
2661
|
2662
|
}
|
2662
|
2663
|
// 点击tab切换
|
|
@@ -4542,8 +4543,8 @@ export class FuwutaiComponent implements OnInit {
|
4542
|
4543
|
this.startDeptZy = null;
|
4543
|
4544
|
this.endDeptZy = null;
|
4544
|
4545
|
// 患者陪检-则参数增加patientCode
|
4545
|
|
- let currentTab = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
|
4546
|
|
- let taskType = currentTab.value[index];
|
|
4546
|
+ console.log(this.workTypesArrange[index].value);
|
|
4547
|
+ let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
|
4547
|
4548
|
let patientCode;
|
4548
|
4549
|
if(taskType.associationTypeValue === 'inspect'){
|
4549
|
4550
|
patientCode = this.patientZy;
|
|
@@ -5716,8 +5717,7 @@ export class FuwutaiComponent implements OnInit {
|
5716
|
5717
|
if(this.tabIndex !== undefined && this.currentTasktype && this.currentTasktype.associationType.value === 'inspect'){
|
5717
|
5718
|
let index = this.tabIndex;
|
5718
|
5719
|
let value = this.currentTasktype.id;
|
5719
|
|
- let currentTab = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
|
5720
|
|
- let taskType = currentTab.value[index];
|
|
5720
|
+ let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
|
5721
|
5721
|
let patientCode;
|
5722
|
5722
|
if(taskType.associationTypeValue === 'inspect'){
|
5723
|
5723
|
patientCode = this.patientZy;
|