hah

package-lock.json

@@ -1740,6 +1740,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "block-stream": {
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
@@ -5139,6 +5149,13 @@
       "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-1.3.8.tgz",
       "integrity": "sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg=="
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -14706,6 +14723,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -2638,7 +2638,7 @@ mu
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
       
-        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){
+        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){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
@@ -3103,7 +3103,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        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){
+        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){
           this.getPatientBefor()
         }
       

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -18,6 +18,7 @@
                     <tr>
                     <th width="40px">姓名</th>
                     <th width="40px">透析器</th>
+                    <th width="40px">床位号</th>
                     <!-- <th width="50px">类型</th> -->
                     <th width="50px">开始时间</th>
                     <th width="100px">医嘱内容</th>
@@ -41,6 +42,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
                     </tr>
                     <template v-for="schedule in schedules">
                         <template v-for="(group, group_index) in schedule.new_advice">
@@ -67,9 +69,19 @@
                             <span v-if="schedule.mode_id == 13">(CRRT)</span>
                             <span v-if="schedule.mode_id == 14">(腹水回输)</span>
                             <span v-if="schedule.mode_id == 24">I-HDF</span>
+
+                          
                             </td>
+                           
                             <td v-if="advice_index == 0" :rowspan="group.advices.length">
-                            {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialyzer_perfusion_apparatus : ""}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_dialyszers : "/"}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_irrigation : "/"}}
+                               {{advice.parent_id == 0 && schedule.prescription!=null ?  schedule.prescription.dialysis_strainer : ""}}
+                              
+                            </td>
+                            <td>
+                                {{ schedule.device_number.number }}
                             </td>
                             <!-- <td
                             v-if="advice_index == 0"
@@ -475,7 +487,7 @@ export default {
                     }
                  }
 
-
+                 console.log("sort===========",scheduleMap)
                  this.scheduleMap = scheduleMap
                 }
 
@@ -634,7 +646,7 @@ export default {
                     }
                  }
 
-
+                     console.log("scheduleMap------------------",scheduleMap)
                      this.scheduleMap = scheduleMap
                  }
 

src/xt_pages/dialysis/doctorAdvicePrintTwo.vue

@@ -142,6 +142,8 @@ export default {
                      for(let j=0;j<hisAdvices[i].doctor_advice.length;j++){
                         hisAdvices[i].doctor_advice[j].patient_name = ""
                         hisAdvices[i].doctor_advice[j].patient_name = hisAdvices[i].patient.name
+                        hisAdvices[i].doctor_advice[j].sort = 0
+                        hisAdvices[i].doctor_advice[j].sort =  hisAdvices[i].device_number.sort
                         if(hisAdvices[i].doctor_advice[j].delivery_way !='口服' && hisAdvices[i].doctor_advice[j].delivery_way!='中药口服'){
                           if(hisAdvices[i].doctor_advice[j].execution_frequency.indexOf('上机前')==-1){
                              newArr.push(hisAdvices[i].doctor_advice[j])
@@ -151,7 +153,7 @@ export default {
                    }
                 }
                 this.tableData = []
-                this.tableData = newArr
+                this.tableData = newArr.sort((a, b) => a.sort - b.sort)
                 console.log("newArr------",newArr)
                
                }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1550,11 +1550,11 @@ export default {
         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} });
        }
 
-       if(this.org_id == 0 || this.org_id == 10721){
+       if(this.org_id == 10721){
          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} });
        }
 
-       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0 && this.org_id!=10721){
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=10721){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))