28169 6 个月前
父节点
当前提交
2e33960bb8

+ 18 - 0
package-lock.json 查看文件

1740
       "dev": true,
1740
       "dev": true,
1741
       "optional": true
1741
       "optional": true
1742
     },
1742
     },
1743
+    "bindings": {
1744
+      "version": "1.5.0",
1745
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
1746
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
1747
+      "dev": true,
1748
+      "optional": true,
1749
+      "requires": {
1750
+        "file-uri-to-path": "1.0.0"
1751
+      }
1752
+    },
1743
     "block-stream": {
1753
     "block-stream": {
1744
       "version": "0.0.9",
1754
       "version": "0.0.9",
1745
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
1755
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
5139
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
5149
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
5140
       "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
5150
       "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
5141
     },
5151
     },
5152
+    "file-uri-to-path": {
5153
+      "version": "1.0.0",
5154
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
5155
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
5156
+      "dev": true,
5157
+      "optional": true
5158
+    },
5142
     "filesize": {
5159
     "filesize": {
5143
       "version": "3.6.1",
5160
       "version": "3.6.1",
5144
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
5161
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
14706
           "dev": true,
14723
           "dev": true,
14707
           "optional": true,
14724
           "optional": true,
14708
           "requires": {
14725
           "requires": {
14726
+            "bindings": "^1.5.0",
14709
             "nan": "^2.12.1"
14727
             "nan": "^2.12.1"
14710
           }
14728
           }
14711
         },
14729
         },

+ 2 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

2638
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
2638
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
2639
         console.log("除非=======================")
2639
         console.log("除非=======================")
2640
       
2640
       
2641
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721){
2641
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726){
2642
           if(this.predialysis!=undefined){
2642
           if(this.predialysis!=undefined){
2643
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2643
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2644
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
2644
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
3103
         this.pre = pre
3103
         this.pre = pre
3104
         // console.log("pre1", pre);
3104
         // console.log("pre1", pre);
3105
         this.getPermission()
3105
         this.getPermission()
3106
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0){
3106
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726){
3107
           this.getPatientBefor()
3107
           this.getPatientBefor()
3108
         }
3108
         }
3109
       
3109
       

+ 15 - 3
src/xt_pages/dialysis/doctorAdvicePrint.vue 查看文件

18
                     <tr>
18
                     <tr>
19
                     <th width="40px">姓名</th>
19
                     <th width="40px">姓名</th>
20
                     <th width="40px">透析器</th>
20
                     <th width="40px">透析器</th>
21
+                    <th width="40px">床位号</th>
21
                     <!-- <th width="50px">类型</th> -->
22
                     <!-- <th width="50px">类型</th> -->
22
                     <th width="50px">开始时间</th>
23
                     <th width="50px">开始时间</th>
23
                     <th width="100px">医嘱内容</th>
24
                     <th width="100px">医嘱内容</th>
41
                         <td></td>
42
                         <td></td>
42
                         <td></td>
43
                         <td></td>
43
                         <td></td>
44
                         <td></td>
45
+                        <td></td>
44
                     </tr>
46
                     </tr>
45
                     <template v-for="schedule in schedules">
47
                     <template v-for="schedule in schedules">
46
                         <template v-for="(group, group_index) in schedule.new_advice">
48
                         <template v-for="(group, group_index) in schedule.new_advice">
67
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
69
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
68
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
70
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
69
                             <span v-if="schedule.mode_id == 24">I-HDF</span>
71
                             <span v-if="schedule.mode_id == 24">I-HDF</span>
72
+
73
+                          
70
                             </td>
74
                             </td>
75
+                           
71
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
76
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
72
-                            {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
77
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
78
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_dialyszers : "/"}}
79
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_irrigation : "/"}}
80
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_strainer : ""}}
81
+                              
82
+                            </td>
83
+                            <td>
84
+                                {{ schedule.device_number.number }}
73
                             </td>
85
                             </td>
74
                             <!-- <td
86
                             <!-- <td
75
                             v-if="advice_index == 0"
87
                             v-if="advice_index == 0"
475
                     }
487
                     }
476
                  }
488
                  }
477
 
489
 
478
-
490
+                 console.log("sort===========",scheduleMap)
479
                  this.scheduleMap = scheduleMap
491
                  this.scheduleMap = scheduleMap
480
                 }
492
                 }
481
 
493
 
634
                     }
646
                     }
635
                  }
647
                  }
636
 
648
 
637
-
649
+                     console.log("scheduleMap------------------",scheduleMap)
638
                      this.scheduleMap = scheduleMap
650
                      this.scheduleMap = scheduleMap
639
                  }
651
                  }
640
 
652
 

+ 3 - 1
src/xt_pages/dialysis/doctorAdvicePrintTwo.vue 查看文件

142
                      for(let j=0;j<hisAdvices[i].doctor_advice.length;j++){
142
                      for(let j=0;j<hisAdvices[i].doctor_advice.length;j++){
143
                         hisAdvices[i].doctor_advice[j].patient_name = ""
143
                         hisAdvices[i].doctor_advice[j].patient_name = ""
144
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
144
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
145
+                        hisAdvices[i].doctor_advice[j].sort = 0
146
+                        hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
145
                         if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
147
                         if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
146
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
148
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
147
                              newArr.push(hisAdvices[i].doctor_advice[j])
149
                              newArr.push(hisAdvices[i].doctor_advice[j])
151
                    }
153
                    }
152
                 }
154
                 }
153
                 this.tableData = []
155
                 this.tableData = []
154
-                this.tableData = newArr
156
+                this.tableData = newArr.sort((a, b) => a.sort - b.sort)
155
                 console.log("newArr------",newArr)
157
                 console.log("newArr------",newArr)
156
                
158
                
157
                }
159
                }

+ 2 - 2
src/xt_pages/dialysis/newDoctorAdvice.vue 查看文件

1550
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1550
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1551
        }
1551
        }
1552
 
1552
 
1553
-       if(this.org_id == 0 || this.org_id == 10721){
1553
+       if(this.org_id == 10721){
1554
          this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1554
          this.$router.push({ path: "/dialysis/doctorAdvicePrint/two",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way,schedulType:this.schedulType,partitionType:this.partitionType} });
1555
        }
1555
        }
1556
 
1556
 
1557
-       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0 && this.org_id!=10721){
1557
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=10721){
1558
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
1558
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
1559
        }
1559
        }
1560
 
1560
 

+ 13 - 13
src/xt_permission.js 查看文件

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))