Przeglądaj źródła

库存显示展示

XMLWAN 2 lat temu
rodzic
commit
ee74ab038f

+ 59 - 36
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue Wyświetl plik

200
                   </td>
200
                   </td>
201
                 </tr>
201
                 </tr>
202
                 <tr>
202
                 <tr>
203
-                  <td style="text-align:left;" colspan="1">
204
-                    <span style="display:inline-block;margin-left:15px;"
205
-                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
206
-                  </td>
203
+                
207
                   <td style="text-align:left;" colspan="1">
204
                   <td style="text-align:left;" colspan="1">
208
                     <span style="display:inline-block;margin-left:15px;"
205
                     <span style="display:inline-block;margin-left:15px;"
209
                       >设定脱水量:{{record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:"/"}}&nbsp;ml</span
206
                       >设定脱水量:{{record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:"/"}}&nbsp;ml</span
217
                          ></label-box>
214
                          ></label-box>
218
                      </span>
215
                      </span>
219
                    </td>
216
                    </td>
220
-                   <td style="text-align: left" colspan="2">
217
+                   <td style="text-align: left" colspan="3">
221
               <span style="display: inline-block; margin-left: 15px">
218
               <span style="display: inline-block; margin-left: 15px">
222
                 <span v-if="record.prescription.anticoagulant == 2">普通肝素首剂:</span>
219
                 <span v-if="record.prescription.anticoagulant == 2">普通肝素首剂:</span>
223
                 <span v-if="record.prescription.anticoagulant == 3"
220
                 <span v-if="record.prescription.anticoagulant == 3"
306
               <span v-if="record.prescription.anticoagulant == 2">mg</span>
303
               <span v-if="record.prescription.anticoagulant == 2">mg</span>
307
               <span v-if="record.prescription.anticoagulant == 1">mg</span>
304
               <span v-if="record.prescription.anticoagulant == 1">mg</span>
308
             </td>
305
             </td>
309
-                </tr>
306
+           
307
+            </tr>
308
+                 <td style="text-align:left;" colspan="1">
309
+                    <span style="display:inline-block;margin-left:15px;"
310
+                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
311
+                  </td>
312
+                 <td style="text-align:left;" colspan="1" >
313
+                    <span style="display:inline-block;margin-left:15px;"
314
+                      >透析器型号:
315
+                    <span v-if="record.prescription.dialysis_dialyszers!=''">
316
+                      {{
317
+                        record.prescription.dialysis_dialyszers
318
+                         ?  record.prescription.dialysis_dialyszers
319
+                           : "/"
320
+                        }}
321
+                      </span> 
322
+                    
323
+                      </span>
324
+                  </td>
325
+
326
+                  <td style="text-align:left;" colspan="2">
327
+                    <span style="display:inline-block;margin-left:15px;"
328
+                      >灌流器型号:
329
+                   
330
+                      <span v-if="record.prescription.dialysis_irrigation==''">
331
+                        &nbsp;&nbsp;{{
332
+                        record.prescription.dialysis_irrigation
333
+                        ? record.prescription.dialysis_irrigation
334
+                        : "/"
335
+                    }}
336
+                      </span>
337
+                      </span>
338
+                  </td>
339
+
340
+                   <td style="text-align:left;" colspan="2">
341
+                    <span style="display:inline-block;margin-left:15px;"
342
+                      >滤过器型号:
343
+                      <span v-if="record.prescription.dialysis_strainer!=''">
344
+                      &nbsp;&nbsp;{{
345
+                          record.prescription.dialysis_strainer
346
+                          ? record.prescription.dialysis_strainer
347
+                          : "/"
348
+                      }}
349
+                      </span> 
350
+                      </span>
351
+                  </td>
352
+             <tr>
353
+
354
+             </tr>
310
                 <tr>
355
                 <tr>
311
                   <td style="text-align:left;" colspan="1">
356
                   <td style="text-align:left;" colspan="1">
312
                     <span style="display:inline-block;margin-left:15px;"
357
                     <span style="display:inline-block;margin-left:15px;"
340
                           }}分钟</span>
385
                           }}分钟</span>
341
                       &nbsp;
386
                       &nbsp;
342
                   </td>
