|
@@ -737,8 +737,8 @@ export class FuwutaiComponent implements OnInit {
|
737
|
737
|
patientCareCol: number = 6; //顶部工单列数(4列-8人,7列-14人,6列-单排 )
|
738
|
738
|
hurseInfoHiding = '1'; //护工信息隐藏
|
739
|
739
|
txtLabelCol: number = 1; //工单信息列数
|
740
|
|
- workerInfoTime: number = 30; //配送人员刷新时间
|
741
|
|
- orderInfoTime: number = 30; //工单刷新时间
|
|
740
|
+ workerInfoTime: number = 60; //配送人员刷新时间
|
|
741
|
+ orderInfoTime: number = 60; //工单刷新时间
|
742
|
742
|
audioNotDispatched: boolean = true; //是否开启定时播报未派出工单提示音
|
743
|
743
|
cotHeight: number; //工单初始化高度
|
744
|
744
|
unassignedList: any = []; //未分派数据
|
|
@@ -1334,7 +1334,9 @@ export class FuwutaiComponent implements OnInit {
|
1334
|
1334
|
let postData: any = {
|
1335
|
1335
|
idx: 0,
|
1336
|
1336
|
sum: 1,
|
1337
|
|
- hjzxRecord: {},
|
|
1337
|
+ hjzxRecord: {
|
|
1338
|
+ isExcute: 0,
|
|
1339
|
+ },
|
1338
|
1340
|
};
|
1339
|
1341
|
|
1340
|
1342
|
this.mainService
|
|
@@ -2265,6 +2267,7 @@ export class FuwutaiComponent implements OnInit {
|
2265
|
2267
|
"acceptUser": { id: this.tool.getCurrentUserId() },
|
2266
|
2268
|
"callID": this.incidentModel.callID || undefined,
|
2267
|
2269
|
"incomingPhone": this.incidentModel.incomingPhone || undefined,
|
|
2270
|
+ "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
|
2268
|
2271
|
},
|
2269
|
2272
|
};
|
2270
|
2273
|
|
|
@@ -2272,7 +2275,7 @@ export class FuwutaiComponent implements OnInit {
|
2272
|
2275
|
if(this.buildType === '报修转事件'){
|
2273
|
2276
|
postData.incident.fromWx = true;
|
2274
|
2277
|
}
|
2275
|
|
- Object.assign(postData.incident, this.editOrder);
|
|
2278
|
+ postData.incident = Object.assign({}, this.editOrder, postData.incident);
|
2276
|
2279
|
}
|
2277
|
2280
|
|
2278
|
2281
|
this.mainService
|
|
@@ -2923,13 +2926,14 @@ export class FuwutaiComponent implements OnInit {
|
2923
|
2926
|
"incomingPhone": this.incidentModel.incomingPhone || undefined,
|
2924
|
2927
|
"candidateGroups": this.incidentModel.group || undefined,
|
2925
|
2928
|
"assignee": this.incidentModel.user || undefined,
|
|
2929
|
+ "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
|
2926
|
2930
|
}
|
2927
|
2931
|
};
|
2928
|
2932
|
if(this.buildType){
|
2929
|
2933
|
if(this.buildType === '报修转事件'){
|
2930
|
2934
|
postData.incident.fromWx = true;
|
2931
|
2935
|
}
|
2932
|
|
- Object.assign(postData.incident, this.editOrder);
|
|
2936
|
+ postData.incident = Object.assign({}, this.editOrder, postData.incident);
|
2933
|
2937
|
}
|
2934
|
2938
|
console.log(postData);
|
2935
|
2939
|
// return;
|
|
@@ -2992,13 +2996,14 @@ export class FuwutaiComponent implements OnInit {
|
2992
|
2996
|
"incomingPhone": this.incidentModel.incomingPhone || undefined,
|
2993
|
2997
|
"candidateGroups": this.incidentModel.group || undefined,
|
2994
|
2998
|
"assignee": this.incidentModel.user || undefined,
|
|
2999
|
+ "hjzxRecordId": this.incidentModel.hjzxRecordId || undefined,
|
2995
|
3000
|
}
|
2996
|
3001
|
};
|
2997
|
3002
|
if(this.buildType){
|
2998
|
3003
|
if(this.buildType === '报修转事件'){
|
2999
|
3004
|
postData.incident.fromWx = true;
|
3000
|
3005
|
}
|
3001
|
|
- Object.assign(postData.incident, this.editOrder);
|
|
3006
|
+ postData.incident = Object.assign({}, this.editOrder, postData.incident);
|
3002
|
3007
|
}
|
3003
|
3008
|
console.log(postData);
|
3004
|
3009
|
// return;
|
|
@@ -4249,33 +4254,47 @@ export class FuwutaiComponent implements OnInit {
|
4249
|
4254
|
phone: e.data.ano,
|
4250
|
4255
|
},
|
4251
|
4256
|
};
|
|
4257
|
+ this.maskFlag = this.msg.loading("正在加载中..", {
|
|
4258
|
+ nzDuration: 0,
|
|
4259
|
+ }).messageId;
|
|
4260
|
+
|
4252
|
4261
|
this.mainService
|
4253
|
4262
|
.getFetchDataList("data", "department", postData)
|
4254
|
4263
|
.subscribe((result) => {
|
|
4264
|
+ this.msg.remove(this.maskFlag);
|
|
4265
|
+ this.maskFlag = false;
|
4255
|
4266
|
if (result.status == 200) {
|
4256
|
|
- console.log(result);
|
4257
|
|
- if (result.list.length > 0) {
|
4258
|
|
- //绑定了科室
|
4259
|
|
- if (!this.newOrderShow && !this.newOrderShowOpen) {
|
4260
|
|
- let incidentModel:any = {department: result.list[0]};
|
4261
|
|
- let incidentMsg:any = {};
|
|
4267
|
+ this.mainService.getDictionary("list", "incident_source").subscribe((res) => {
|
|
4268
|
+ let sourceList = res || [];
|
|
4269
|
+ let incidentModel:any = {
|
|
4270
|
+ hjzxRecordId: e.data.id,
|
|
4271
|
+ incomingPhone: e.data.ano,
|
|
4272
|
+ };
|
|
4273
|
+ let incidentMsg:any = {};
|
|
4274
|
+ let source = sourceList.find(v => v.value === 'record');
|
|
4275
|
+ source && (incidentModel.source = source.id);
|
|
4276
|
+ if (result.list.length > 0) {
|
|
4277
|
+ //绑定了科室
|
|
4278
|
+ incidentModel.department = result.list[0];
|
|
4279
|
+ incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
|
|
4280
|
+ incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
|
|
4281
|
+ incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
|
|
4282
|
+ incidentModel.department && incidentModel.department.address && (incidentModel.houseNumber = incidentModel.department.address);
|
4262
|
4283
|
incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
|
4263
|
4284
|
incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
|
|
4285
|
+
|
4264
|
4286
|
incidentModel.department && (incidentModel.department = incidentModel.department.id);
|
4265
|
|
- // incidentModel.source && (incidentModel.source = incidentModel.source.id);
|
4266
|
|
- // incidentModel.area && (incidentModel.area = incidentModel.area.id);
|
4267
|
|
- // incidentModel.place && (incidentModel.place = incidentModel.place.id);
|
|
4287
|
+ this.incidentModel = incidentModel;
|
|
4288
|
+ console.log('this.incidentModel:', this.incidentModel)
|
|
4289
|
+ this.incidentMsg = incidentMsg;
|
|
4290
|
+ this.showNewOrder('', '', true, '留言转事件');
|
|
4291
|
+ } else {
|
|
4292
|
+ //没绑定科室
|
4268
|
4293
|
this.incidentModel = incidentModel;
|
4269
|
4294
|
this.incidentMsg = incidentMsg;
|
4270
|
|
- console.log('this.applicationDeptList:', this.applicationDeptList)
|
4271
|
|
- console.log('incidentModel:', incidentModel)
|
4272
|
4295
|
this.showNewOrder('', '', true, '留言转事件');
|
4273
|
4296
|
}
|
4274
|
|
- } else {
|
4275
|
|
- //没绑定科室
|
4276
|
|
- console.log(this.newOrderShow);
|
4277
|
|
- this.showNewOrder('', '', true, '留言转事件');
|
4278
|
|
- }
|
|
4297
|
+ });
|
4279
|
4298
|
}
|
4280
|
4299
|
});
|
4281
|
4300
|
}
|