|
@@ -32,21 +32,21 @@
|
32
|
32
|
<td :width="td_3_width" valign="top">
|
33
|
33
|
<div style="min-height: 80px;">
|
34
|
34
|
<div class="proj" v-if="Object.keys(main_collection.all.am).length > 0">
|
35
|
|
- <div class="proj_title">上午:</div>
|
|
35
|
+ <div class="proj_title">上午: <span>{{ getPatientNum(main_collection.weekday,1) }}人</span> </div>
|
36
|
36
|
<div class="proj_item" v-for="(zone_schs, zone_name) in main_collection.all.am" :key="zone_name">
|
37
|
37
|
<span class="zone_name">{{ zone_name }}: </span>
|
38
|
38
|
{{ patient_names(zone_schs) }}
|
39
|
39
|
</div>
|
40
|
40
|
</div>
|
41
|
41
|
<div class="proj" v-if="Object.keys(main_collection.all.pm).length > 0">
|
42
|
|
- <div class="proj_title">下午:</div>
|
|
42
|
+ <div class="proj_title">下午:<span>{{ getPatientNum(main_collection.weekday,2) }}人</span></div>
|
43
|
43
|
<div class="proj_item" v-for="(zone_schs, zone_name) in main_collection.all.pm" :key="zone_name">
|
44
|
44
|
<span class="zone_name">{{ zone_name }}: </span>
|
45
|
45
|
{{ patient_names(zone_schs) }}
|
46
|
46
|
</div>
|
47
|
47
|
</div>
|
48
|
48
|
<div class="proj" v-if="Object.keys(main_collection.all.evening).length > 0">
|
49
|
|
- <div class="proj_title">晚上:</div>
|
|
49
|
+ <div class="proj_title">晚上: <span>{{ getPatientNum(main_collection.weekday,3) }}人</span></div>
|
50
|
50
|
<div class="proj_item" v-for="(zone_schs, zone_name) in main_collection.all.evening"
|
51
|
51
|
:key="zone_name">
|
52
|
52
|
<span class="zone_name">{{ zone_name }}: </span>
|
|
@@ -110,6 +110,7 @@
|
110
|
110
|
},
|
111
|
111
|
hdf: [ /* schedule, ... */],
|
112
|
112
|
hd_hp: [ /* schedule, ... */],
|
|
113
|
+
|
113
|
114
|
new_hdf:{
|
114
|
115
|
am: { /* zone_name: [ schedule, ... ] */ },
|
115
|
116
|
pm: { /* zone_name: [ schedule, ... ] */ },
|
|
@@ -248,7 +249,9 @@
|
248
|
249
|
evening: { /* zone_name: [ schedule, ... ] */ }
|
249
|
250
|
}
|
250
|
251
|
}
|
251
|
|
- ]
|
|
252
|
+ ],
|
|
253
|
+
|
|
254
|
+ total:[]
|
252
|
255
|
}
|
253
|
256
|
},
|
254
|
257
|
components: {
|
|
@@ -270,11 +273,9 @@
|
270
|
273
|
const collection = this.schedules[index]
|
271
|
274
|
collection.day = resp.data.days[index].split("-")[1]+"-"+resp.data.days[index].split("-")[2]
|
272
|
275
|
}
|
273
|
|
-
|
|
276
|
+ this.total = resp.data.total
|
274
|
277
|
var schedules = resp.data.schedules
|
275
|
|
- console.log("schedules",schedules)
|
276
|
|
- var total = resp.data.total
|
277
|
|
- console.log("total",total)
|
|
278
|
+
|
278
|
279
|
for (let index = 0; index < schedules.length; index++) {
|
279
|
280
|
const schedule = schedules[index]
|
280
|
281
|
if (schedule.patient == null || schedule.zone == null) {
|
|
@@ -288,7 +289,7 @@
|
288
|
289
|
|
289
|
290
|
var time_type_schedules
|
290
|
291
|
var other_time_type_schedules
|
291
|
|
-
|
|
292
|
+
|
292
|
293
|
if (time_type == 1) {
|
293
|
294
|
time_type_schedules = main_collection.all.am
|
294
|
295
|
} else if (time_type == 2) {
|
|
@@ -296,10 +297,12 @@
|
296
|
297
|
} else {
|
297
|
298
|
time_type_schedules = main_collection.all.evening
|
298
|
299
|
}
|
|
300
|
+
|
299
|
301
|
|
300
|
302
|
var zone_schedules = time_type_schedules[schedule.zone.name] ? time_type_schedules[schedule.zone.name] : []
|
301
|
|
-
|
|
303
|
+
|
302
|
304
|
zone_schedules.push(schedule)
|
|
305
|
+
|
303
|
306
|
time_type_schedules[schedule.zone.name] = zone_schedules
|
304
|
307
|
|
305
|
308
|
if (schedule.mode.id == 2) { // HDF
|
|
@@ -311,8 +314,7 @@
|
311
|
314
|
}
|
312
|
315
|
|
313
|
316
|
}
|
314
|
|
- console.log("schedules",this.schedules)
|
315
|
|
-
|
|
317
|
+
|
316
|
318
|
} else {
|
317
|
319
|
this.$message.error(resp.msg)
|
318
|
320
|
}
|
|
@@ -321,11 +323,35 @@
|
321
|
323
|
})
|
322
|
324
|
},
|
323
|
325
|
methods: {
|
|
326
|
+ getPatientNum(week,type){
|
|
327
|
+ if(week == '星期一'){
|
|
328
|
+ week = 1
|
|
329
|
+ }else if(week == '星期二'){
|
|
330
|
+ week = 2
|
|
331
|
+ }else if(week == '星期三'){
|
|
332
|
+ week = 3
|
|
333
|
+ }else if(week == '星期四'){
|
|
334
|
+ week = 4
|
|
335
|
+ }else if(week == '星期五'){
|
|
336
|
+ week = 5
|
|
337
|
+ }else if(week == '星期六'){
|
|
338
|
+ week = 6
|
|
339
|
+ }else if(week == '星期日'){
|
|
340
|
+ week = 7
|
|
341
|
+ }
|
|
342
|
+ let num = 0
|
|
343
|
+ this.total.map(item => {
|
|
344
|
+ if(item.schedule_week == week && item.schedule_type == type){
|
|
345
|
+ num = item.Count
|
|
346
|
+ }
|
|
347
|
+ })
|
|
348
|
+ return num
|
|
349
|
+ },
|
324
|
350
|
patient_names: function(schedules) {
|
325
|
351
|
var names = []
|
326
|
352
|
for (let index = 0; index < schedules.length; index++) {
|
327
|
353
|
const schedule = schedules[index]
|
328
|
|
-
|
|
354
|
+ console.log(schedule)
|
329
|
355
|
|
330
|
356
|
names.push(schedule.patient.name)
|
331
|
357
|
}
|
|
@@ -334,7 +360,7 @@
|
334
|
360
|
obj[next] ? '' : obj[next] = true && cur.push(next)
|
335
|
361
|
return cur
|
336
|
362
|
}, []) // 设置cur默认类型为数组,并且初始值为空的数组
|
337
|
|
-
|
|
363
|
+ console.log('names',names)
|
338
|
364
|
return names.join('、')
|
339
|
365
|
},
|
340
|
366
|
patient_other_names: function(schedules) {
|
|
@@ -345,7 +371,7 @@
|
345
|
371
|
var names = []
|
346
|
372
|
for (let index = 0; index < schedules.length; index++) {
|
347
|
373
|
const schedule = schedules[index]
|
348
|
|
- // console.log(schedule)
|
|
374
|
+ console.log(schedule)
|
349
|
375
|
|
350
|
376
|
names.push(schedule.patient.name)
|
351
|
377
|
|
|
@@ -368,15 +394,15 @@
|
368
|
394
|
var str= ""
|
369
|
395
|
|
370
|
396
|
if(am.length > 0){
|
371
|
|
- str = "上午:"+ am.join("、") +"<br/>"
|
|
397
|
+ str = "上午:"+ am.length + '人' +"<br/>" + ' ' + am.join("、") +"<br/>"
|
372
|
398
|
}
|
373
|
399
|
|
374
|
400
|
if(pm.length > 0){
|
375
|
|
- str = str + "下午:"+ pm.join("、")+"<br/>"
|
|
401
|
+ str = str + "下午:" + pm.length + '人' + "<br/>" + ' ' + pm.join("、")+"<br/>"
|
376
|
402
|
}
|
377
|
403
|
|
378
|
404
|
if(evening.length > 0){
|
379
|
|
- str = str + "晚上:"+ evening.join("、")
|
|
405
|
+ str = str + "晚上:" + evening.length + '人' +"<br/>" + ' ' + evening.join("、")
|
380
|
406
|
}
|
381
|
407
|
return str
|
382
|
408
|
},
|