387
                   </td>
343
-                   <td style="text-align:left;" >
344
-                    <span style="display:inline-block;margin-left:15px;"
345
-                      >透析/灌流器型号:
346
-                    <span v-if="record.prescription.dialysis_dialyszers!=''">
347
-                      {{
348
-                        record.prescription.dialysis_dialyszers
349
-                         ?  record.prescription.dialysis_dialyszers
350
-                           : "/"
351
-                        }}
352
-                      </span> 
353
-                      <span v-if="record.prescription.dialysis_irrigation==''">
354
-                        &nbsp;&nbsp;{{
355
-                        record.prescription.dialysis_irrigation
356
-                        ? record.prescription.dialysis_irrigation
357
-                        : "/"
358
-                    }}
359
-                      </span>
360
-                      <span v-if="record.prescription.dialysis_strainer!=''">
361
-                      &nbsp;&nbsp;{{
362
-                          record.prescription.dialysis_strainer
363
-                          ? record.prescription.dialysis_strainer
364
-                          : "/"
365
-                      }}
366
-                      </span> 
367
-                      </span>
368
-                  </td>
369
-                   <td style="text-align:left;" colspan="2">
388
+               
389
+                   <td style="text-align:left;" colspan="3">
370
                     <span style="display:inline-block;margin-left:15px;"
390
                     <span style="display:inline-block;margin-left:15px;"
371
                       >置换方式:
391
                       >置换方式:
372
                        <label-box
392
                        <label-box
448
                           />
468
                           />
449
                       </span>
469
                       </span>
450
                   </td>
470
                   </td>
451
-                   <td style="text-align:left;" colspan="3">
471
+                   <td style="text-align:left;" colspan="2">
452
                     <span style="display: inline-block; margin-left: 15px">
472
                     <span style="display: inline-block; margin-left: 15px">
453
                     穿刺护士:
473
                     穿刺护士:
454
                        <span
474
                        <span
476
                             style="height: 30px;"
496
                             style="height: 30px;"
477
                           />
497
                           />
478
                       </span>
498
                       </span>
479
-                      <span style="display: inline-block; margin-left: 15px">
499
+                      
500
+                  </td>
501
+                   <td style="text-align:left;" colspan="1">
502
+                   <span style="display: inline-block; margin-left: 15px">
480
                         核对护士:
503
                         核对护士:
481
                        <span
504
                        <span
482
                        style="height: 30px; display: inline-block"
505
                        style="height: 30px; display: inline-block"
504
                             style="height: 30px;"
527
                             style="height: 30px;"
505
                           />
528
                           />
506
                       </span>
529
                       </span>
507
-                  </td>
530
+                   </td>
508
                   <td style="text-align:left;" colspan="3">
531
                   <td style="text-align:left;" colspan="3">
509
                     <!-- <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
532
                     <!-- <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
510
                       >医生签名:
533
                       >医生签名:

+ 2 - 2
src/xt_pages/dialysis/details/consumable/dialysisGood.vue Wyświetl plik

212
             </el-option>
212
             </el-option>
213
            </el-select>
213
            </el-select>
214
            <label class="title"> <span class="name">病区选择</span> : </label>
214
            <label class="title"> <span class="name">病区选择</span> : </label>
215
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple>
215
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType" >
216
             <el-option
216
             <el-option
217
               v-for="item in partitionArr"
217
               v-for="item in partitionArr"
218
               :key="item.id"
218
               :key="item.id"
320
             </el-option>
320
             </el-option>
321
            </el-select>
321
            </el-select>
322
            <label class="title"> <span class="name">病区选择</span> : </label>
322
            <label class="title"> <span class="name">病区选择</span> : </label>
323
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
323
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
324
             <el-option
324
             <el-option
325
               v-for="item in partitionArr"
325
               v-for="item in partitionArr"
326
               :key="item.id"
326
               :key="item.id"

+ 3 - 1
src/xt_pages/dialysis/newDoctorAdvice.vue Wyświetl plik

1306
          if(nameOne == '全部'){
1306
          if(nameOne == '全部'){
1307
           nameOne = ""
1307
           nameOne = ""
1308
         }
1308
         }
