|
@@ -627,7 +627,9 @@ export class TaskTypeManagementComponent implements OnInit {
|
627
|
627
|
this.integralDetailedRulesData[1]["taskTypeId"] = data.id;
|
628
|
628
|
}
|
629
|
629
|
if (this.tabModalName == "ysgc") {
|
630
|
|
- this.getDepartment();
|
|
630
|
+ this.getDepartment().subscribe((res) => {
|
|
631
|
+ this.departmentData = res;
|
|
632
|
+ });
|
631
|
633
|
this.getcheckout();
|
632
|
634
|
if (data.associationType.value == "specimen" && this.indexs == 0) {
|
633
|
635
|
this.depaShow3 = true;
|
|
@@ -1284,9 +1286,11 @@ export class TaskTypeManagementComponent implements OnInit {
|
1284
|
1286
|
this.getCourseList(this.pageSize);
|
1285
|
1287
|
} else if (name == "ysgc") {
|
1286
|
1288
|
this.patient_level();
|
1287
|
|
- this.getDepartment();
|
1288
|
|
- this.getcheckout();
|
1289
|
|
- this.itemChoice(this.allTaskType[this.index], this.index);
|
|
1289
|
+ this.getDepartment().subscribe((res) => {
|
|
1290
|
+ this.departmentData = res;
|
|
1291
|
+ this.getcheckout();
|
|
1292
|
+ this.itemChoice(this.allTaskType[this.index], this.index);
|
|
1293
|
+ });
|
1290
|
1294
|
}
|
1291
|
1295
|
}
|
1292
|
1296
|
//数据计算
|
|
@@ -1591,9 +1595,7 @@ export class TaskTypeManagementComponent implements OnInit {
|
1591
|
1595
|
this.mrksType = "department_strategy_other";
|
1592
|
1596
|
}
|
1593
|
1597
|
|
1594
|
|
- that.mainService.getDictionary("list", this.mrksType).subscribe((data) => {
|
1595
|
|
- this.departmentData = data;
|
1596
|
|
- });
|
|
1598
|
+ return that.mainService.getDictionary("list", this.mrksType);
|
1597
|
1599
|
}
|
1598
|
1600
|
//检验方式获取
|
1599
|
1601
|
yNum = 0;
|
|
@@ -1697,15 +1699,17 @@ export class TaskTypeManagementComponent implements OnInit {
|
1697
|
1699
|
} else {
|
1698
|
1700
|
this.depaShow6 = false;
|
1699
|
1701
|
}
|
1700
|
|
- this.getDepartment();
|
1701
|
1702
|
this.getcheckout();
|
1702
|
|
- this.ysgcData(this.carryingCourses[this.indexs]);
|
1703
|
|
- this.depa(
|
1704
|
|
- this.carryingCourses[this.indexs].departmentStrategy,
|
1705
|
|
- this.carryingCourses[this.indexs].departmentStrategy.id +
|
1706
|
|
- "__" +
|
1707
|
|
- this.carryingCourses[this.indexs].departmentStrategy.value
|
1708
|
|
- );
|
|
1703
|
+ this.getDepartment().subscribe((res) => {
|
|
1704
|
+ this.departmentData = res;
|
|
1705
|
+ this.ysgcData(this.carryingCourses[this.indexs]);
|
|
1706
|
+ this.depa(
|
|
1707
|
+ this.carryingCourses[this.indexs].departmentStrategy,
|
|
1708
|
+ this.carryingCourses[this.indexs].departmentStrategy.id +
|
|
1709
|
+ "__" +
|
|
1710
|
+ this.carryingCourses[this.indexs].departmentStrategy.value
|
|
1711
|
+ );
|
|
1712
|
+ });
|
1709
|
1713
|
}
|
1710
|
1714
|
//处理运送过程字段
|
1711
|
1715
|
ysgcData(data) {
|