|
|
@@ -137,6 +137,7 @@ export class FuwutaiComponent implements OnInit {
|
|
137
|
137
|
workTypesFlag = false; //任务类型是否显示操作项
|
|
138
|
138
|
currentTabIndex = ""; //获取任务类型的key
|
|
139
|
139
|
radioValueZy: any = ""; //转运->类型
|
|
|
140
|
+ radioValueZyPre: any = ""; //转运->类型
|
|
140
|
141
|
deptZyList: any = {}; //转运->请求结果
|
|
141
|
142
|
startDeptZy = ""; //转运->选中起点科室
|
|
142
|
143
|
endDeptZy = ""; //转运->选中终点科室
|
|
|
@@ -2649,6 +2650,7 @@ export class FuwutaiComponent implements OnInit {
|
|
2649
|
2650
|
this.startDeptQt = null;
|
|
2650
|
2651
|
this.endDeptQt = null;
|
|
2651
|
2652
|
this.radioValueZy = null;
|
|
|
2653
|
+ this.radioValueZyPre = null;
|
|
2652
|
2654
|
this.startDeptZy = null;
|
|
2653
|
2655
|
this.endDeptZy = null;
|
|
2654
|
2656
|
this.patientZy = null;
|
|
|
@@ -2739,6 +2741,8 @@ export class FuwutaiComponent implements OnInit {
|
|
2739
|
2741
|
patient.department && this.tabClick('患者转运');
|
|
2740
|
2742
|
patient.department && (this.patientList = [patient]);
|
|
2741
|
2743
|
patient.department && (this.patientZy = patient.patientCode);
|
|
|
2744
|
+ }else{
|
|
|
2745
|
+ this.msg.warning('未查询到患者');
|
|
2742
|
2746
|
}
|
|
2743
|
2747
|
}
|
|
2744
|
2748
|
});
|
|
|
@@ -3575,6 +3579,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3575
|
3579
|
this.startDeptQt = null;
|
|
3576
|
3580
|
this.endDeptQt = null;
|
|
3577
|
3581
|
this.radioValueZy = null;
|
|
|
3582
|
+ this.radioValueZyPre = null;
|
|
3578
|
3583
|
this.startDeptZy = null;
|
|
3579
|
3584
|
this.endDeptZy = null;
|
|
3580
|
3585
|
this.patientZy = null;
|
|
|
@@ -4030,23 +4035,23 @@ export class FuwutaiComponent implements OnInit {
|
|
4030
|
4035
|
this.getSearchTaskList('', this.countRemarkIndex > -1 ? countRemark : '').subscribe((result) => {
|
|
4031
|
4036
|
if (result.status == 200) {
|
|
4032
|
4037
|
this.searchTaskLoading = false;
|
|
4033
|
|
- // this.workTypesArrange[index].value = result.data || [];
|
|
4034
|
4038
|
this.workTypes = result['data'] || [];
|
|
4035
|
4039
|
// 整理后的任务类型
|
|
4036
|
4040
|
this.isShowResidenceNo = false;
|
|
4037
|
|
- for (const value of this.workTypesArrange) {
|
|
4038
|
|
- value.value = [];
|
|
4039
|
|
- }
|
|
|
4041
|
+ this.workTypesArrange[index].value = [];
|
|
|
4042
|
+ // for (const value of this.workTypesArrange) {
|
|
|
4043
|
+ // value.value = [];
|
|
|
4044
|
+ // }
|
|
4040
|
4045
|
this.workTypes.forEach((item) => {
|
|
4041
|
4046
|
if(item.associationTypeValue === 'patientTransport' || item.associationTypeValue === 'inspect'){
|
|
4042
|
|
- // 患者其他服务
|
|
4043
|
|
- let obj = this.workTypesArrange.find(v => v.key === '患者转运');
|
|
4044
|
|
- if(obj){
|
|
4045
|
|
- obj.value.push(item);
|
|
4046
|
|
- }else{
|
|
4047
|
|
- this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
|
|
4048
|
|
- this.isShowResidenceNo = true;
|
|
4049
|
|
- }
|
|
|
4047
|
+ // // 患者其他服务
|
|
|
4048
|
+ // let obj = this.workTypesArrange.find(v => v.key === '患者转运');
|
|
|
4049
|
+ // if(obj){
|
|
|
4050
|
+ // obj.value.push(item);
|
|
|
4051
|
+ // }else{
|
|
|
4052
|
+ // this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
|
|
|
4053
|
+ // this.isShowResidenceNo = true;
|
|
|
4054
|
+ // }
|
|
4050
|
4055
|
}else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
|
|
4051
|
4056
|
// 物品配送
|
|
4052
|
4057
|
let obj = this.workTypesArrange.find(v => v.key === '物品配送');
|
|
|
@@ -4143,21 +4148,11 @@ export class FuwutaiComponent implements OnInit {
|
|
4143
|
4148
|
if (!this.applyDept || !this.endDeptZy) {
|
|
4144
|
4149
|
return;
|
|
4145
|
4150
|
}
|
|
4146
|
|
- // 终点科室患者信息列表,id是送病人回病房的任务类型，写死了
|
|
|
4151
|
+ // 终点科室患者信息列表,id是送病人回病房的任务类型
|
|
4147
|
4152
|
if (this.radioValueZy == this.deathTasktypeId) {
|
|
4148
|
4153
|
//获取患者信息
|
|
4149
|
4154
|
this.patientZy = null;
|
|
4150
|
4155
|
this.getPatientList(this.endDeptZy, "");
|
|
4151
|
|
- } else {
|
|
4152
|
|
- //获取患者信息
|
|
4153
|
|
- console.log(this.deptZyList);
|
|
4154
|
|
- if (
|
|
4155
|
|
- this.deptZyList.startStatus != 206 &&
|
|
4156
|
|
- this.deptZyList.endStatus != 206
|
|
4157
|
|
- ) {
|
|
4158
|
|
- this.patientZy = null;
|
|
4159
|
|
- }
|
|
4160
|
|
- this.getPatientList(this.applyDept, "");
|
|
4161
|
4156
|
}
|
|
4162
|
4157
|
}
|
|
4163
|
4158
|
//搜索院区下面的科室(患者转运)
|
|
|
@@ -4509,6 +4504,9 @@ export class FuwutaiComponent implements OnInit {
|
|
4509
|
4504
|
linkCheckLis:any[] = [];//检查列表
|
|
4510
|
4505
|
tabIndex;
|
|
4511
|
4506
|
radioChangeZy(value, index) {
|
|
|
4507
|
+ this.radioValueZyPre = this.radioValueZy;
|
|
|
4508
|
+ this.radioValueZy = value;
|
|
|
4509
|
+
|
|
4512
|
4510
|
this.tabIndex = index;
|
|
4513
|
4511
|
//任务类型id
|
|
4514
|
4512
|
if (value === "" || value === null) {
|
|
|
@@ -4595,12 +4593,16 @@ export class FuwutaiComponent implements OnInit {
|
|
4595
|
4593
|
} else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
|
|
4596
|
4594
|
this.getHosDepartment(this.checkedHos, "end", "");
|
|
4597
|
4595
|
}
|
|
4598
|
|
- // 终点科室患者信息列表,id是送病人回病房的任务类型
|
|
4599
|
|
- if ((data["endStatus"] == 201 || data["endStatus"] == 203) && this.radioValueZy == this.deathTasktypeId) {
|
|
4600
|
|
- if (this.currentTabIndex == "患者转运") {
|
|
4601
|
|
- //患者转运
|
|
|
4596
|
+ if (this.currentTabIndex == "患者转运") {
|
|
|
4597
|
+ // 终点科室患者信息列表,id是送病人回病房的任务类型
|
|
|
4598
|
+ if (this.endDeptZy && this.radioValueZy == this.deathTasktypeId) {
|
|
4602
|
4599
|
//获取患者信息
|
|
|
4600
|
+ this.patientZy = null;
|
|
4603
|
4601
|
this.getPatientList(this.endDeptZy, "");
|
|
|
4602
|
+ } else if(this.applyDept && this.radioValueZyPre == this.deathTasktypeId) {
|
|
|
4603
|
+ //获取患者信息
|
|
|
4604
|
+ this.patientZy = null;
|
|
|
4605
|
+ this.getPatientList(this.applyDept, "");
|
|
4604
|
4606
|
}
|
|
4605
|
4607
|
}
|
|
4606
|
4608
|
});
|
|
|
@@ -4741,6 +4743,7 @@ export class FuwutaiComponent implements OnInit {
|
|
4741
|
4743
|
this.startDeptQt = null;
|
|
4742
|
4744
|
this.endDeptQt = null;
|
|
4743
|
4745
|
this.radioValueZy = null;
|
|
|
4746
|
+ this.radioValueZyPre = null;
|
|
4744
|
4747
|
this.startDeptZy = null;
|
|
4745
|
4748
|
this.endDeptZy = null;
|
|
4746
|
4749
|
this.patientZy = null;
|
seimin