1309
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne} });
1309
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
1310
 
1310
 
1311
     },
1311
     },
1312
     batchPrintActionOne: function() {
1312
     batchPrintActionOne: function() {
1530
         return searchArray
1530
         return searchArray
1531
       },
1531
       },
1532
      handleSelect(val) {
1532
      handleSelect(val) {
1533
+       console.log("val323223232323232323",val)
1533
        this.patient_id = val.id
1534
        this.patient_id = val.id
1535
+       this.listQuery.keyword = val.name
1534
        this.requestSchedualDoctors(this.time)
1536
        this.requestSchedualDoctors(this.time)
1535
       },
1537
       },
1536
      toSeach(){
1538
      toSeach(){

+ 1 - 0
src/xt_pages/dialysis/signPrint.vue Wyświetl plik

98
             advice_type: 2,
98
             advice_type: 2,
99
             delivery_way:this.delivery_way,
99
             delivery_way:this.delivery_way,
100
             execution_frequency:this.execution_frequency,
100
             execution_frequency:this.execution_frequency,
101
+            patient_id:this.$route.query.patient_id,
101
             }).then(rs => {
102
             }).then(rs => {
102
                 var resp = rs.data
103
                 var resp = rs.data
103
                 if (resp.state == 1) {
104
                 if (resp.state == 1) {

+ 71 - 51
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue Wyświetl plik

201
             </td>
201
             </td>
202
           </tr>
202
           </tr>
203
           <tr>
203
           <tr>
204
-            <td style="text-align: left" colspan="1">
205
-              <span style="display: inline-block; margin-left: 15px">
206
-                透前体重:{{
207
-                  predialysis.weight_before ? predialysis.weight_before : "/"
208
-                }}kg
209
-              </span>
210
-            </td>
204
+            <!-- <td style="text-align: left" colspan="1">
205
+             
206
+            </td> -->
211
             <td style="text-align: left" colspan="1">
207
             <td style="text-align: left" colspan="1">
212
               <span style="display: inline-block; margin-left: 15px">
208
               <span style="display: inline-block; margin-left: 15px">
213
                 设定脱水量:{{
209
                 设定脱水量:{{
225
                 ></label-box>
221
                 ></label-box>
226
               </span>
222
               </span>
227
             </td>
223
             </td>
228
-            <td style="text-align: left" colspan="2">
224
+            <td style="text-align: left" colspan="3">
229
               <span style="display: inline-block; margin-left: 15px">
225
               <span style="display: inline-block; margin-left: 15px">
230
                 <span v-if="prescription.anticoagulant == 2">普通肝素首剂:</span>
226
                 <span v-if="prescription.anticoagulant == 2">普通肝素首剂:</span>
231
                 <span v-if="prescription.anticoagulant == 3"
227
                 <span v-if="prescription.anticoagulant == 3"
294
               <span v-if="prescription.anticoagulant == 2">mg/h</span>
290
               <span v-if="prescription.anticoagulant == 2">mg/h</span>
295
               <span v-if="prescription.anticoagulant == 1">mg/h</span>
291
               <span v-if="prescription.anticoagulant == 1">mg/h</span>
296
             </td>
292
             </td>
297
-            <td style="text-align: left" colspan="2">
293
+            <td style="text-align: left" colspan="1">
298
               <span style="display: inline-block; ">
294
               <span style="display: inline-block; ">
299
                 总量:
295
                 总量:
300
                 {{
296
                 {{
315
               <span v-if="prescription.anticoagulant == 1">mg</span>
311
               <span v-if="prescription.anticoagulant == 1">mg</span>
316
             </td>
312
             </td>
317
           </tr>
313
           </tr>
314
+          <tr>
315
+            <td style="text-align: left" colspan="1">
316
+               <span style="display: inline-block; margin-left: 15px">
317
+                透前体重:{{
318
+                  predialysis.weight_before ? predialysis.weight_before : "/"
319
+                }}kg
320
+              </span>
321
+            </td>
322
+            <td style="text-align: left" colspan="1">
323
+              <span style="display: inline-block; margin-left: 15px">
324
+                透析器型号:
325
+                <span v-if="prescription.dialysis_dialyszers!=''">{{
326
+                  prescription.dialysis_dialyszers
327
+                    ? prescription.dialysis_dialyszers
328
+                    : "/"
329
+                }}
330
+                </span>
331
+              </span>
332
+            </td> 
333
+            <td style="text-align: left" colspan="2">
334
+              <span style="display: inline-block; margin-left: 15px">
335
+                灌流器型号:
336
+                <span v-if="prescription.dialysis_irrigation!=''">
337
+                 &nbsp;&nbsp;{{
338
+                  prescription.dialysis_irrigation
339
+                    ? prescription.dialysis_irrigation
340
+                    : "/"
341
+                }}
342
+               </span>
343
+              </span>
344
+            </td> 
345
+
346
+            <td style="text-align: left" colspan="2">
347
+              <span style="display: inline-block; margin-left: 15px">
348
+                滤过器型号:
349
+                <span v-if="prescription.dialysis_strainer!=''">
350
+                &nbsp;&nbsp;{{
351
+                    prescription.dialysis_strainer
352
+                      ? prescription.dialysis_strainer
353
+                      : "/"
354
+                  }}
355
+               </span>
356
+              </span>
357
+            </td> 
358
+           
359
+          </tr>
318
           <tr>
360
           <tr>
319
             <td style="text-align: left" colspan="1">
361
             <td style="text-align: left" colspan="1">
320
               <span style="display: inline-block; margin-left: 15px">
362
               <span style="display: inline-block; margin-left: 15px">
352
                 }}分钟
394
                 }}分钟
353
               </span>
395
               </span>
354
             </td>
396
             </td>
355
-            <td style="text-align: left" colspan="1">
356
-              <span style="display: inline-block; margin-left: 15px">
357
-                透析/灌流器型号:
358
-                <span v-if="prescription.dialysis_dialyszers!=''">{{
359
-                  prescription.dialysis_dialyszers
360
-                    ? prescription.dialysis_dialyszers
361
-                    : "/"
362
-                }}
363
-                </span>
364
-               <span v-if="prescription.dialysis_irrigation!=''">
365
-                 &nbsp;&nbsp;{{
366
-                  prescription.dialysis_irrigation
367
-                    ? prescription.dialysis_irrigation
368
-                    : "/"
369
-                }}
370
-               </span>
371
-               <span v-if="prescription.dialysis_strainer!=''">
372
-                &nbsp;&nbsp;{{
373
-                    prescription.dialysis_strainer
374
-                      ? prescription.dialysis_strainer
375
-                      : "/"
376
-                  }}
377
-               </span>
378
-                
379
-              </span>
380
-            </td>
381
-            <td style="text-align: left" colspan="2">
397
+         
398
+            <td style="text-align: left" colspan="3">
382
               <span style="display: inline-block; margin-left: 15px">
399
               <span style="display: inline-block; margin-left: 15px">
383
                 置换方式:
400
                 置换方式:
384
                 <label-box
401
                 <label-box
444
                 </span>
461
                 </span>
445
               </span>
462
               </span>
446
 
463
 
447
-              <span style="display: inline-block; margin-left: 15px">
448
-                核对护士:<span
449
-                  style="height: 30px; display: inline-block"
450
-                  v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
451
-                >
452
-                  {{ getAdminUser(check == null ? 0 : check.creater) }}
453
-                </span>
454
-                <img
455
-                  style="height: 30px"
456
-                  :src="setAdminUserES(check == null ? 0 : check.creater)"
457
-                  alt=""
458
-                  srcset=""
459
-                  v-else
460
-                />
461
-              </span>
464
+             
462
             </td>
465
             </td>
466
+            <td style="text-align: left" colspan="1">
467
+                <span style="display: inline-block; margin-left: 15px">
468
+                  核对护士:<span
469
+                    style="height: 30px; display: inline-block"
470
+                    v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
471
+                  >
472
+                    {{ getAdminUser(check == null ? 0 : check.creater) }}
473
+                  </span>
474
+                  <img
475
+                    style="height: 30px"
476
+                    :src="setAdminUserES(check == null ? 0 : check.creater)"
477
+                    alt=""
478
+                    srcset=""
479
+                    v-else
480
+                  />
481
+                </span>
482
+              </td>
463
             <td style="text-align: left" colspan="3">
483
             <td style="text-align: left" colspan="3">
464
               <span style="display: inline-block; margin-left: 15px">
484
               <span style="display: inline-block; margin-left: 15px">
465
                 <span
485
                 <span

+ 58 - 10
src/xt_pages/workforce/schedule_print.vue Wyświetl plik

57
                 </td>
57
                 </td>
58
                 <td :width="td_4_width" valign="top">
58
                 <td :width="td_4_width" valign="top">
59
                   <div class="proj" v-if="Object.keys(main_collection.hdf).length > 0">
59
                   <div class="proj" v-if="Object.keys(main_collection.hdf).length > 0">
60
-                    <div class="proj_title">血滤:</div>
60
+                    <div class="proj_title">血滤(HDF):</div>
61
                     <div class="proj_item" v-html="patient_other_names(main_collection.hdf)">
61
                     <div class="proj_item" v-html="patient_other_names(main_collection.hdf)">
62
                     </div>
62
                     </div>
63
                   </div>
63
                   </div>
64
                   <div class="proj" v-if="Object.keys(main_collection.hd_hp).length > 0">
64
                   <div class="proj" v-if="Object.keys(main_collection.hd_hp).length > 0">
65
-                    <div class="proj_title">灌流:</div>
65
+                    <div class="proj_title">灌流(HD+HP):</div>
66
                     <div class="proj_item" v-html="patient_other_names(main_collection.hd_hp)">>
66
                     <div class="proj_item" v-html="patient_other_names(main_collection.hd_hp)">>
67
                     </div>
67
                     </div>
68
                   </div>
68
                   </div>
69
+                   <div class="proj" v-if="Object.keys(main_collection.hfhd_hp).length > 0">
70
+                    <div class="proj_title">灌流(HFHD+HP):</div>
71
+                    <div class="proj_item" v-html="patient_other_names(main_collection.hfhd_hp)">>
72
+                    </div>
73
+                  </div>
69
                 </td>
74
                 </td>
70
               </tr>
75
               </tr>
71
               </tbody>
76
               </tbody>
110
             },
115
             },
111
             hdf: [ /* schedule, ... */],
116
             hdf: [ /* schedule, ... */],
112
             hd_hp: [ /* schedule, ... */],
117
             hd_hp: [ /* schedule, ... */],
113
-
118
+            hfhd_hp:[],
114
             new_hdf:{
119
             new_hdf:{
115
               am: { /* zone_name: [ schedule, ... ] */ },
120
               am: { /* zone_name: [ schedule, ... ] */ },
116
               pm: { /* zone_name: [ schedule, ... ] */ },
121
               pm: { /* zone_name: [ schedule, ... ] */ },
120
               am: { /* zone_name: [ schedule, ... ] */ },
125
               am: { /* zone_name: [ schedule, ... ] */ },
121
               pm: { /* zone_name: [ schedule, ... ] */ },
126
               pm: { /* zone_name: [ schedule, ... ] */ },
122
               evening: { /* zone_name: [ schedule, ... ] */ }
127
               evening: { /* zone_name: [ schedule, ... ] */ }
123
-            }
128
+            },
129
+            new_hfhd_hp:{
130
+              am: { /* zone_name: [ schedule, ... ] */ },
131
+              pm: { /* zone_name: [ schedule, ... ] */ },
132
+              evening: { /* zone_name: [ schedule, ... ] */ }
133
+            },
124
 
134
 
125
           },
135
           },
126
           {
136
           {
133
             },
143
             },
134
             hdf: [ /* schedule, ... */],
144
             hdf: [ /* schedule, ... */],
135
             hd_hp: [ /* schedule, ... */],
145
             hd_hp: [ /* schedule, ... */],
146
+            hfhd_hp:[],
136
             new_hdf:{
147
             new_hdf:{
137
               am: { /* zone_name: [ schedule, ... ] */ },
148
               am: { /* zone_name: [ schedule, ... ] */ },
138
               pm: { /* zone_name: [ schedule, ... ] */ },
149
               pm: { /* zone_name: [ schedule, ... ] */ },
142
               am: { /* zone_name: [ schedule, ... ] */ },
153
               am: { /* zone_name: [ schedule, ... ] */ },
143
               pm: { /* zone_name: [ schedule, ... ] */ },
154
               pm: { /* zone_name: [ schedule, ... ] */ },
144
               evening: { /* zone_name: [ schedule, ... ] */ }
155
               evening: { /* zone_name: [ schedule, ... ] */ }
145
-            }
156
+            },
157
+            new_hfhd_hp:{
158
+              am: { /* zone_name: [ schedule, ... ] */ },
159
+              pm: { /* zone_name: [ schedule, ... ] */ },
160
+              evening: { /* zone_name: [ schedule, ... ] */ }
161
+            },
146
           },
162
           },
147
           {
163
           {
148
             day: 3,
164
             day: 3,
154
             },
170
             },
155
             hdf: [ /* schedule, ... */],
171
             hdf: [ /* schedule, ... */],
156
             hd_hp: [ /* schedule, ... */],
172
             hd_hp: [ /* schedule, ... */],
173
+            hfhd_hp:[],
157
             new_hdf:{
174
             new_hdf:{
158
               am: { /* zone_name: [ schedule, ... ] */ },
175
               am: { /* zone_name: [ schedule, ... ] */ },
159
               pm: { /* zone_name: [ schedule, ... ] */ },
176
               pm: { /* zone_name: [ schedule, ... ] */ },
163
               am: { /* zone_name: [ schedule, ... ] */ },
180
               am: { /* zone_name: [ schedule, ... ] */ },
164
               pm: { /* zone_name: [ schedule, ... ] */ },
181
               pm: { /* zone_name: [ schedule, ... ] */ },
165
               evening: { /* zone_name: [ schedule, ... ] */ }
182
               evening: { /* zone_name: [ schedule, ... ] */ }
166
-            }
183
+            },
184
+             new_hfhd_hp:{
185
+              am: { /* zone_name: [ schedule, ... ] */ },
186
+              pm: { /* zone_name: [ schedule, ... ] */ },
187
+              evening: { /* zone_name: [ schedule, ... ] */ }
188
+            },
167
           },
189
           },
