Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -70939,7 +70939,16 @@ const global_config = {
       name: '低血压'
     }
     ],
-    arterial_tube: [{
+    arterial_tube: [
+      {
+        id: -1,
+        name: '有'
+      },
+      {
+        id: -2,
+        name: '无'
+      },
+      {
       id: 1,
       name: '动脉管道0'
     },

src/xt_pages/dialysis/details/dialog/MultiSelectBox/index.vue

@@ -14,6 +14,7 @@
         :key="index"
       ></el-checkbox>
     </el-checkbox-group>
+
     <el-input
       v-show="propsForm.isShowTextArea"
       v-model="customData"
@@ -60,6 +61,7 @@ export default {
     },
 
     getValue: function() {
+     
       var returnData = [];
       for (var index in this.checkedData) {
         returnData.push(this.checkedData[index]);

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

@@ -815,7 +815,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('透析器')">
+                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10727">
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
                                       @focus="showInnerDialog('7')"></el-input>
@@ -823,13 +823,30 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('灌流器')">
+                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id == 10727"  >
+                        <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
+                            <el-input v-model="dialysisPrescription.dialysis_dialyszers"
+                                      @focus="showInnerDialog('20')"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                
+
+
+                    <el-col :span="8" v-if="isShows('灌流器')" && this.$store.getters.xt_user.template_info.org_id != 10727>
                         <el-form-item label="灌流器:" prop="dialysis_irrigation" :rules="isCheckmust('灌流器')">
                             <el-input v-model="dialysisPrescription.dialysis_irrigation"
                                       @focus="showInnerDialog('8')"></el-input>
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8">
+                        <el-form-item label="灌流器:" prop="dialysis_irrigation" :rules="isCheckmust('灌流器')">
+                            <el-input v-model="dialysisPrescription.dialysis_irrigation"
+                                      @focus="showInnerDialog('21')"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                      <el-col :span="8" v-if="isShows('滤过器')">
                         <el-form-item label="滤过器:" prop="dialysis_strainer" :rules="isCheckmust('滤过器')">
                             <el-input v-model="dialysisPrescription.dialysis_strainer"
@@ -1437,6 +1454,13 @@
                 v-on:dialog-cancle="innerDialogCancle"
         ></multi-select-box>
 
+        <radio-select-box
+         :propsForm="InnerDialogPropsOne"
+         v-on:dialog-comfirm="innerDialogComfirmOne"
+         v-on:dialog-cancle="innerDialogCancleOne">
+
+        </radio-select-box>
+
 
      <el-dialog
       title="提示"
@@ -1482,10 +1506,11 @@
   import MsgTip from './MsgTip'
   import request from '@/utils/request'
   import multiSelectBox from './MultiSelectBox'
+  import radioSelectBox from './RadioSelectBox'
   const moment = require('moment')
   export default {
     name: 'dialysisPrescriptionDialog',
-    components: { MsgTip, multiSelectBox },
+    components: { MsgTip, multiSelectBox,radioSelectBox },
     props: {
       mode_id: {
         type: Number
@@ -1720,6 +1745,14 @@
           titles: '',
           type: '' // 不同弹框类型，用来匹配数据
         },
+        InnerDialogPropsOne:{
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
         advice_start_time: '',
         showTxt: '',
         start_time: '',
@@ -1949,8 +1982,14 @@
 
       },
       showInnerDialog: function(val) {
+        console.log("处方=======================",val)
+        
+        if(val == 20 || val == 21){
+          this.InnerDialogPropsOne.visibility = true
+        }else{
+          this.InnerDialogProps.visibility = true
+        }
 
-        this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
 
@@ -1975,12 +2014,14 @@
             for (let i = 0; i < this.dialyzers.length; i++) {
               this.dialyzers[i].name = this.dialyzers[i].specification_name
             }
+            
             this.InnerDialogProps.values = this.dialyzers
             this.InnerDialogProps.titles = '透析器'
             this.InnerDialogProps.type = 'dialyzers'
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_dialyszers
             this.InnerDialogProps.isShowTextArea = false
             break
+          
           case '8':
             for (let i = 0; i < this.irrigations.length; i++) {
               this.irrigations[i].name = this.irrigations[i].specification_name
@@ -2035,10 +2076,32 @@ mu
             this.InnerDialogProps.isShowTextArea = false
 
             break
+            case '20': // 透析器
+             
+              for (let i = 0; i < this.dialyzers.length; i++) {
+                this.dialyzers[i].name = this.dialyzers[i].specification_name
+              }
+              this.InnerDialogPropsOne.values = this.dialyzers
+              this.InnerDialogPropsOne.titles = '透析器'
+              this.InnerDialogPropsOne.type = 'dialyzers'
+              this.InnerDialogPropsOne.selected = this.dialysisPrescription.dialysis_dialyszers
+              this.InnerDialogPropsOne.isShowTextArea = false
+              break
+           case '21':
+            for (let i = 0; i < this.irrigations.length; i++) {
+              this.irrigations[i].name = this.irrigations[i].specification_name
+            }
+            this.InnerDialogPropsOne.values = this.irrigations
+            this.InnerDialogPropsOne.titles = '灌流器'
+            this.InnerDialogPropsOne.type = 'irrigations'
+            this.InnerDialogPropsOne.selected = this.dialysisPrescription.dialysis_irrigation
+            this.InnerDialogPropsOne.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
-
+          
+       
 
         this.InnerDialogProps.visibility = false
         switch (val.type) {
@@ -2124,6 +2187,49 @@ mu
         this.InnerDialogProps.visibility = false
       },
 
+
+      innerDialogComfirmOne: function(val) {
+       
+          this.InnerDialogPropsOne.visibility = false
+          switch (val.type) {
+            case 'dialyzers':
+              var newArr = []
+              if(this.dialyzers!=null && this.dialyzers.length >0){
+                for(let i=0;i<this.dialyzers.length;i++){
+                  if(this.dialyzers[i].specification_name == val.value){
+                    newArr.push(val.value)
+                  }
+                }
+              }
+              if(newArr!=null && newArr.length >0){
+               this.dialysisPrescription.dialysis_dialyszers = newArr.join(',')
+              }else{
+                this.dialysisPrescription.dialysis_dialyszers = ""
+              }
+  
+              break
+            case 'irrigations':
+              var newArr = []
+              console.log("irrigations0000000000000000",this.irrigations)
+              if(this.irrigations!=null && this.irrigations.length >0){
+                for(let i=0;i<this.irrigations.length;i++){
+                  if(this.irrigations[i].specification_name == val.value){
+                    newArr.push(val.value)
+                  }
+                }
+              }
+              if(newArr!=null && newArr.length>0){
+               this.dialysisPrescription.dialysis_irrigation = newArr.join(',')
+              }else{
+                this.dialysisPrescription.dialysis_irrigation = ""
+              }
+              break
+           
+          }
+        },
+      innerDialogCancleOne: function() {
+       this.InnerDialogPropsOne.visibility = false
+      },
       getDryWeight() {
         if (this.dry_weight != null && this.dry_weight.id > 0) {
           return this.dry_weight.dry_weight

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -114,9 +114,9 @@
         <div class="row">
           抗凝药物&nbsp;&nbsp;
           <div class="inline_block under_line" style="width:90%;text-align: left;">
-            {{ prescription.anticoagulant_name ? prescription.anticoagulant_name : '/' }}
+            {{ prescription.anticoagulant ? prescription.anticoagulant : '/' }}
             <div class="inline_block">&nbsp;&nbsp;&nbsp;
-              剂量：首次
+              剂量：首剂
               <div class="inline_block" style="width:50px;text-align:center">
                   {{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "/" }}
               </div>
@@ -339,6 +339,7 @@
           <tbody>
               <tr style="line-height:20px;">
                 <td width="60">时间</td>
+                <td width="30">据测血压</td>
                 <td width="60">BP<br/>mmHg</td>
                 <td width="40">脉搏<br/>次/分</td>
                 <td width="40">血流速<br/>ml/min</td>
@@ -355,9 +356,13 @@
                 <td style="height:35px;line-height:35px">&nbsp;
                   {{getTime(monitor.operate_time,'{h}:{i}')}}
                 </td>
+                <td>
+                  {{monitor.is_pressure}}
+                </td>
                 <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} <span v-if="monitor.systolic_blood_pressure||monitor.diastolic_blood_pressure">/</span>
                   {{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}
                 </td>
+               
                 <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
                 <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
                 <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}
@@ -633,6 +638,16 @@
             </div>
             mmol/L
           </div>
+          <div class="inline_block" style="margin-left: 10px">
+            葡萄糖：
+            <div
+              class="under_line"
+              style="width: 50px; text-align: center"
+            >
+              {{ prescription.amylaceum ? prescription.amylaceum : "/" }}
+            </div>
+            mmol/L
+          </div>
       </div>
     </div>
   </div>
@@ -1306,12 +1321,51 @@ export default {
           this.doctorForm.url = doctorname.url
           var prescription = response.data.data.dialysisPrescription
           console.log('透析处方', prescription)
+          if (prescription.anticoagulant === 1) {
+            prescription.anticoagulant = '无肝素'
+          }
+          if (prescription.anticoagulant === 2) {
+            prescription.anticoagulant = '普通肝素'
+          }
+          if (prescription.anticoagulant === 3) {
+            prescription.anticoagulant = '低分子肝素'
+          }
+          if (prescription.anticoagulant === 4) {
+            prescription.anticoagulant = '阿加曲班'
+          }
+          if (prescription.anticoagulant === 5) {
+            prescription.anticoagulant = '枸橼酸钠'
+          }
           if (prescription.anticoagulant == 6) {
             prescription.anticoagulant = '低分子肝素钙'
           }
           if (prescription.anticoagulant == 7) {
             prescription.anticoagulant = '低分子肝素钠'
           }
+          if (prescription.anticoagulant == 8) {
+            prescription.anticoagulant = '依诺肝素'
+          }
+          if (prescription.anticoagulant == 9) {
+            prescription.anticoagulant = '达肝素'
+          }
+          if (prescription.anticoagulant == 10) {
+            prescription.anticoagulant = '体外抗凝'
+          }
+          if (prescription.anticoagulant == 11) {
+            prescription.anticoagulant = '那屈肝素'
+          }
+          if (prescription.anticoagulant == 12) {
+            prescription.anticoagulant = '无抗凝剂'
+          }
+          if (prescription.anticoagulant == 13) {
+            prescription.anticoagulant = '那屈肝素钙'
+          }
+          if (prescription.anticoagulant == 14) {
+            prescription.anticoagulant = '肝素钙注射液'
+          }
+          if (prescription.anticoagulant == 15) {
+            prescription.anticoagulant = '甲磺酸萘莫司他'
+          }
           if (prescription.blood_access === 1) {
             prescription.blood_access = '正常'
           }
@@ -1348,21 +1402,7 @@ export default {
           if (prescription.replacement_way === 4) {
             prescription.replacement_way = '混合置换'
           }
-          if (prescription.anticoagulant === 1) {
-            prescription.anticoagulant = '无肝素'
-          }
-          if (prescription.anticoagulant === 2) {
-            prescription.anticoagulant = '普通肝素'
-          }
-          if (prescription.anticoagulant === 3) {
-            prescription.anticoagulant = '低分子肝素'
-          }
-          if (prescription.anticoagulant === 4) {
-            prescription.anticoagulant = '阿加曲班'
-          }
-          if (prescription.anticoagulant === 5) {
-            prescription.anticoagulant = '枸橼酸钠'
-          }
+     
           this.prescription = prescription
           var receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess
@@ -1732,10 +1772,11 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].id){
+          if(val == options[i].name){
             return options[i].shouji_unit
           }
         }
+       
       }else{
         return ''
       }
@@ -1744,7 +1785,7 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].id){
+          if(val == options[i].name){
             return options[i].weichi_unit
           }
         }
@@ -1756,7 +1797,7 @@ export default {
       const options = this.anticoagulantsConfit
       if(val != ''){
         for(let i in options){
-          if(val == options[i].id){
+          if(val == options[i].name){
             return options[i].zongliang_unit
           }
         }

src/xt_permission.js

@@ -11,20 +11,20 @@ const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名
 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))