Browse Source

龙岗二院打印预览开发

XMLWAN 4 years ago
parent
commit
fc20d5cd5a

+ 46 - 19
src/api/dialysis.js View File

@@ -17,6 +17,7 @@ export function getWaitingScheduals(params) {
17 17
 }
18 18
 
19 19
 export function getDialysisRecord(params) {
20
+  console.log('params', params)
20 21
   return request({
21 22
     url: '/m/api/dialysis/record',
22 23
     method: 'get',
@@ -36,8 +37,9 @@ export function commitTreatmentSummary(params) {
36 37
     url: '/m/api/dialysis/treatmentSummary',
37 38
     method: 'post',
38 39
     params: params,
39
-    headers:{"Permission":1},
40
-
40
+    headers: {
41
+      'Permission': 1
42
+    }
41 43
 
42 44
   })
43 45
 }
@@ -47,7 +49,9 @@ export function commitDoubleCheck(params) {
47 49
     url: '/m/api/dialysis/doublecheck',
48 50
     method: 'post',
49 51
     params: params,
50
-    headers:{"Permission":1},
52
+    headers: {
53
+      'Permission': 1
54
+    }
51 55
   })
52 56
 }
53 57
 
@@ -56,8 +60,9 @@ export function commitAcceptsAssessment(params) {
56 60
     url: '/m/api/dialysis/acceptsAssessment',
57 61
     method: 'post',
58 62
     params: params,
59
-    headers:{"Permission":1},
60
-
63
+    headers: {
64
+      'Permission': 1
65
+    }
61 66
 
62 67
   })
63 68
 }
@@ -67,18 +72,22 @@ export function finish(params) {
67 72
     url: '/m/api/dialysis/finish',
68 73
     method: 'post',
69 74
     params: params,
70
-    headers:{"Permission":1},
75
+    headers: {
76
+      'Permission': 1
77
+    }
71 78
 
72 79
   })
73 80
 }
74 81
 
75 82
 export function commitDialysisPrescription(params) {
76
-  console.log(params)
83
+  console.log('params', params)
77 84
   return request({
78 85
     url: '/m/api/dialysis/dialysisPrescription',
79 86
     method: 'post',
80 87
     params: params,
81
-    headers:{"Permission":1},
88
+    headers: {
89
+      'Permission': 1
90
+    }
82 91
 
83 92
   })
84 93
 }
@@ -88,7 +97,9 @@ export function commitAssessmentAfterDislysis(params) {
88 97
     url: '/m/api/dialysis/assessmentAfterDislysis',
89 98
     method: 'post',
90 99
     params: params,
91
-    headers:{"Permission":1},
100
+    headers: {
101
+      'Permission': 1
102
+    }
92 103
 
93 104
   })
94 105
 }
@@ -98,7 +109,9 @@ export function addMonitorRecord(params) {
98 109
     url: '/m/api/monitor/add',
99 110
     method: 'post',
100 111
     params: params,
101
-    headers:{"Permission":1},
112
+    headers: {
113
+      'Permission': 1
114
+    }
102 115
 
103 116
   })
104 117
 }
@@ -109,7 +122,9 @@ export function editMonitorRecord(params) {
109 122
     url: '/m/api/monitor/edit',
110 123
     method: 'post',
111 124
     params: params,
112
-    headers:{"Permission":1},
125
+    headers: {
126
+      'Permission': 1
127
+    }
113 128
 
114 129
   })
115 130
 }
@@ -119,7 +134,9 @@ export function deleteMonitorRecord(params) {
119 134
     url: '/m/api/monitor/delete',
120 135
     method: 'post',
121 136
     params: params,
122
-    headers:{"Permission":1},
137
+    headers: {
138
+      'Permission': 1
139
+    }
123 140
 
124 141
   })
125 142
 }
@@ -145,8 +162,9 @@ export function postSolution(params) {
145 162
     url: '/m/api/solution',
146 163
     method: 'post',
147 164
     params: params,
148
-    headers:{"Permission":1},
149
-
165
+    headers: {
166
+      'Permission': 1
167
+    }
150 168
 
151 169
   })