168
           {
190
           {
169
             day: 4,
191
             day: 4,
175
             },
197
             },
176
             hdf: [ /* schedule, ... */],
198
             hdf: [ /* schedule, ... */],
177
             hd_hp: [ /* schedule, ... */],
199
             hd_hp: [ /* schedule, ... */],
200
+            hfhd_hp:[],
178
             new_hdf:{
201
             new_hdf:{
179
               am: { /* zone_name: [ schedule, ... ] */ },
202
               am: { /* zone_name: [ schedule, ... ] */ },
180
               pm: { /* zone_name: [ schedule, ... ] */ },
203
               pm: { /* zone_name: [ schedule, ... ] */ },
184
               am: { /* zone_name: [ schedule, ... ] */ },
207
               am: { /* zone_name: [ schedule, ... ] */ },
185
               pm: { /* zone_name: [ schedule, ... ] */ },
208
               pm: { /* zone_name: [ schedule, ... ] */ },
186
               evening: { /* zone_name: [ schedule, ... ] */ }
209
               evening: { /* zone_name: [ schedule, ... ] */ }
187
-            }
210
+            },
211
+             new_hfhd_hp:{
212
+              am: { /* zone_name: [ schedule, ... ] */ },
213
+              pm: { /* zone_name: [ schedule, ... ] */ },
214
+              evening: { /* zone_name: [ schedule, ... ] */ }
215
+            },
188
           },
