|
|
@@ -128,7 +128,7 @@ export class FuwutaiComponent implements OnInit {
|
|
128
|
128
|
applicationDepartmentList = []; //新建工单->申请科室列表（搜索）
|
|
129
|
129
|
callNumber = ""; //来电号码
|
|
130
|
130
|
workTypes = []; //任务类型
|
|
131
|
|
- workTypesArrange = {}; //整理后的任务类型
|
|
|
131
|
+ workTypesArrange = []; //整理后的任务类型
|
|
132
|
132
|
workTypesFlag = false; //任务类型是否显示操作项
|
|
133
|
133
|
currentTabIndex = ""; //获取任务类型的key
|
|
134
|
134
|
radioValueZy: any = ""; //转运->类型
|
|
|
@@ -395,7 +395,7 @@ export class FuwutaiComponent implements OnInit {
|
|
395
|
395
|
|
|
396
|
396
|
// 预约日期
|
|
397
|
397
|
let yyTime1;
|
|
398
|
|
- if(this.isYyInspect && this.currentTabIndex == '255'){
|
|
|
398
|
+ if(this.isYyInspect && this.currentTabIndex == '患者转运'){
|
|
399
|
399
|
let yyDateZy = (typeof this.yyDateZy === 'object') ? new Date(this.yyDateZy) : parse(this.yyDateZy, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
400
|
400
|
let yyTimeZy = (typeof this.yyTimeZy === 'object') ? new Date(this.yyTimeZy) : parse(this.yyTimeZy, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
401
|
401
|
yyTime1 = format(yyDateZy, "yyyy-MM-dd") + " " + format(yyTimeZy, "HH:mm") + ":00";
|
|
|
@@ -455,7 +455,7 @@ export class FuwutaiComponent implements OnInit {
|
|
455
|
455
|
workOrder: {
|
|
456
|
456
|
sourceId: SourceId.fuwutai,
|
|
457
|
457
|
taskType: {
|
|
458
|
|
- id: this.workTypesArrange[this.currentTabIndex][0].taskType.id,
|
|
|
458
|
+ id: this.validateFormQt.controls.taskTypeQt.value,
|
|
459
|
459
|
},
|
|
460
|
460
|
startDept: {
|
|
461
|
461
|
id: this.applyDept,
|
|
|
@@ -500,7 +500,7 @@ export class FuwutaiComponent implements OnInit {
|
|
500
|
500
|
|
|
501
|
501
|
// 预约日期
|
|
502
|
502
|
let yyTime1;
|
|
503
|
|
- if(this.isYyInspect && this.currentTabIndex == '259'){
|
|
|
503
|
+ if(this.isYyInspect && this.currentTabIndex == '物品配送'){
|
|
504
|
504
|
let yyDate = (typeof this.yyDate === 'object') ? new Date(this.yyDate) : parse(this.yyDate, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
505
|
505
|
let yyTime = (typeof this.yyTime === 'object') ? new Date(this.yyTime) : parse(this.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
506
|
506
|
yyTime1 = format(yyDate, "yyyy-MM-dd") + " " + format(yyTime, "HH:mm") + ":00";
|
|
|
@@ -548,6 +548,60 @@ export class FuwutaiComponent implements OnInit {
|
|
548
|
548
|
}
|
|
549
|
549
|
});
|
|
550
|
550
|
}
|
|
|
551
|
+ // 万能交接表单提交
|
|
|
552
|
+ submitFormOrdinary(go?) {
|
|
|
553
|
+ for (const i in this.validateFormQt.controls) {
|
|
|
554
|
+ this.validateFormQt.controls[i].markAsDirty();
|
|
|
555
|
+ this.validateFormQt.controls[i].updateValueAndValidity();
|
|
|
556
|
+ if (!this.validateFormQt.controls[i].valid) {
|
|
|
557
|
+ this.isOkLoading = false;
|
|
|
558
|
+ this.isGoLoading = false;
|
|
|
559
|
+ return;
|
|
|
560
|
+ }
|
|
|
561
|
+ }
|
|
|
562
|
+
|
|
|
563
|
+ let postData = {
|
|
|
564
|
+ workOrder: {
|
|
|
565
|
+ sourceId: SourceId.fuwutai,
|
|
|
566
|
+ workOrderRemark: this.validateFormQt.controls.workOrderRemark.value,
|
|
|
567
|
+ taskType: {
|
|
|
568
|
+ id: this.validateFormQt.controls.taskTypeQt.value,
|
|
|
569
|
+ },
|
|
|
570
|
+ startDept: {
|
|
|
571
|
+ id: this.validateFormQt.controls.startDeptQt.value,
|
|
|
572
|
+ },
|
|
|
573
|
+ createDept: this.applyDept,
|
|
|
574
|
+ endDepts: [
|
|
|
575
|
+ {
|
|
|
576
|
+ id: this.validateFormQt.controls.endDeptsQt.value,
|
|
|
577
|
+ },
|
|
|
578
|
+ ],
|
|
|
579
|
+ },
|
|
|
580
|
+ };
|
|
|
581
|
+ if (!this.noWorkerPhone) {
|
|
|
582
|
+ postData.workOrder["workOrderPhone"] = this.callNumber;
|
|
|
583
|
+ }
|
|
|
584
|
+ this.mainService.buildOrder(postData).subscribe((data) => {
|
|
|
585
|
+ this.isOkLoading = false;
|
|
|
586
|
+ this.isGoLoading = false;
|
|
|
587
|
+ if (data["status"] == 200) {
|
|
|
588
|
+ this.newOrderShow = false; //关闭弹窗
|
|
|
589
|
+ if (go === "&go&") {
|
|
|
590
|
+ this.applyDept = data["startDept"].id;
|
|
|
591
|
+ this.applyStartDept = data["startDept"];
|
|
|
592
|
+ this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
|
|
|
593
|
+ this.showPromptModal("建单", true, "", "closeGo");
|
|
|
594
|
+ } else {
|
|
|
595
|
+ if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
|
|
|
596
|
+ this.jry_shixian();
|
|
|
597
|
+ }
|
|
|
598
|
+ this.showPromptModal("建单", true, "", "close");
|
|
|
599
|
+ }
|
|
|
600
|
+ } else {
|
|
|
601
|
+ this.showPromptModal("建单", false, data["msg"]);
|
|
|
602
|
+ }
|
|
|
603
|
+ });
|
|
|
604
|
+ }
|
|
551
|
605
|
// 核酸打印
|
|
552
|
606
|
nucleicAcidLoading = false;
|
|
553
|
607
|
nucleicAcidList: any = [];
|
|
|
@@ -2397,7 +2451,7 @@ export class FuwutaiComponent implements OnInit {
|
|
2397
|
2451
|
this.searchTaskLoading = false;
|
|
2398
|
2452
|
this.searchTaskList = result.data;
|
|
2399
|
2453
|
this.searchTaskList.forEach((item) => {
|
|
2400
|
|
- item.sid = item.associationTypeId + "_" + item.id;
|
|
|
2454
|
+ item.sid = item.associationTypeId + "_" + item.id + "_" + item.associationTypeValue;
|
|
2401
|
2455
|
});
|
|
2402
|
2456
|
// if(phone){
|
|
2403
|
2457
|
// this.getAutoWorkTypes(true, isInit);
|
|
|
@@ -2411,13 +2465,14 @@ export class FuwutaiComponent implements OnInit {
|
|
2411
|
2465
|
// 获取可选择的任务类型列表
|
|
2412
|
2466
|
searchTaskList;
|
|
2413
|
2467
|
searchTaskLoading = false;
|
|
2414
|
|
- getSearchTaskList(keyword) {
|
|
|
2468
|
+ getSearchTaskList(keyword, countRemark) {
|
|
2415
|
2469
|
if(!this.hsmsData.hsmsSwitch){
|
|
2416
|
2470
|
return;
|
|
2417
|
2471
|
}
|
|
2418
|
2472
|
this.searchTaskLoading = true;
|
|
2419
|
2473
|
return this.mainService.getTaskTypeBySearchKey({
|
|
2420
|
|
- searchKey: keyword,
|
|
|
2474
|
+ searchKey: keyword || undefined,
|
|
|
2475
|
+ countRemark: countRemark || undefined,
|
|
2421
|
2476
|
hosId: this.checkedHos,
|
|
2422
|
2477
|
});
|
|
2423
|
2478
|
}
|
|
|
@@ -2455,7 +2510,7 @@ export class FuwutaiComponent implements OnInit {
|
|
2455
|
2510
|
this.deptQtList["startStatus"] = 0;
|
|
2456
|
2511
|
this.deptQtList["endStatus"] = 0;
|
|
2457
|
2512
|
|
|
2458
|
|
- if(preCurrentTabIndex === '99999'){
|
|
|
2513
|
+ if(preCurrentTabIndex === '故障报修'){
|
|
2459
|
2514
|
if(this.applyDept){
|
|
2460
|
2515
|
this.rightTitle_tab = [
|
|
2461
|
2516
|
{ id: 0, name: '近期配送' },
|
|
|
@@ -2470,7 +2525,7 @@ export class FuwutaiComponent implements OnInit {
|
|
2470
|
2525
|
this.applyDept = this.incidentModel.department;
|
|
2471
|
2526
|
this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
|
|
2472
|
2527
|
}
|
|
2473
|
|
- }else if(this.currentTabIndex === '99999'){
|
|
|
2528
|
+ }else if(this.currentTabIndex === '故障报修'){
|
|
2474
|
2529
|
if(this.incidentModel.department){
|
|
2475
|
2530
|
this.rightTitle_tab = [
|
|
2476
|
2531
|
{ id: 2, name: '近期维修' },
|
|
|
@@ -2509,7 +2564,7 @@ export class FuwutaiComponent implements OnInit {
|
|
2509
|
2564
|
|
|
2510
|
2565
|
// tab任务类型向左移动
|
|
2511
|
2566
|
toLeft() {
|
|
2512
|
|
- let maxStep = Object.keys(this.workTypesArrange).length - 5;
|
|
|
2567
|
+ let maxStep = this.workTypesArrange.length - 5;
|
|
2513
|
2568
|
this.disStep = Math.max(-maxStep, --this.disStep);
|
|
2514
|
2569
|
this.disX = (this.disStep * this.elementView.nativeElement.offsetWidth) / 5;
|
|
2515
|
2570
|
}
|
|
|
@@ -3213,7 +3268,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3213
|
3268
|
console.log(e, this.applicationDepartmentList);
|
|
3214
|
3269
|
this.changeApplicationDepartment("&same&");
|
|
3215
|
3270
|
|
|
3216
|
|
- if(this.applyDept && this.currentTabIndex !== '99999'){
|
|
|
3271
|
+ if(this.applyDept && this.currentTabIndex !== '故障报修'){
|
|
3217
|
3272
|
this.rightTitle_tab = [
|
|
3218
|
3273
|
{ id: 0, name: '近期配送' },
|
|
3219
|
3274
|
{ id: 1, name: '转出院记录' },
|
|
|
@@ -3232,7 +3287,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3232
|
3287
|
changeApplyDept(e) {
|
|
3233
|
3288
|
console.log(e, this.applicationDeptList);
|
|
3234
|
3289
|
|
|
3235
|
|
- if(this.incidentModel.department && this.currentTabIndex === '99999'){
|
|
|
3290
|
+ if(this.incidentModel.department && this.currentTabIndex === '故障报修'){
|
|
3236
|
3291
|
this.rightTitle_tab = [
|
|
3237
|
3292
|
{ id: 2, name: '近期维修' },
|
|
3238
|
3293
|
{ id: 3, name: '知识库' },
|
|
|
@@ -3353,7 +3408,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3353
|
3408
|
console.log('filter', filter)
|
|
3354
|
3409
|
// this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = filter[0].phone;
|
|
3355
|
3410
|
console.log(this.callNumber); //ceshi
|
|
3356
|
|
- if (this.currentTabIndex == "255") {
|
|
|
3411
|
+ if (this.currentTabIndex == "患者转运") {
|
|
3357
|
3412
|
//患者转运
|
|
3358
|
3413
|
//获取患者信息
|
|
3359
|
3414
|
this.getPatientList(this.applyDept, "");
|
|
|
@@ -3368,7 +3423,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3368
|
3423
|
this.getDictionaryList();
|
|
3369
|
3424
|
}
|
|
3370
|
3425
|
} else if (phone === "&go&") {
|
|
3371
|
|
- if (this.currentTabIndex == "255") {
|
|
|
3426
|
+ if (this.currentTabIndex == "患者转运") {
|
|
3372
|
3427
|
//患者转运
|
|
3373
|
3428
|
//获取患者信息
|
|
3374
|
3429
|
this.getPatientList(this.applyDept, "");
|
|
|
@@ -3383,7 +3438,7 @@ export class FuwutaiComponent implements OnInit {
|
|
3383
|
3438
|
this.getDictionaryList();
|
|
3384
|
3439
|
}
|
|
3385
|
3440
|
} else if (phone === "&same&") {
|
|
3386
|
|
- if (this.currentTabIndex == "255") {
|
|
|
3441
|
+ if (this.currentTabIndex == "患者转运") {
|
|
3387
|
3442
|
//患者转运
|
|
3388
|
3443
|
//获取患者信息
|
|
3389
|
3444
|
this.getPatientList(this.applyDept, "");
|
|
|
@@ -3745,48 +3800,87 @@ export class FuwutaiComponent implements OnInit {
|
|
3745
|
3800
|
}
|
|
3746
|
3801
|
}
|
|
3747
|
3802
|
|
|
|
3803
|
+ // 选择统计备注
|
|
|
3804
|
+ countRemarkIndex:number = -1;
|
|
|
3805
|
+ addCountRemark(countRemark, index, i){
|
|
|
3806
|
+ if(this.countRemarkIndex == i){
|
|
|
3807
|
+ this.countRemarkIndex = -1;
|
|
|
3808
|
+ }else{
|
|
|
3809
|
+ this.countRemarkIndex = i;
|
|
|
3810
|
+ }
|
|
|
3811
|
+
|
|
|
3812
|
+ this.getSearchTaskList('', this.countRemarkIndex > -1 ? countRemark : '').subscribe((result) => {
|
|
|
3813
|
+ if (result.status == 200) {
|
|
|
3814
|
+ this.searchTaskLoading = false;
|
|
|
3815
|
+ this.workTypesArrange[index].value = result.data || [];
|
|
|
3816
|
+ }
|
|
|
3817
|
+ });
|
|
|
3818
|
+ }
|
|
|
3819
|
+
|
|
3748
|
3820
|
// 新建工单->获取新建类型
|
|
|
3821
|
+ countRemarkList:any[] = [];
|
|
3749
|
3822
|
getAutoWorkTypes(isFirst, isInit) {
|
|
3750
|
|
- this.workTypesArrange = {};
|
|
|
3823
|
+ this.workTypesArrange = [];
|
|
3751
|
3824
|
// 运维
|
|
3752
|
3825
|
if(this.itsmData.mdv2Switch){
|
|
3753
|
|
- this.workTypesArrange = { 99999: [{associationTypeName: '故障报修'}] };
|
|
|
3826
|
+ this.workTypesArrange = [{key:'故障报修', value: []}];
|
|
3754
|
3827
|
if(!this.hsmsData.hsmsSwitch){
|
|
3755
|
3828
|
console.log('workTypesArrange', this.workTypesArrange);
|
|
3756
|
3829
|
// 是否显示操作项
|
|
3757
|
|
- this.workTypesFlag = Object.keys(this.workTypesArrange).length >= 5;
|
|
|
3830
|
+ this.workTypesFlag = this.workTypesArrange.length >= 5;
|
|
3758
|
3831
|
// 默认选中第一项
|
|
3759
|
|
- if (Object.keys(this.workTypesArrange).length > 0) {
|
|
3760
|
|
- this.tabClick(Object.keys(this.workTypesArrange)[0], isInit);
|
|
|
3832
|
+ if (this.workTypesArrange.length > 0) {
|
|
|
3833
|
+ this.tabClick(this.workTypesArrange[0].key, isInit);
|
|
3761
|
3834
|
}
|
|
3762
|
3835
|
}
|
|
3763
|
3836
|
}
|
|
3764
|
3837
|
// 配送
|
|
3765
|
3838
|
if(this.hsmsData.hsmsSwitch){
|
|
3766
|
3839
|
this.newLoading = true;
|
|
3767
|
|
- this.mainService.getAutoWorkTypes(this.checkedHos).subscribe((data) => {
|
|
|
3840
|
+ this.mainService.getTaskTypeBySearchKey({
|
|
|
3841
|
+ hosId: this.checkedHos,
|
|
|
3842
|
+ }).subscribe((data) => {
|
|
3768
|
3843
|
this.newLoading = false;
|
|
3769
|
3844
|
if (data["status"] == 200) {
|
|
3770
|
3845
|
this.workTypes = data["data"];
|
|
3771
|
3846
|
// 整理后的任务类型
|
|
3772
|
3847
|
this.workTypes.forEach((item) => {
|
|
3773
|
|
- if (this.workTypesArrange[item.associationTypeId]) {
|
|
3774
|
|
- this.workTypesArrange[item.associationTypeId].push(item);
|
|
3775
|
|
- } else {
|
|
3776
|
|
- this.workTypesArrange[item.associationTypeId] = [];
|
|
3777
|
|
- this.workTypesArrange[item.associationTypeId].push(item);
|
|
|
3848
|
+ if(item.associationTypeValue === 'patientTransport'){
|
|
|
3849
|
+ // 患者其他服务
|
|
|
3850
|
+ let obj = this.workTypesArrange.find(v => v.key === '患者转运');
|
|
|
3851
|
+ if(obj){
|
|
|
3852
|
+ obj.value.push(item);
|
|
|
3853
|
+ }else{
|
|
|
3854
|
+ this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
|
|
|
3855
|
+ }
|
|
|
3856
|
+ }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
|
|
|
3857
|
+ // 物品配送
|
|
|
3858
|
+ let obj = this.workTypesArrange.find(v => v.key === '物品配送');
|
|
|
3859
|
+ if(obj){
|
|
|
3860
|
+ obj.value.push(item);
|
|
|
3861
|
+ }else{
|
|
|
3862
|
+ this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
|
|
|
3863
|
+ }
|
|
3778
|
3864
|
}
|
|
3779
|
3865
|
});
|
|
3780
|
3866
|
console.log('workTypesArrange', this.workTypesArrange);
|
|
3781
|
3867
|
// 任务类型是否显示操作项
|
|
3782
|
|
- let arr = Object.keys(this.workTypesArrange);
|
|
|
3868
|
+ let arr = this.workTypesArrange;
|
|
3783
|
3869
|
this.workTypesFlag = arr.length >= 5;
|
|
3784
|
3870
|
// 默认选中第一项
|
|
3785
|
3871
|
if (arr.length > 0) {
|
|
3786
|
|
- isFirst ? this.tabClick(arr[0], isInit) : this.tabClick(arr[arr.length - 1], isInit);
|
|
|
3872
|
+ isFirst ? this.tabClick(arr[0].key, isInit) : this.tabClick(arr[arr.length - 1].key, isInit);
|
|
3787
|
3873
|
}
|
|
3788
|
3874
|
}
|
|
3789
|
3875
|
});
|
|
|
3876
|
+
|
|
|
3877
|
+ this.mainService.getTaskTypeCountRemarkList({
|
|
|
3878
|
+ hosId: this.checkedHos,
|
|
|
3879
|
+ }).subscribe((data) => {
|
|
|
3880
|
+ if (data["status"] == 200){
|
|
|
3881
|
+ this.countRemarkList = data.data || [];
|
|
|
3882
|
+ }
|
|
|
3883
|
+ })
|
|
3790
|
3884
|
}
|
|
3791
|
3885
|
}
|
|
3792
|
3886
|
// 终点科室选中
|
|
|
@@ -4126,7 +4220,7 @@ export class FuwutaiComponent implements OnInit {
|
|
4126
|
4220
|
(data["endStatus"] == 201 || data["endStatus"] == 203) &&
|
|
4127
|
4221
|
this.radioValueZy == this.deathTasktypeId
|
|
4128
|
4222
|
) {
|
|
4129
|
|
- if (this.currentTabIndex == "255") {
|
|
|
4223
|
+ if (this.currentTabIndex == "患者转运") {
|
|
4130
|
4224
|
//患者转运
|
|
4131
|
4225
|
//获取患者信息
|
|
4132
|
4226
|
this.getPatientList(this.endDeptZy, "");
|
|
|
@@ -4134,7 +4228,8 @@ export class FuwutaiComponent implements OnInit {
|
|
4134
|
4228
|
}
|
|
4135
|
4229
|
});
|
|
4136
|
4230
|
// 获取携带物品
|
|
4137
|
|
- let arr = this.workTypesArrange[this.currentTabIndex];
|
|
|
4231
|
+ let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
|
|
|
4232
|
+ let arr = arrObj.value;
|
|
4138
|
4233
|
this.goodsNow = arr.filter(
|
|
4139
|
4234
|
(item) => item.id == value
|
|
4140
|
4235
|
)[0].taskType.carryEquipmentIds;
|
|
|
@@ -4171,10 +4266,7 @@ export class FuwutaiComponent implements OnInit {
|
|
4171
|
4266
|
this.yyDate = new Date();
|
|
4172
|
4267
|
this.yyTime = null;
|
|
4173
|
4268
|
// 预约end
|
|
4174
|
|
- this.deptQtList.taskType.customRemarks = this.deptQtList.taskType
|
|
4175
|
|
- .customRemarks
|
|
4176
|
|
- ? this.deptQtList.taskType.customRemarks.split("$")
|
|
4177
|
|
- : [];
|
|
|
4269
|
+ this.deptQtList.taskType.customRemarks = this.deptQtList.taskType.customRemarks ? this.deptQtList.taskType.customRemarks.split("$") : [];
|
|
4178
|
4270
|
// 起点科室
|
|
4179
|
4271
|
if (data["startStatus"] == 201) {
|
|
4180
|
4272
|
if (this.applyDept) {
|
|
|
@@ -4209,20 +4301,24 @@ export class FuwutaiComponent implements OnInit {
|
|
4209
|
4301
|
//新建工单->确定提交
|
|
4210
|
4302
|
isGoLoading = false;
|
|
4211
|
4303
|
newOrderOk(go?): void {
|
|
4212
|
|
- if (this.isYyInspect && this.currentTabIndex == '259') {
|
|
|
4304
|
+ console.log(this.radioValueQt);
|
|
|
4305
|
+ let arr = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
|
|
|
4306
|
+ let objQt = arr.value.find(v => v.id == this.radioValueQt);
|
|
|
4307
|
+ let objZy = arr.value.find(v => v.id == this.radioValueZy);
|
|
|
4308
|
+ if (this.isYyInspect && objQt && objQt.associationTypeValue === 'other') {
|
|
4213
|
4309
|
this.clickYYFlag = true;
|
|
4214
|
4310
|
} else {
|
|
4215
|
4311
|
this.clickYYFlag = false;
|
|
4216
|
4312
|
}
|
|
4217
|
|
- if (this.isYyInspect && this.currentTabIndex == '255') {
|
|
|
4313
|
+ if (this.isYyInspect && objZy && objZy.associationTypeValue === 'patientTransport') {
|
|
4218
|
4314
|
this.clickYYZyFlag = true;
|
|
4219
|
4315
|
} else {
|
|
4220
|
4316
|
this.clickYYZyFlag = false;
|
|
4221
|
4317
|
}
|
|
4222
|
4318
|
|
|
4223
|
4319
|
if (
|
|
4224
|
|
- (!this.yyTime && this.currentTabIndex == '259' && this.isYyInspect) ||
|
|
4225
|
|
- (!this.yyTimeZy && this.currentTabIndex == '255' && this.isYyInspect)
|
|
|
4320
|
+ (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
|
|
|
4321
|
+ (!this.yyTimeZy && objZy && objZy.associationTypeValue === 'patientTransport' && this.isYyInspect)
|
|
4226
|
4322
|
) {
|
|
4227
|
4323
|
return;
|
|
4228
|
4324
|
}
|
|
|
@@ -4232,15 +4328,18 @@ export class FuwutaiComponent implements OnInit {
|
|
4232
|
4328
|
} else {
|
|
4233
|
4329
|
this.isGoLoading = true;
|
|
4234
|
4330
|
}
|
|
4235
|
|
- if (this.currentTabIndex == "255") {
|
|
|
4331
|
+ if (objZy && objZy.associationTypeValue === 'patientTransport') {
|
|
4236
|
4332
|
//患者转运
|
|
4237
|
4333
|
go === "&go&" ? this.submitFormZy(go) : this.submitFormZy();
|
|
4238
|
|
- } else if (this.currentTabIndex == "256") {
|
|
|
4334
|
+ } else if (objQt && objQt.associationTypeValue === 'specimen') {
|
|
4239
|
4335
|
//标本配送
|
|
4240
|
4336
|
go === "&go&" ? this.submitFormBbps(go) : this.submitFormBbps();
|
|
4241
|
|
- } else if (this.currentTabIndex == "259") {
|
|
|
4337
|
+ } else if (objQt && objQt.associationTypeValue === 'other') {
|
|
4242
|
4338
|
//其他配送
|
|
4243
|
4339
|
go === "&go&" ? this.submitFormQt(go) : this.submitFormQt();
|
|
|
4340
|
+ } else if (objQt && objQt.associationTypeValue === 'ordinary') {
|
|
|
4341
|
+ //万能交接
|
|
|
4342
|
+ go === "&go&" ? this.submitFormOrdinary(go) : this.submitFormOrdinary();
|
|
4244
|
4343
|
}
|
|
4245
|
4344
|
}
|
|
4246
|
4345
|
|
|
|
@@ -4677,7 +4776,7 @@ export class FuwutaiComponent implements OnInit {
|
|
4677
|
4776
|
this.searchTaskLoading = false;
|
|
4678
|
4777
|
this.searchTaskList = result.data;
|
|
4679
|
4778
|
this.searchTaskList.forEach((item) => {
|
|
4680
|
|
- item.sid = item.associationTypeId + "_" + item.id;
|
|
|
4779
|
+ item.sid = item.associationTypeId + "_" + item.id + "_" + item.associationTypeValue;
|
|
4681
|
4780
|
});
|
|
4682
|
4781
|
}
|
|
4683
|
4782
|
});
|
|
|
@@ -4685,11 +4784,15 @@ export class FuwutaiComponent implements OnInit {
|
|
4685
|
4784
|
//服务台建单任务类型回车,0_1,0是关联类型，1是任务类型
|
|
4686
|
4785
|
changeTaskBuild(e) {
|
|
4687
|
4786
|
let arr = e.split("_");
|
|
4688
|
|
- this.currentTabIndex = arr[0];
|
|
4689
|
|
- if (this.currentTabIndex == "255") {
|
|
|
4787
|
+ if(arr[2] === 'other' || arr[2] === 'specimen' || arr[2] === 'ordinary'){
|
|
|
4788
|
+ this.currentTabIndex = '物品配送';
|
|
|
4789
|
+ }else if(arr[2] === 'patientTransport'){
|
|
|
4790
|
+ this.currentTabIndex = '患者转运';
|
|
|
4791
|
+ }
|
|
|
4792
|
+ if (this.currentTabIndex == "患者转运") {
|
|
4690
|
4793
|
//患者其他服务业务
|
|
4691
|
4794
|
this.radioValueZy = +arr[1];
|
|
4692
|
|
- } else if (this.currentTabIndex == "259") {
|
|
|
4795
|
+ } else if (this.currentTabIndex == "物品配送") {
|
|
4693
|
4796
|
//其他临床服务
|
|
4694
|
4797
|
this.radioValueQt = +arr[1];
|
|
4695
|
4798
|
}
|
seimin