152 170
 }
@@ -156,7 +174,9 @@ export function startDialysis(params) {
156 174
     url: '/m/api/dialysis/start',
157 175
     method: 'post',
158 176
     params: params,
159
-    headers:{"Permission":1},
177
+    headers: {
178
+      'Permission': 1
179
+    }
160 180
 
161 181
   })
162 182
 }
@@ -170,6 +190,7 @@ export function getLastAccepts(params) {
170 190
 }
171 191
 
172 192
 export function getPrintDialysisRecord(params) {
193
+  console.log('params------', params)
173 194
   return request({
174 195
     url: '/m/api/print/dialysisorder',
175 196
     method: 'Get',
@@ -231,7 +252,9 @@ export function PostModifyStartDialysis(params) {
231 252
     url: '/m/api/startOrder/edit',
232 253
     method: 'post',
233 254
     params: params,
234
-    headers:{"Permission":1},
255
+    headers: {
256
+      'Permission': 1
257
+    }
235 258
 
236 259
   })
237 260
 }
@@ -241,7 +264,9 @@ export function PostModifyEndDialysis(params) {
241 264
     url: '/m/api/finishOrder/edit',
242 265
     method: 'post',
243 266
     params: params,
244
-    headers:{"Permission":1},
267
+    headers: {
268
+      'Permission': 1
269
+    }
245 270
 
246 271
   })
247 272
 }
@@ -250,7 +275,7 @@ export function CreateGroupAdvice(id, groupno, advices) {
250 275
   return request({
251 276
     url: '/m/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
252 277
     method: 'post',
253
-    data: advices,
278
+    data: advices
254 279
   })
255 280
 }
256 281
 
@@ -259,7 +284,9 @@ export function CreateDryWeight(params) {
259 284
     url: '/m/api/dryweight/commit',
260 285
     method: 'post',
261 286
     params: params,
262
-    headers:{"Permission":1},
287
+    headers: {
288
+      'Permission': 1
289
+    }
263 290
 
264 291
   })
265 292
 }

+ 20 - 6
src/pages/main/PrintIndex.vue View File

@@ -42,6 +42,17 @@
42 42
         v-bind:childResponse="childResponse"
43 43
         v-if="org_template_info.template_id == 6"
44 44
       ></DialysisPrintOrderSix>
45
+        <DialysisPrintOrderSeven
46
+        style="margin-top:60px;"
47
+        v-bind:childResponse="childResponse"
48
+        v-if="org_template_info.template_id == 7"
49
+      ></DialysisPrintOrderSeven>
50
+      <DialysisPrintOrderEight
51
+       style="margin-top:60px;"
52
+        v-bind:childResponse="childResponse"
53
+        v-if="org_template_info.template_id == 8"
54
+      >
55
+      </DialysisPrintOrderEight>
45 56
       <DialysisPrintOrderTen
46 57
         style="margin-top:60px;"
47 58
         v-bind:childResponse="childResponse"
@@ -65,7 +76,8 @@ import DialysisPrintOrderTwo from "./template/DialysisPrintOrderTwo";
65 76
 import DialysisPrintOrderFive from "./template/DialysisPrintOrderFive";
66 77
 import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