216
           },
189
           {
217
           {
190
             day: 5,
218
             day: 5,
196
             },
224
             },
197
             hdf: [ /* schedule, ... */],
225
             hdf: [ /* schedule, ... */],
198
             hd_hp: [ /* schedule, ... */],
226
             hd_hp: [ /* schedule, ... */],
227
+            hfhd_hp:[],
199
             new_hdf:{
228
             new_hdf:{
200
               am: { /* zone_name: [ schedule, ... ] */ },
229
               am: { /* zone_name: [ schedule, ... ] */ },
201
               pm: { /* zone_name: [ schedule, ... ] */ },
230
               pm: { /* zone_name: [ schedule, ... ] */ },
205
               am: { /* zone_name: [ schedule, ... ] */ },
234
               am: { /* zone_name: [ schedule, ... ] */ },
206
               pm: { /* zone_name: [ schedule, ... ] */ },
235
               pm: { /* zone_name: [ schedule, ... ] */ },
207
               evening: { /* zone_name: [ schedule, ... ] */ }
236
               evening: { /* zone_name: [ schedule, ... ] */ }
208
-            }
237
+            },
238
+             new_hfhd_hp:{
239
+              am: { /* zone_name: [ schedule, ... ] */ },
240
+              pm: { /* zone_name: [ schedule, ... ] */ },
241
+              evening: { /* zone_name: [ schedule, ... ] */ }
242
+            },
209
           },
243
           },
210
           {
244
           {
211
             day: 6,
245
             day: 6,
217
             },
251
             },
218
             hdf: [ /* schedule, ... */],
252
             hdf: [ /* schedule, ... */],
219
             hd_hp: [ /* schedule, ... */],
253
             hd_hp: [ /* schedule, ... */],
254
+            hfhd_hp:[],
220
             new_hdf:{
255
             new_hdf:{
221
               am: { /* zone_name: [ schedule, ... ] */ },
256
               am: { /* zone_name: [ schedule, ... ] */ },
222
               pm: { /* zone_name: [ schedule, ... ] */ },
257
               pm: { /* zone_name: [ schedule, ... ] */ },
226
               am: { /* zone_name: [ schedule, ... ] */ },
261
               am: { /* zone_name: [ schedule, ... ] */ },
227
               pm: { /* zone_name: [ schedule, ... ] */ },
262
               pm: { /* zone_name: [ schedule, ... ] */ },
228
               evening: { /* zone_name: [ schedule, ... ] */ }
263
               evening: { /* zone_name: [ schedule, ... ] */ }
229
-            }
264
+            },
265
+             new_hfhd_hp:{
266
+              am: { /* zone_name: [ schedule, ... ] */ },
267
+              pm: { /* zone_name: [ schedule, ... ] */ },
268
+              evening: { /* zone_name: [ schedule, ... ] */ }
269
+            },
230
           },