67 78
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
68
-
79
+import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
80
+import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
69 81
 export default {
70 82
   name: "PrintIndex",
71 83
   components: {
@@ -74,6 +86,8 @@ export default {
74 86
     DialysisPrintOrderOne,
75 87
     DialysisPrintOrderTwo,
76 88
     DialysisPrintOrderFive,
89
+    DialysisPrintOrderSeven,
90
+    DialysisPrintOrderEight,
77 91
     LabelBox,
78 92
     SideBar
79 93
   },
@@ -199,7 +213,7 @@ export default {
199 213
         return "";
200 214
       }
201 215
       var name = "";
202
-      if (this.users == null || typeof this.users.length == "undefined") {
216
+      if (this.users == null || typeof this.users.length === "undefined") {
203 217
         return name;
204 218
       }
205 219
       var leng = this.users.length;
@@ -228,8 +242,8 @@ export default {
228 242
       return "";
229 243
     },
230 244
     modeName(mode_id) {
231
-      return typeof this.modeOptions[mode_id] != "undefined" &&
232
-        typeof this.modeOptions[mode_id].name != "undefined"
245
+      return typeof this.modeOptions[mode_id] !== "undefined" &&
246
+        typeof this.modeOptions[mode_id].name !== "undefined"
233 247
         ? this.modeOptions[mode_id].name
234 248
         : "";
235 249
     },
@@ -348,9 +362,9 @@ export default {
348 362
     const xtdate = this.$route.query && this.$route.query.xtdate;
349 363
     const xtno = this.$route.query && this.$route.query.xtno;
350 364
     if (
351
-      typeof xtdate == "string" &&
365
+      typeof xtdate === "string" &&
352 366
       xtdate.length > 0 &&
353
-      typeof xtno == "string" &&
367
+      typeof xtno === "string" &&
354 368
       xtno.length > 0
355 369
     ) {
356 370
       this.queryParams.xtdate = xtdate;

+ 2 - 1
src/pages/main/dialog/MonitDialog.vue View File

@@ -73,8 +73,9 @@
73 73
                   v-if="isShow('置换量')"
74 74
                 >{{item.displacement_quantity?item.displacement_quantity:''}}</td>
75 75
                  <td
76
-                  v-if="isShow('SpO₂')"
76
+                  v-if="isShow('SpO₂') && template_id != 6 && template_id != 10"
77 77
                 >{{item.blood_oxygen_saturation?item.blood_oxygen_saturation:''}}</td>
78
+
78 79
                 <td v-if="isShow('电导度')">{{item.conductivity?item.conductivity:''}}</td>
79 80
                 <td
80 81
                   v-if="isShow('置换液流量')"

File diff suppressed because it is too large
+ 1101 - 1069
src/pages/main/dialog/PrescriptionDialog.vue


File diff suppressed because it is too large
+ 1959 - 0
src/pages/main/template/DialysisPrintOrderEight.vue


+ 9 - 5
src/pages/main/template/DialysisPrintOrderOne.vue View File

@@ -81,7 +81,7 @@
81 81
                     <td width="50">意识:</td>
82 82
                     <td width="220">
83 83
                       <div>
84
-                        <label-box v-for="(item, index) in consciousness_arr" :key="index" :isChecked='receiverTreatmentAccess.consciousness==item.id?true:false' :showValue='item.name'></label-box>
84
+                        <label-box v-for="(item, j) in consciousness_arr" :key="j" :isChecked='receiverTreatmentAccess.consciousness==item.id?true:false' :showValue='item.name'></label-box>
85 85
 
86 86
                         <!--<label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false'-->
87 87
                                    <!--showValue='清醒'></label-box>-->
@@ -112,7 +112,7 @@
112 112
                     <td width="40">体位:</td>
113 113
                     <td width="400">
114 114
                       <div>
115
-                        <label-box v-for="(item, index) in posture_arr" :key="index" :isChecked='receiverTreatmentAccess.posture==item.id?true:false' :showValue='item.name'></label-box>
115
+                        <label-box v-for="(item, i) in posture_arr" :key="i" :isChecked='receiverTreatmentAccess.posture==item.id?true:false' :showValue='item.name'></label-box>
116 116
 
117 117
                         <!--<label-box :isChecked='receiverTreatmentAccess.posture==1?true:false'-->
118 118
                                    <!--showValue='自动体位'></label-box>-->
@@ -373,12 +373,16 @@
373 373
                     <td width="40">mg/h</td>
374 374
                     <td width="10">)</td>
375 375
 
376
-                    <td width="95">
377
-                      <label-box :isChecked="prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box>
376
+                    <td width="120">
377
+                      <span v-if="prescription.anticoagulant == 3"><label-box :isChecked="prescription.anticoagulant==3?true:false" showValue='低分子肝素'></label-box></span>
378
+                      <span v-if="prescription.anticoagulant == 6"><label-box :isChecked="prescription.anticoagulant==6?true:false" showValue='低分子肝素钙'></label-box></span>
379
+                      <span v-if="prescription.anticoagulant == 7"><label-box :isChecked="prescription.anticoagulant==7?true:false" showValue='低分子肝素钠'></label-box></span>
378 380
                     </td>
379 381
                     <td width="60">
380 382
                       <div class="under-line">&nbsp;
381 383
                         <span v-if="prescription.anticoagulant==3">{{prescription.anticoagulant_zongliang}}</span>
384
+                        <span v-if="prescription.anticoagulant==6">{{prescription.anticoagulant_zongliang}}</span>
385
+                        <span v-if="prescription.anticoagulant==7">{{prescription.anticoagulant_zongliang}}</span>
382 386
                       </div>
383 387
                     </td>
384 388
                     <td width="20">IU</td>
@@ -390,7 +394,7 @@
390 394
                     <td width="70">其他方式:</td>
391 395
                     <td width="">
392 396
                       <div class="under-line">&nbsp;
393
-                        <span v-if="prescription.anticoagulant>3">{{prescription.anticoagulant_name}}</span>
397
+                        <span v-if="prescription.anticoagulant ==4 || prescription.anticoagulant == 5">{{prescription.anticoagulant_name}}</span>
394 398
                       </div>
395 399
                     </td>
396 400
                   </tr>

File diff suppressed because it is too large
+ 1673 - 0
src/pages/main/template/DialysisPrintOrderSeven.vue


+ 37 - 2
src/pages/main/template/DialysisPrintOrderSix.vue View File

@@ -478,6 +478,23 @@
478 478
                       {{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}
479 479
                     </div>
480 480
                   </div>
481
+                   <div
482
+                  class="row"
483
+                  style="padding: 2px 0;line-height:23px;display:flex;"
484
+                >
485
+                  <div
486
+                    class="inline_block"
487
+                    style="flex:1; display:inline-block;"
488
+                  >
489
+                    备注:
490
+                    <div
491
+                      class="under_line"
492
+                      style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;"
493
+                    >
494
+                      {{ predialysis.remark ? predialysis.remark : "/" }}
495
+                    </div>
496
+                  </div>
497
+                </div>
481 498
                 </div>
482 499
               </td>
483 500
             </tr>
@@ -526,8 +543,8 @@
526 543
                       <td> {{ monitor.sodium_concentration  ? monitor.sodium_concentration : "" }}  </td>
527 544
                       <td v-if="monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : "" }} </td>
528 545
                       <td v-if="monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume  : 0 }} </td>
529
-                      <td v-if="  (prescription.mode_id == 2 || prescription.mode_id == 5) && monitor.operate_time > dialysisOrder.end_time  "  width="50" >  {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
530
-                      <td v-if=" (prescription.mode_id == 2 ||  prescription.mode_id == 5) && monitor.operate_time <= dialysisOrder.end_time  " width="50"  > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
546
+                      <td v-if="  (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && monitor.operate_time > dialysisOrder.end_time  "  width="50" >  {{ monitor.displacement_quantity ? monitor.displacement_quantity : "" }} </td>
547
+                      <td v-if=" (prescription.mode_id == 2 ||  prescription.mode_id == 5 || prescription.mode_id == 12) && monitor.operate_time <= dialysisOrder.end_time  " width="50"  > {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }} </td>
531 548
                       <td style="line-height:16px;padding:0px;">
532 549
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">
533 550
                           <span  style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
@@ -825,6 +842,23 @@
825 842
 
826 843
                 </div>
827 844
               </div>
845
+               <div
846
+                  class="row"
847
+                  style="padding: 2px 0;line-height:23px;display:flex;"
848
+                >
849
+                  <div
850
+                    class="inline_block"
851
+                    style="flex:1; display:inline-block;"
852
+                  >
853
+                    备注:
854
+                    <div
855
+                      class="under_line"
856
+                      style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;"
857
+                    >
858
+                      {{ afterdialysis.remark ? afterdialysis.remark : "/" }}
859
+                    </div>
860
+                  </div>
861
+                </div>
828 862
             </td>
829 863
           </tr>
830 864
           <tr>
@@ -1244,6 +1278,7 @@ export default {
1244 1278
         );
1245 1279
 
1246 1280
         this.prescription = response.data.data.dialysisPrescription;
1281
+        console.log("prescription", this.prescription);
1247 1282
         this.receiverTreatmentAccess =
1248 1283
           response.data.data.receiverTreatmentAccess;
1249 1284
 

+ 2 - 1
src/pages/main/today/dialysisPrescription.vue View File

@@ -432,7 +432,8 @@ export default {
432 432
       if (id == 0) {
433 433
         return "";
434 434
       }
435
-      var blood_access = this.$store.getters.blood_access;
435
+      // var blood_access = this.$store.getters.blood_access
436
+      var blood_access = getDataConfig("hemodialysis", "vascular_access_desc");
436 437
       console.log("blood_access", blood_access);
437 438
       for (let i = 0; i < blood_access.length; i++) {
438 439
         if (blood_access[i].id == id) {

+ 5 - 4
src/pages/my/modifyPassword.vue View File

@@ -126,11 +126,12 @@ export default {
126 126
   created() {
127 127
     setRem();
128 128
     this.GetCodeInit();
129
-    var creator = this.$store.getters.user.org.creator;
130
-    console.log("创建者", creator);
129
+    // var creator = this.$store.getters.user.org.creator;
130
+    // console.log("创建者", creator);
131
+
132
+    this.forgetForm.phone = this.$store.getters.user.admin.mobile;
131 133
     // 获取当前登录者的手机号码
132
-    this.getMyMobile(creator);
133
-    // this.forgetForm.phone = this.$store.getters.user.admin.mobile;
134
+    // this.getMyMobile(creator);
134 135
   },
135 136
   methods: {
136 137
     modifyAndLogin() {

+ 1 - 1
src/pages/my/organizationInfo.vue View File

@@ -65,7 +65,6 @@ export default {
65 65
           var name = response.data.data.name;
66 66
           this.org_short_name = name.org_name;
67 67
           this.org_logo = name.org_logo;
68
-          this.telephone = name.telephone;
69 68
           // console.log("name", name);
70 69
         }
71 70
       });
@@ -105,6 +104,7 @@ export default {
105 104
     var orgid = this.$route.query.orgid;
106 105
     this.getOrgName(orgid);
107 106
     this.getRoleName(id, orgid);
107
+    this.telephone = this.$store.getters.user.admin.mobile;
108 108
   }
109 109
 };
110 110
 </script>

+ 64 - 35
src/store/modules/globalConfig.js View File

@@ -526,6 +526,36 @@ const global_config = {
526 526
         zongliang_unit: '',
527 527
         gaimingcheng_unit: 'ml/h',
528 528
         gaijiliang_unit: ''
529
+      },
530
+      6: {
531
+        id: 6,
532
+        name: '低分子肝素钙',
533
+        type: 1,
534
+        shouji: 1,
535
+        weichi: 1,
536
+        zongliang: 1,
537
+        gaimingcheng: -1,
538
+        gaijiliang: -1,
539
+        shouji_unit: 'IU',
540
+        weichi_unit: 'IU',
541
+        zongliang_unit: 'IU',
542
+        gaimingcheng_unit: '',
543
+        gaijiliang_unit: ''
544
+      },
545
+      7: {
546
+        id: 7,
547
+        name: '低分子肝素钠',
548
+        type: 1,
549
+        shouji: 1,
550
+        weichi: 1,
551
+        zongliang: 1,
552
+        gaimingcheng: -1,
553
+        gaijiliang: -1,
554
+        shouji_unit: 'IU',
555
+        weichi_unit: 'IU',
556
+        zongliang_unit: 'IU',
557
+        gaimingcheng_unit: '',
558
+        gaijiliang_unit: ''
529 559
       }
530 560
       // 6: {
531 561
       //   id: 6,
@@ -1812,64 +1842,64 @@ const global_config = {
1812 1842
         name: '人造血管'
1813 1843
       },
1814 1844
       {
1815
-        id:4,
1816
-        name:'直穿'
1845
+        id: 4,
1846
+        name: '直穿'
1817 1847
       },
1818 1848
       {
1819
-        id:5,
1820
-        name:'股静脉'
1849
+        id: 5,
1850
+        name: '股静脉'
1821 1851
       },
1822 1852
       {
1823
-        id:6,
1824
-        name:'动脉直穿'
1853
+        id: 6,
1854
+        name: '动脉直穿'
1825 1855
       },
1826 1856
       {
1827
-        id:7,
1828
-        name:'动静脉直穿'
1857
+        id: 7,
1858
+        name: '动静脉直穿'
1829 1859
       },
1830 1860
       {
1831
-        id:8,
1832
-        name:"带隧道带绦纶套股静脉导管"
1861
+        id: 8,
1862
+        name: '带隧道带绦纶套股静脉导管'
1833 1863
       },
1834 1864
       {
1835
-        id:9,
1836
-        name:"带隧道带绦纶套锁骨下静脉导管"
1865
+        id: 9,
1866
+        name: '带隧道带绦纶套锁骨下静脉导管'
1837 1867
       },
1838 1868
       {
1839
-        id:10,
1840
-        name:"带隧道带绦纶套颈内静脉导管"
1869
+        id: 10,
1870
+        name: '带隧道带绦纶套颈内静脉导管'
1841 1871
       },
1842 1872
       {
1843
-        id:11,
1844
-        name:"无绦纶套股静脉导管"
1873
+        id: 11,
1874
+        name: '无绦纶套股静脉导管'
1845 1875
       },
1846 1876
       {
1847
-        id:12,
1848
-        name:"无绦纶套锁骨下静脉导管"
1877
+        id: 12,
1878
+        name: '无绦纶套锁骨下静脉导管'
1849 1879
       },
1850 1880
       {
1851
-        id:13,
1852
-        name:"无绦纶套颈内静脉导管"
1881
+        id: 13,
1882
+        name: '无绦纶套颈内静脉导管'
1853 1883
       },
1854 1884
       {
1855
-        id:14,
1856
-        name:"直线型移植血管动静脉内瘘"
1885
+        id: 14,
1886
+        name: '直线型移植血管动静脉内瘘'
1857 1887
       },
1858 1888
       {
1859
-        id:15,
1860
-        name:"直线型移植血管动静脉内瘘"
1889
+        id: 15,
1890
+        name: '直线型移植血管动静脉内瘘'
1861 1891
       },
1862 1892
       {
1863
-        id:16,
1864
-        name:"自体动静脉内瘘"
1893
+        id: 16,
1894
+        name: '自体动静脉内瘘'
1865 1895
       },
1866 1896
       {
1867
-        id:17,
1868
-        name:"袢型移植血管动静脉内瘘"
1897
+        id: 17,
1898
+        name: '袢型移植血管动静脉内瘘'
1869 1899
       },
1870 1900
       {
1871
-        id:18,
1872
-        name:"静脉直穿"
1901
+        id: 18,
1902
+        name: '静脉直穿'
1873 1903
       }
1874 1904
     ],
1875 1905
     displace_liqui: [{
@@ -2216,11 +2246,10 @@ const global_config = {
2216 2246
         name: 'A钝针'
2217 2247
       }
2218 2248
     ],
2219
-    channel: [
2220
-      {
2221
-      id: 1,
2222
-      name: '无'
2223
-    },
2249
+    channel: [{
2250
+        id: 1,
2251
+        name: '无'
2252
+      },
2224 2253
       {
2225 2254
         id: 2,
2226 2255
         name: '+'