270
           },
231
           {
271
           {
232
             day: 7,
272
             day: 7,
238
             },
278
             },
239
             hdf: [ /* schedule, ... */],
279
             hdf: [ /* schedule, ... */],
240
             hd_hp: [ /* schedule, ... */],
280
             hd_hp: [ /* schedule, ... */],
281
+            hfhd_hp:[],
241
             new_hdf:{
282
             new_hdf:{
242
               am: { /* zone_name: [ schedule, ... ] */ },
283
               am: { /* zone_name: [ schedule, ... ] */ },
243
               pm: { /* zone_name: [ schedule, ... ] */ },
284
               pm: { /* zone_name: [ schedule, ... ] */ },
247
               am: { /* zone_name: [ schedule, ... ] */ },
288
               am: { /* zone_name: [ schedule, ... ] */ },
248
               pm: { /* zone_name: [ schedule, ... ] */ },
289
               pm: { /* zone_name: [ schedule, ... ] */ },
249
               evening: { /* zone_name: [ schedule, ... ] */ }
290
               evening: { /* zone_name: [ schedule, ... ] */ }
250
-            }
291
+            },
292
+             new_hfhd_hp:{
293
+              am: { /* zone_name: [ schedule, ... ] */ },
294
+              pm: { /* zone_name: [ schedule, ... ] */ },
295
+              evening: { /* zone_name: [ schedule, ... ] */ }
296
+            },
251
           }
297
           }
252
         ],
298
         ],
253
 
299
 
320
             } else if (schedule.mode.id == 3) { // HD+HF
366
             } else if (schedule.mode.id == 3) { // HD+HF
321
 
367
 
322
               main_collection.hd_hp.push(schedule)
368
               main_collection.hd_hp.push(schedule)
369
+            }else if(schedule.mode.id == 9){ //HFHD+HP
370
+               main_collection.hfhd_hp.push(schedule)
323
             }
371
             }
324
 
372
 
325
           }
373
           }